Merge branch 'master' into cc_20250327_tallyBook

# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java

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

@@ -213,7 +213,8 @@
         left join xfsg_line_info xli on xsi.line_id = xli.id
         left join xfsg_shop_stage_info xssi on xssi.shop_id = xsi.id
         where
-        xssi.shop_stage = 3
+        xsi.deleted = 0
+        and xssi.shop_stage = 3
         and xssi.shop_sub_stage_status != -100
         and
         xsi.region_id in
@@ -346,6 +347,9 @@
         select
         <include refid="allColumn"/>
         from xfsg_shop_info where line_id = #{lineId} and deleted= '0'
+        <if test="userId==null">
+            and shop_status in(0,1)
+        </if>
         <if test="userId!=null and userId!=''">
             and( investment_manager = #{userId}
             <if test="list!=null and list.size>0">