From ffbf8ed330cc7f063c5738c531cc545cc0d3c826 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Thu, 2 Jan 2025 16:14:24 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=8F=91=E7=A5=A8=E5=9B=9E=E4=BC=A0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/enums/ErrorCodeEnum.java | 2 ++ .../service/impl/InvoicingServiceImpl.java | 19 ++++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index 90c5ee956..a106dfde5 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -198,6 +198,8 @@ public enum ErrorCodeEnum { DUPLICATE_SUBMISSION(109015, "重复提交！", null), + INVOICING_EXIST(109016, "当前门店发票信息已存在！", null), + INSERT_OPENING_OPERATION_PLAN_AUDIT_FALSE(103001,"插入运营方案审核信息失败",null), INSERT_OPENING_OPERATION_PLAN_FALSE(103002,"插入运营方案失败",null), 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 ed4f2575b..3fab5c100 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 @@ -40,18 +40,23 @@ public class InvoicingServiceImpl implements InvoicingService { if (invoicingDTO==null||invoicingDTO.getId()!=null){ throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); } - ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(invoicingDTO.getShopId(), ShopSubStageEnum.SHOP_STAGE_8_5); - //待提交时候支持提交 - if (shopSubStageInfo!=null&&!ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_85_1.getShopSubStageStatus().equals(shopSubStageInfo.getShopSubStageStatus())){ - throw new ServiceException(ErrorCodeEnum.STATUS_NOT_SUPPORT_SUMMIT); + InvoicingDO invoicing = invoicingDAO.getByShopId(invoicingDTO.getShopId()); + if (invoicing!=null){ + throw new ServiceException(ErrorCodeEnum.INVOICING_EXIST); } + ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(invoicingDTO.getShopId(), ShopSubStageEnum.SHOP_STAGE_8_5); + InvoicingDO invoicingDO = new InvoicingDO(); BeanUtil.copyProperties(invoicingDTO, invoicingDO); invoicingDO.setCreateUserId(userInfo.getUserId()); invoicingDAO.add(invoicingDO); - shopStageInfoDAO.updateShopStageInfo(invoicingDTO.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_85_3); - ////如果发票回传完成 开始设计阶段与验收阶段 - preparationService.contractAndBuildStoreCompletion(invoicingDTO.getShopId()); + + //新数据待提交时初始化 老数据已数据处理 阶段状态已完成 只做插入操作 无需初始化 + 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.contractAndBuildStoreCompletion(invoicingDTO.getShopId()); + } return Boolean.TRUE; }