From 73774354982d2189d9b4ed5c9c888b8704b8bfc0 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Thu, 13 Feb 2025 19:47:20 +0800 Subject: [PATCH] =?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 --- .../java/com/cool/store/dao/ShopStageInfoDAO.java | 7 ++++++- .../com/cool/store/mapper/ShopStageInfoMapper.java | 3 +++ .../src/main/resources/mapper/ShopStageInfoMapper.xml | 11 +++++++++++ .../service/impl/AuditOpeningOperationPlanImpl.java | 2 +- .../store/service/impl/DecorationServiceImpl.java | 1 - .../cool/store/service/impl/InvoicingServiceImpl.java | 1 + .../com/cool/store/service/impl/PointServiceImpl.java | 4 +++- .../store/service/impl/PreparationServiceImpl.java | 7 ++++--- 8 files changed, 29 insertions(+), 7 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java index c4b68eaa6..8f9f228c2 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java @@ -258,7 +258,12 @@ public class ShopStageInfoDAO { } return shopStageInfoMapper.getScheduleList(shopIdList); } - + public ScheduleDTO getScheduleAll(Long shopId) { + if (Objects.isNull(shopId)) { + return null; + } + return shopStageInfoMapper.getScheduleAll(shopId); + } public List getPlatformBuildList(List shopIdList) { if (CollectionUtils.isEmpty(shopIdList)) { return Collections.emptyList(); diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java index a553e32c9..2f867c5dd 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java @@ -111,6 +111,9 @@ public interface ShopStageInfoMapper extends Mapper { List getShopIdListByStageStatus(@Param("shopSubStageStatus") Integer shopSubStageStatus); List getScheduleList(@Param("shopIds") List shopIds); + + ScheduleDTO getScheduleAll(@Param("shopId") Long shopId); + List getPlatformBuildList(@Param("shopIds") List shopIds); List getShopContractActualCompletionTime(@Param("shopIds") List shopIds); diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml index c82482963..1abc96196 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml @@ -398,4 +398,15 @@ and shop_id = #{shopId} + \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditOpeningOperationPlanImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditOpeningOperationPlanImpl.java index 3bc4abc08..747251303 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditOpeningOperationPlanImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditOpeningOperationPlanImpl.java @@ -65,13 +65,13 @@ public class AuditOpeningOperationPlanImpl implements AuditOpeningOperationPlanS Boolean flag = Boolean.FALSE; if(OpeningOperationPlanResultTypeEnum.PASS_AUDIT.getCode().equals(request.getResultType())){ shopSubStageStatusEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_143; - preparationService.updateShopStatus(request.getShopId()); flag = Boolean.TRUE; }else { shopSubStageStatusEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_142; } shopStageInfoDAO.updateShopStageAndAuditInfo(request.getShopId(), shopSubStageStatusEnum, auditId); + preparationService.updateShopStatus(request.getShopId()); if (flag){ preparationService.whetherToOpenForAcceptance(request.getShopId()); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java index 2080532b4..2dcd79747 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java @@ -652,7 +652,6 @@ public class DecorationServiceImpl implements DecorationService { acceptanceInfoDO.setCreateTime(new Date()); acceptanceInfoDAO.insertSelectiveAcceptanceInfo(acceptanceInfoDO); } - preparationService.updateShopStatus(shopId); shopStageInfoDAO.batchUpdateShopStageStatus(shopId, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_112, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_121)); ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId); LineInfoDO lineInfo = lineInfoMapper.getByLineId(shopInfo.getLineId()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InvoicingServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InvoicingServiceImpl.java index 95e4da496..49079647a 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InvoicingServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InvoicingServiceImpl.java @@ -57,6 +57,7 @@ public class InvoicingServiceImpl implements InvoicingService { //新数据待提交时初始化 老数据已数据处理 阶段状态已完成 只做插入操作 无需初始化 if (shopSubStageInfo!=null&&ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_85_1.getShopSubStageStatus().equals(shopSubStageInfo.getShopSubStageStatus())){ shopStageInfoDAO.updateShopStageInfo(invoicingDTO.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_85_3); + preparationService.updateShopStatus(invoicingDTO.getShopId()); } return Boolean.TRUE; } 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 373bb5648..8b9a79553 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 @@ -968,7 +968,9 @@ public class PointServiceImpl implements PointService { // commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()),MessageEnum.MESSAGE_16_1,requestMap); // } } - return shopStageInfoDAO.updateShopStageAndAuditInfo(shopId, subStageStatus, auditId); + shopStageInfoDAO.updateShopStageAndAuditInfo(shopId, subStageStatus, auditId); + preparationService.updateShopStatus(request.getShopId()); + return CommonConstants.ONE; } @Override diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java index feec4b25d..84940656c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java @@ -286,11 +286,12 @@ public class PreparationServiceImpl implements PreparationService { public void updateShopStatus(Long shopId) { ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId); if (shopInfo.getShopStatus().equals(ShopStatusEnum.ING.getCode())){ - Map map= getShopStatus(Arrays.asList(shopId)); - Integer shopStatus = map.get(shopId); + ScheduleDTO scheduleAll = shopStageInfoDAO.getScheduleAll(shopId); ShopInfoDO shopInfoDO = new ShopInfoDO(); + if (scheduleAll.getTotalColumn().equals(scheduleAll.getCompletionColumn())){ + shopInfoDO.setShopStatus(ShopStatusEnum.DONE.getCode()); + } shopInfoDO.setId(shopId); - shopInfoDO.setShopStatus(shopStatus); shopInfoDAO.updateShopInfo(shopInfoDO); } }