Merge branch 'refs/heads/master' into cc_2021104_twelve_points

coolstore-partner-dao/src/main/java/com/cool/store/dao/BigRegionDAO.java

@@ -3,6 +3,7 @@ package com.cool.store.dao;
 import com.cool.store.dto.region.BigRegionDTO;
 import com.cool.store.entity.BigRegionDO;
 import com.cool.store.enums.ErrorCodeEnum;
+import com.cool.store.enums.FranchiseBrandEnum;
 import com.cool.store.exception.ServiceException;
 import com.cool.store.mapper.BigRegionMapper;
 import com.cool.store.request.QueryBigRegionRequest;
@@ -12,6 +13,7 @@ import tk.mybatis.mapper.entity.Example;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -25,8 +27,8 @@ public class BigRegionDAO {
     @Resource
     BigRegionMapper bigRegionMapper;
 
-    public List<BigRegionDTO> queryAllBigRegion(String keyword){
-        return bigRegionMapper.queryAllBigRegion(keyword);
+    public List<BigRegionDTO> queryAllBigRegion(String keyword, Integer joinBrand){
+        return bigRegionMapper.queryAllBigRegion(keyword, joinBrand);
     }
 
     public BigRegionDO queryOrgInfoByBigRegionAndJoinMode(Long regionId, Integer joinMode){

coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java

@@ -4,7 +4,9 @@ import com.cool.store.constants.CommonConstants;
 import com.cool.store.dto.BuildStageDTO;
 import com.cool.store.dto.PlatformBuildStageDTO;
 import com.cool.store.dto.Preparation.ScheduleDTO;
+import com.cool.store.entity.ShopInfoDO;
 import com.cool.store.entity.ShopStageInfoDO;
+import com.cool.store.enums.FranchiseBrandEnum;
 import com.cool.store.enums.point.ShopStageEnum;
 import com.cool.store.enums.point.ShopSubStageEnum;
 import com.cool.store.enums.point.ShopSubStageStatusEnum;
@@ -40,17 +42,22 @@ public class ShopStageInfoDAO {
     /**
      * 初始化店铺阶段信息
      * @param lineId
-     * @param shopIds
+     * @param shopInfoList
      * @return flag =true:表示意向加盟节点完成正常初始化。false:表示意向加盟节点未完成新建分店阶段都为未开始-100。
      */
-    public Integer initShopStageInfo(Long lineId, List<Long> shopIds, Boolean flag) {
-        if (CollectionUtils.isEmpty(shopIds)) {
+    public Integer initShopStageInfo(Long lineId, List<ShopInfoDO> shopInfoList, Boolean flag) {
+        if (CollectionUtils.isEmpty(shopInfoList)) {
             return CommonConstants.ZERO;
         }
         List<ShopStageInfoDO> addShopStageList = new ArrayList<>();
         LocalDate selectStartDate = LocalDate.now();
-        for (Long shopId : shopIds) {
+        for (ShopInfoDO shopInfoDO : shopInfoList) {
+            Long shopId = shopInfoDO.getId();
             for (ShopSubStageEnum shopSubStageEnum : ShopSubStageEnum.values()) {
+                if (ShopSubStageEnum.SHOP_STAGE_24.equals(shopSubStageEnum) && String.valueOf(FranchiseBrandEnum.ZXSMZ.getCode()).equals(shopInfoDO.getFranchiseBrand())) {
+                    // 三明治跳过营帐通开通
+                    continue;
+                }
                 ShopStageInfoDO shopStageInfo = new ShopStageInfoDO();
                 shopStageInfo.setLineId(lineId);
                 shopStageInfo.setShopId(shopId);

coolstore-partner-dao/src/main/java/com/cool/store/mapper/BigRegionMapper.java

@@ -15,7 +15,7 @@ public interface BigRegionMapper extends Mapper<BigRegionDO> {
      * @param keyword
      * @return
      */
-    List<BigRegionDTO> queryAllBigRegion(String keyword);
+    List<BigRegionDTO> queryAllBigRegion(@Param("keyword") String keyword, @Param("joinBrand") Integer joinBrand);
 
     /**
      * 根据所属大区与加盟模式查询新管家信息

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

@@ -38,6 +38,9 @@
       <if test="keyword!=null and keyword !=''">
         and region_name like CONCAT('%',#{keyword},'%')
       </if>
+      <if test="joinBrand != null">
+        and join_brand = #{joinBrand}
+      </if>
     </where>
   </select>
 

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

@@ -278,7 +278,11 @@
         from
         xfsg_shop_info a
         left join store_${enterpriseId} b on a.shop_code = b.store_num
-        where b.store_id is not null and a.id in
+        where a.shop_code is not null
+        and a.shop_code !=''
+        and b.store_id is not null
+        and b.is_delete = 'effective'
+        and a.id in
         <foreach collection="shopIds" item="shopId" separator="," open="(" close=")">
             #{shopId}
         </foreach>

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

@@ -397,7 +397,7 @@
         and eu.active = true
         --         and sr.source = 'create'
         <if test="positionType != null and positionType != '' ">
-            and (sr.position_type = #{positionType} or sr.id  in (180000000,120000000,40000000))
+            and (sr.position_type = #{positionType} or sr.id  in (180000000,120000000,40000000,1762761165005))
         </if>
         and eu.user_status = '1'
     </select>

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

@@ -55,7 +55,7 @@
                 </foreach>
             </if>
             <if test="positionType!=null and positionType!=''">
-                and (b.position_type =#{positionType} or b.id  in (180000000,120000000,40000000) )
+                and (b.position_type =#{positionType} or b.id  in (180000000,120000000,40000000,1762761165005))
             </if>
               <if test="notRoleAuth!=null and notRoleAuth!=''">
                   and b.role_auth !=#{notRoleAuth}