Merge remote-tracking branch 'origin/cc_20241008_sysBuildAndAdjust' into cc_20241008_sysBuildAndAdjust

coolstore-partner-dao/src/main/resources/mapper/OpeningOperationPlanMapper.xml

@@ -47,12 +47,11 @@
   <select id="getOpenPlanShopListByCondition"
           resultType="com.cool.store.dto.openPreparation.OpenPlanShopInfoDTO">
       select si.id as shopId, si.region_id AS regionId,si.line_id as lineId, si.shop_name as shopName,
-      si.store_num as storeNum, si.shop_manager_user_id as shopManagerUserId,op.submission_time AS submissionTime ,
+      si.store_num as storeNum,si.shop_code as shopCode, si.shop_manager_user_id as shopManagerUserId,op.submission_time AS submissionTime ,
       op.result_type AS resultType,si.supervisor_user_id as supervisorUserId
       from xfsg_opening_operation_plan op
       join xfsg_shop_info si on si.id = op.shop_id
       where 1=1
-
       <if test="request.shopName != null and request.shopName != '' ">
           AND si.shop_name like concat('%', #{request.shopName}, '%')
       </if>

coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml

@@ -151,7 +151,7 @@
     </select>
     <select id="selectShopListByRegionId" resultType="com.cool.store.entity.ShopInfoDO">
       select
-      xsi.id,xsi.line_id as lineId,xsi.region_id as regionId,xsi.shop_name as shopName,xsi.store_num as storeNum
+      xsi.id,xsi.line_id as lineId,xsi.region_id as regionId,xsi.shop_name as shopName,xsi.store_num as storeNum,xsi.shop_code as shopCode
       from xfsg_shop_info xsi
       left join xfsg_shop_stage_info xssi on xssi.shop_id = xsi.id
       where

coolstore-partner-model/src/main/java/com/cool/store/dto/openPreparation/OpenPlanShopInfoDTO.java

@@ -26,6 +26,9 @@ public class OpenPlanShopInfoDTO {
     @ApiModelProperty("门店名字")
     private String shopName;
 
+    @ApiModelProperty("门店编码")
+    private String shopCode;
+
     @ApiModelProperty("门店编码")
     private String storeNum;
 

coolstore-partner-model/src/main/java/com/cool/store/vo/OpeningOperationPlanListVO.java

@@ -24,6 +24,9 @@ public class OpeningOperationPlanListVO {
     @ApiModelProperty("门店代码")
     private String storeNum;
 
+    @ApiModelProperty("门店编码")
+    private String storeCode;
+
     @ApiModelProperty("开店负责人")
     private String shopManagerName;
 

coolstore-partner-model/src/main/java/com/cool/store/vo/fitmentCheckVO.java

@@ -18,6 +18,7 @@ public class fitmentCheckVO {
     private Long lineId;
     private String shopName;
     private String storeNum;
+    private String shopCode;
     @ApiModelProperty("加盟商姓名")
     private String partnerName;
     @ApiModelProperty("所属战区id")

coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java

@@ -425,6 +425,7 @@ public class DecorationServiceImpl implements DecorationService {
             fitmentCheckVO.setLineId(lineId);
             fitmentCheckVO.setShopName(shopInfoDO.getShopName());
             fitmentCheckVO.setStoreNum(shopInfoDO.getStoreNum());
+            fitmentCheckVO.setShopCode(shopInfoDO.getShopCode());
             fitmentCheckVO.setRegionId(regionId);
             fitmentCheckVO.setRegion(regionNameMap.get(regionId));
             fitmentCheckVO.setFightManager(fightManger.get(regionId));

coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java

@@ -199,6 +199,7 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService {
             openingOperationPlanListVO.setShopId(x.getShopId());
             openingOperationPlanListVO.setShopName(x.getShopName());
             openingOperationPlanListVO.setStoreNum(x.getStoreNum());
+            openingOperationPlanListVO.setStoreCode(x.getShopCode());
             openingOperationPlanListVO.setPartnerName(x.getPartnerName());
             openingOperationPlanListVO.setMobile(x.getMobile());
             openingOperationPlanListVO.setRegion(regionNameMap.get(x.getRegionId()));