From e76e09b18bdcb3a5091c0c18aaebb0c2df4ba17d Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Thu, 13 Feb 2025 20:16:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=20=E9=97=A8=E5=BA=97=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=B7=B2=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ShopStageInfoMapper.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml index 1abc96196..faac662f6 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml +++ b/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} From f1e49fab7a6524c9af2fa09c8e2c52be8f49937d Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Thu, 13 Feb 2025 20:22:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=20=E9=97=A8=E5=BA=97=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=B7=B2=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/service/impl/PointServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java index 8b9a79553..a5d1be856 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java +++ b/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; }