suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'cc_20250106_v2.4' into 'master'

Browse Source 
fix 门店状态已完成

See merge request hangzhou/java/custom_zxjp!43
This commit is contained in:
苏竹红
2025-02-13 12:23:52 +00:00
parent b121088683 f1e49fab7a
commit 0a8951dab4
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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