Merge branch 'master' into cc_20251112_wallet

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/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

@@ -281,7 +281,9 @@
         left join store_${enterpriseId} b on a.shop_code = b.store_num
         where a.shop_code is not null
         and a.shop_code !=''
-        and b.store_id is not null and a.id in
+        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>