Merge branch 'master' into cc_20251112_wallet

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>