From 1c27d8403dbe6fdb5657a7fa79de6e6a014af69e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Mon, 21 Aug 2023 17:42:47 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A3=9E=E4=B9=A6=E9=80=9A=E7=9F=A5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/enums/FeiShuNoticeMsgEnum.java | 1 + .../store/service/HyPartnerLineInfoService.java | 2 +- .../service/impl/HyPartnerLineInfoServiceImpl.java | 13 +++++++++---- .../com/cool/store/controller/DeskController.java | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/FeiShuNoticeMsgEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/FeiShuNoticeMsgEnum.java index ee9b48017..f84770b82 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/FeiShuNoticeMsgEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/FeiShuNoticeMsgEnum.java @@ -12,6 +12,7 @@ public enum FeiShuNoticeMsgEnum { common_notice("工作台通知", "{0}", "img_v2_45d7a901-1eab-498b-a760-b38d287f0c1g"), ALLOCATION_INVESTMENT_MANAGER("分配招商经理", "有新的线索 于 {0} 分配给您，线索信息{1}手机号{2}，请及时跟进", "img_v2_33296002-829e-490e-bd11-0d9ae763a67g"), TRANS_INVESTMENT_MANAGER("转让招商经理", "有新的线索 于 {0} 转让给您，线索信息{1}手机号{2}，请及时跟进", "img_v2_33296002-829e-490e-bd11-0d9ae763a67g"), + BATCH_TRANS_INVESTMENT_MANAGER("收到新线索", "有{0}条新线索 于 {1} 转让给您，请及时跟进", "img_v2_33296002-829e-490e-bd11-0d9ae763a67g"), INTENTION_APPLY("加盟意向申请", "您有一个【加盟意向申请】待审核，申请人{0}手机号{1}于 {2} 提交加盟意向申请，请及时处理", "img_v2_69eb6e5f-bf12-4a02-a47f-b17ce24fcfeg"), FOLLOW_TASK("线索跟进任务", "{0}", "img_v2_1960b7ef-8c4e-4c3d-8b67-3d918a85578g"), INTERVIEW_APPOINTMENT("面试预约申请", "{0}","img_v2_107bb06b-2a7a-43e1-a6ae-e5d2f2dae17g"), diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java index c8fbbde4c..d0d3edaa0 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java @@ -55,7 +55,7 @@ public interface HyPartnerLineInfoService { * @param lineId * @return */ - Boolean transferInvestmentManager(LoginUserInfo user, TransferInvestmentManagerRequest request) throws ApiException; + Boolean transferInvestmentManager(LoginUserInfo user, TransferInvestmentManagerRequest request,Boolean sendFlag) throws ApiException; Boolean batchTransferInvestmentManager(LoginUserInfo user, BatchTransferInvestmentManagerRequest request) throws ApiException; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java index b7cad70a0..57b25fb7e 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java @@ -167,7 +167,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { } @Override - public Boolean transferInvestmentManager(LoginUserInfo user, TransferInvestmentManagerRequest request) throws ApiException { + public Boolean transferInvestmentManager(LoginUserInfo user, TransferInvestmentManagerRequest request,Boolean sendFlag) throws ApiException { if (StringUtil.isBlank(request.getUserId())||request.getLineId()==null){ throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); } @@ -192,8 +192,10 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { workFlowService.transferInvestmentManager(WorkflowStageEnum.getWorkflowStageByCode(hyPartnerLineInfoDO.getWorkflowStage()),request); } //发送飞书工作通知 - HyPartnerBaseInfoDO hyPartnerBaseInfoDO = hyPartnerBaseInfoDAO.getByPartnerLineId(request.getLineId()); - noticeService.sendFeiShuNotice(FeiShuNoticeMsgEnum.TRANS_INVESTMENT_MANAGER,Arrays.asList(request.getUserId()),DateUtil.formatDateTime(new Date()),hyPartnerBaseInfoDO.getUsername(),hyPartnerBaseInfoDO.getMobile()); + if (sendFlag){ + HyPartnerBaseInfoDO hyPartnerBaseInfoDO = hyPartnerBaseInfoDAO.getByPartnerLineId(request.getLineId()); + noticeService.sendFeiShuNotice(FeiShuNoticeMsgEnum.TRANS_INVESTMENT_MANAGER,Arrays.asList(request.getUserId()),DateUtil.format(new Date(),CoolDateUtils.DATE_FORMAT_SEC_2),hyPartnerBaseInfoDO.getUsername(),hyPartnerBaseInfoDO.getMobile()); + } //作废待完成&已逾期的任务 hyFollowTaskDAO.cancelUndoFollowTask(request.getLineId()); @@ -229,11 +231,14 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { transferInvestmentManagerRequest.setUserId(request.getUserId()); transferInvestmentManagerRequest.setLineId(lineId); try { - this.transferInvestmentManager(user,transferInvestmentManagerRequest); + this.transferInvestmentManager(user,transferInvestmentManagerRequest,Boolean.FALSE); } catch (ApiException e) { log.info("transferInvestmentManager_success Transfer_interview_management_failed,lineId:{}",lineId); } } + if (request.getLineIds().size()!=0){ + noticeService.sendFeiShuNotice(FeiShuNoticeMsgEnum.BATCH_TRANS_INVESTMENT_MANAGER,Arrays.asList(request.getUserId()),request.getLineIds().size(),DateUtil.format(new Date(),CoolDateUtils.DATE_FORMAT_SEC_2)); + } return Boolean.TRUE; } diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java index 943f98bee..9f655c7fe 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java @@ -196,7 +196,7 @@ public class DeskController { @PostMapping(path = "/transferInvestmentManager") @ApiOperation("转让招商经理") public ResponseResult transferInvestmentManager(@RequestBody TransferInvestmentManagerRequest request) throws ApiException { - return ResponseResult.success(hyPartnerLineInfoService.transferInvestmentManager(CurrentUserHolder.getUser(),request )); + return ResponseResult.success(hyPartnerLineInfoService.transferInvestmentManager(CurrentUserHolder.getUser(),request,Boolean.TRUE )); } @PostMapping(path = "/batchTransferInvestmentManager")