From 7c09e21081b8146f8f0ddf3e58fe2f3ccc967f62 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Tue, 28 May 2024 17:28:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=A7=9F=E8=B5=81=E5=90=88?= =?UTF-8?q?=E5=90=8C,=E4=BF=AE=E6=94=B9=E4=B8=BA=E9=80=89=E5=9D=80?= =?UTF-8?q?=E7=BB=8F=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/service/impl/PointServiceImpl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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 166082a5d..e8bea21db 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 @@ -910,7 +910,7 @@ public class PointServiceImpl implements PointService { messageMap.put("lineId", String.valueOf(lineInfo.getId())); messageMap.put("partnerUsername", lineInfo.getUsername()); messageMap.put("submitTime", DateUtils.parseDateToStr(DateUtils.NOTICE_DATE, new Date())); - commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()), MessageEnum.MESSAGE_15, messageMap); + commonService.sendMessage(Arrays.asList(lineInfo.getDevelopmentManager()), MessageEnum.MESSAGE_15, messageMap); return shopStageInfoDAO.updateShopStageInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_21); } @@ -943,8 +943,12 @@ public class PointServiceImpl implements PointService { if(!ShopStageEnum.SHOP_STAGE_1.getShopStage().equals(shopInfo.getShopStage())){ throw new ServiceException(ErrorCodeEnum.SHOP_STAGE_NOT_OPERATE); } - Long auditId = shopAuditInfoDAO.addAuditInfo(AuditRentContractRequest.convert(request, AuditTypeEnum.UPLOAD_RENT_CONTRACT)); LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopInfo.getLineId()); + if(!request.getOperateUserId().equals(lineInfo.getDevelopmentManager())){ + throw new ServiceException(ErrorCodeEnum.NO_PERMISSION); + } + Long auditId = shopAuditInfoDAO.addAuditInfo(AuditRentContractRequest.convert(request, AuditTypeEnum.UPLOAD_RENT_CONTRACT)); + ShopSubStageStatusEnum subStageStatus = AuditResultTypeEnum.PASS.getCode().equals(request.getResultType()) ? ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_23 : ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_22; if(AuditResultTypeEnum.REJECT.getCode().equals(request.getResultType())){ commonService.sendSms(lineInfo.getMobile(), SMSMsgEnum.RENT_CONTRACT_AUDIT_FAIL, null); @@ -997,7 +1001,7 @@ public class PointServiceImpl implements PointService { messageMap.put("lineId", String.valueOf(lineInfo.getId())); messageMap.put("partnerUsername", lineInfo.getUsername()); messageMap.put("submitTime", DateUtils.parseDateToStr(DateUtils.NOTICE_DATE, new Date())); - commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()), MessageEnum.MESSAGE_15, messageMap); + commonService.sendMessage(Arrays.asList(lineInfo.getDevelopmentManager()), MessageEnum.MESSAGE_15, messageMap); } return shopRentInfoDAO.updateRentContract(shopRentInfo); }