查询全部渠道接口

yami-shop-api/src/main/java/com/yami/shop/api/controller/AddrController.java

@@ -16,7 +16,7 @@ import com.yami.shop.bean.app.dto.UserAddrDto;
 import com.yami.shop.bean.app.param.AddrParam;
 import com.yami.shop.bean.model.UserAddr;
 import com.yami.shop.common.exception.GlobalException;
-import com.yami.shop.delivery.comment.model.Transport2;
+import com.yami.shop.bean.model.Transport2;
 import com.yami.shop.delivery.comment.service.Transport2Service;
 import com.yami.shop.delivery.comment.service.TransportManagerService;
 import com.yami.shop.security.api.util.SecurityUtils;

yami-shop-delivery/yami-shop-delivery-comment/src/main/java/com/yami/shop/delivery/comment/model/Transport2.java → yami-shop-bean/src/main/java/com/yami/shop/bean/model/Transport2.java

@@ -8,7 +8,7 @@
  * 版权所有，侵权必究！
  */
 
-package com.yami.shop.delivery.comment.model;
+package com.yami.shop.bean.model;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

yami-shop-delivery/yami-shop-delivery-comment/src/main/java/com/yami/shop/delivery/comment/dao/Transport2Mapper.java

@@ -11,7 +11,7 @@
 package com.yami.shop.delivery.comment.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yami.shop.delivery.comment.model.Transport2;
+import com.yami.shop.bean.model.Transport2;
 import com.yami.shop.delivery.comment.param.ShopTransport;
 import org.apache.ibatis.annotations.Param;
 

yami-shop-delivery/yami-shop-delivery-comment/src/main/java/com/yami/shop/delivery/comment/service/Transport2Service.java

@@ -12,7 +12,7 @@ package com.yami.shop.delivery.comment.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.yami.shop.delivery.comment.model.Transport2;
+import com.yami.shop.bean.model.Transport2;
 import com.yami.shop.delivery.comment.param.ShopTransport;
 import org.springframework.cache.annotation.CacheEvict;
 

yami-shop-delivery/yami-shop-delivery-comment/src/main/java/com/yami/shop/delivery/comment/service/TransportManagerService.java

@@ -13,7 +13,7 @@ package com.yami.shop.delivery.comment.service;
 import com.yami.shop.bean.app.dto.ProductItemDto;
 import com.yami.shop.bean.app.dto.ShopCartItemDto;
 import com.yami.shop.bean.model.UserAddr;
-import com.yami.shop.delivery.comment.model.Transport2;
+import com.yami.shop.bean.model.Transport2;
 
 import java.util.List;
 

yami-shop-delivery/yami-shop-delivery-comment/src/main/java/com/yami/shop/delivery/comment/service/impl/Transport2ServiceImpl.java

@@ -12,7 +12,7 @@ package com.yami.shop.delivery.comment.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yami.shop.delivery.comment.dao.Transport2Mapper;
-import com.yami.shop.delivery.comment.model.Transport2;
+import com.yami.shop.bean.model.Transport2;
 import com.yami.shop.delivery.comment.param.ShopTransport;
 import com.yami.shop.delivery.comment.service.Transport2Service;
 import lombok.AllArgsConstructor;

yami-shop-delivery/yami-shop-delivery-comment/src/main/java/com/yami/shop/delivery/comment/service/impl/TransportManagerServiceImpl.java

@@ -22,7 +22,7 @@ import com.yami.shop.common.util.Json;
 import com.yami.shop.delivery.comment.model.Transfee;
 import com.yami.shop.delivery.comment.model.TransfeeFree;
 import com.yami.shop.delivery.comment.model.Transport;
-import com.yami.shop.delivery.comment.model.Transport2;
+import com.yami.shop.bean.model.Transport2;
 import com.yami.shop.delivery.comment.service.Transport2Service;
 import com.yami.shop.delivery.comment.service.TransportManagerService;
 import com.yami.shop.delivery.comment.service.TransportService;

yami-shop-delivery/yami-shop-delivery-comment/src/main/resources/mapper/Transport2Mapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yami.shop.delivery.comment.dao.Transport2Mapper">
-    <resultMap id="BaseResultMap" type="com.yami.shop.delivery.comment.model.Transport2">
+    <resultMap id="BaseResultMap" type="com.yami.shop.bean.model.Transport2">
         <id column="transport_id" jdbcType="BIGINT" property="transportId"/>
         <result column="trans_name" jdbcType="VARCHAR" property="transName"/>
         <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>

yami-shop-delivery/yami-shop-delivery-multishop/src/main/java/com/yami/shop/delivery/multishop/controller/Transport2Controller.java

@@ -12,15 +12,11 @@ package com.yami.shop.delivery.multishop.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yami.shop.bean.app.dto.ShopHeadInfoDto;
 import com.yami.shop.common.util.PageParam;
-import com.yami.shop.delivery.comment.model.Transport2;
+import com.yami.shop.bean.model.Transport2;
 import com.yami.shop.delivery.comment.param.ShopTransport;
 import com.yami.shop.delivery.comment.service.Transport2Service;
 import com.yami.shop.security.multishop.util.SecurityUtils;
-import com.yami.shop.service.ShopDetailService;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;

yami-shop-service/src/main/java/com/yami/shop/service/hb/impl/StoreManagementService.java

@@ -142,6 +142,9 @@ public class StoreManagementService implements IStoreManagementService {
             shopDetailInfo.setHbStationId(resultData.getString("stationId"));//海博门店编码
             shopDetailInfo.setOutStationNo(resultData.getString("outStationNo"));//商家门店编码
             shopDetailMapper.insert(shopDetailInfo);
+            //添加默认配送模板
+
+
             return HBR.success();
         } catch (Exception e) {
             log.error("门店变更失败：{}", e.getMessage(), e);