From 0fe72c7196d64ab742e6ac272660c1519293e984 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Fri, 26 Apr 2024 11:07:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/AuditOpeningOperationPlanImpl.java | 39 ++++++------------- 1 file changed, 11 insertions(+), 28 deletions(-) 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 8c4935c2d..5815f5930 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 @@ -62,46 +62,29 @@ public class AuditOpeningOperationPlanImpl implements AuditOpeningOperationPlanS log.error("auditPlan request is null"); throw new ServiceException("auditPlan request is null"); } - String userId = CurrentUserHolder.getUserId(); try { Long auditId = shopAuditInfoDAO.addAuditInfo(request.toShopAuditInfoDO()); - if (Objects.isNull(auditId)) { - log.error("auditPlan audit is null"); - throw new ServiceException(ErrorCodeEnum.INSERT_OPENING_OPERATION_PLAN_AUDIT_FALSE); - } OpeningOperationPlanDO openingOperationPlanDO = new OpeningOperationPlanDO(); openingOperationPlanDO.setShopId(request.getShopId()); openingOperationPlanDO.setAuditId(auditId); openingOperationPlanDO.setResultType(request.getResultType()); - Integer plan = openingOperationPlanDAO.updateResultType(request.getShopId(),auditId,request.getResultType()); - if (Objects.isNull(plan)) { - log.error("auditPlan plan is null"); - throw new ServiceException(ErrorCodeEnum.UPDATE_PLAN_FALSE); + openingOperationPlanDAO.updateResultType(request.getShopId(),auditId,request.getResultType()); + ShopSubStageStatusEnum shopSubStageStatusEnum = null; + Boolean flag = Boolean.FALSE; + if(OpeningOperationPlanResultTypeEnum.PASS_AUDIT.getCode().equals(request.getResultType())){ + shopSubStageStatusEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_143; + flag = Boolean.TRUE; + }else { + shopSubStageStatusEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_142; } - if (request.getResultType().equals(OpeningOperationPlanResultTypeEnum.PASS_AUDIT.getCode())) { - //更改子阶段 - Integer Stage = shopStageInfoDAO.updateShopStageAndAuditInfo(request.getShopId(), - ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_143, auditId); - if (Objects.isNull(Stage)) { - log.error("auditPlan stage is null"); - throw new ServiceException(ErrorCodeEnum.UPDATE_SHOP_SUB_STAGE_STATUS_FALSE); - } + shopStageInfoDAO.updateShopStageAndAuditInfo(request.getShopId(), + shopSubStageStatusEnum, auditId); + if (flag){ preparationService.whetherToOpenForAcceptance(request.getShopId()); - } else { - if (request.getResultType().equals(OpeningOperationPlanResultTypeEnum.REJECT_AUDIT.getCode())) { - //更改子阶段 - Integer Stage = shopStageInfoDAO.updateShopStageAndAuditInfo(request.getShopId(), - ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_142, auditId); - if (Objects.isNull(Stage)) { - log.error("auditPlan stage is null"); - throw new ServiceException(ErrorCodeEnum.UPDATE_SHOP_SUB_STAGE_STATUS_FALSE); - } - } } return Boolean.TRUE; } catch (Exception e) { log.error("auditPlan Exception:{}", e); - e.printStackTrace(); return Boolean.FALSE; }