Merge branch 'cc_20250106_v2.4' into 'master'

fix 门店状态已完成

See merge request hangzhou/java/custom_zxjp!43

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

@@ -402,9 +402,9 @@
         select
         shop_id as shopId,
         max(plan_complete_time) as planCompleteTime,
-        count(1) as totalColumn,
-        sum(if(is_terminated = 1 , 1, 0)) as completionColumn
-        from xfsg_shop_stage_info where
+        count(1)-1 as totalColumn,
+        sum(if(is_terminated = 1 and shop_sub_stage!=85, 1, 0)) as completionColumn
+        from xfsg_shop_stage_info where shop_stage = 2 and
         shop_id = #{shopId}
 
 

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

@@ -969,7 +969,7 @@ public class PointServiceImpl implements PointService {
 //            }
         }
         shopStageInfoDAO.updateShopStageAndAuditInfo(shopId, subStageStatus, auditId);
-        preparationService.updateShopStatus(request.getShopId());
+
         return CommonConstants.ONE;
     }