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/LineInfoMapper.xml

@@ -480,7 +480,7 @@
     <if test="wantShopAreaName != null">
       left join xfsg_open_area_info b on a.want_shop_area_id = b.id
     </if>
-    where  a.deleted = 0 and a.line_status = 1 and a.join_status in (1,2)
+    where  a.deleted = 0 and a.line_status = 1 and a.join_status in (1,2) and c.deleted = 0
     <if test="userId != null and userId != ''">
       and (a.investment_manager = #{userId} or c.investment_manager = #{userId} )
     </if>

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

@@ -51,7 +51,7 @@
       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
+      where si.deleted = 0
       <if test="request.shopName != null and request.shopName != '' ">
           AND si.shop_name like concat('%', #{request.shopName}, '%')
       </if>

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

@@ -79,15 +79,17 @@
     </select>
     <select id="getBySubStageStatusAndUser" resultType="com.cool.store.entity.OperationLogDO">
         select *
-        from xfsg_operation_log
+        from xfsg_operation_log a
+        left join xfsg_shop_info b on a.shop_id = b.id
         where
-        operator = #{userId}
-        and shop_sub_stage_status in
+        b.deleted=0
+        and a.operator = #{userId}
+        and a.shop_sub_stage_status in
         <foreach collection="list" index="index" item="item" open="(" close=")" separator=",">
             #{item}
         </foreach>
-        and status = 0
-        order by create_time desc
+        and a.status = 0
+        order by a.create_time desc
     </select>
     <select id="getByCondition" resultType="com.cool.store.entity.OperationLogDO">
         select *

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

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

@@ -196,8 +196,9 @@
         from
         xfsg_shop_stage_info a
         inner join xfsg_line_info b on a.line_id = b.id
-        where
-        a.shop_sub_stage = #{shopSubStage} and a.shop_sub_stage_status = #{shopSubStageStatus} and a.deleted = 0 and
+        left join xfsg_shop_info c on a.shop_id = c.id
+        where c.deleted=0
+       and a.shop_sub_stage = #{shopSubStage} and a.shop_sub_stage_status = #{shopSubStageStatus} and a.deleted = 0 and
         b.deleted = 0 and b.development_manager = #{userId}
     </select>
 
@@ -256,10 +257,9 @@
         select
         *
         from xfsg_shop_stage_info a
-        <if test="(authRegionIds != null and authRegionIds.size() > 0) or (investmentUserId != null and investmentUserId != '')">
-            left join xfsg_shop_info si on a.shop_id = si.id
-        </if>
+           left join xfsg_shop_info si on a.shop_id = si.id
         <where>
+            si.deleted = 0
             <if test="shopIds != null and shopIds.size() > 0">
                 and a.shop_id in
                 <foreach collection="shopIds" item="shopId" index="index" open="(" separator="," close=")">
@@ -409,4 +409,12 @@
 
 
     </select>
+    <select id="getCompletionCount" resultType="java.lang.Integer">
+        select
+        count(1)
+        from
+        xfsg_shop_stage_info
+        where
+        shop_id = #{shopId} and deleted = 0 and is_terminated = 1 and shop_stage in (1,2)
+    </select>
 </mapper>