From 079edca294165d2b474a9a82f5b90c605150d3b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Mon, 4 Sep 2023 14:59:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=85=8D=E6=8B=9B=E5=95=86=E7=BB=8F?= =?UTF-8?q?=E7=90=86=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/enums/ErrorCodeEnum.java | 1 + .../cool/store/service/HyPartnerLineInfoService.java | 4 ++-- .../service/impl/HyPartnerLineInfoServiceImpl.java | 10 +++++++--- .../java/com/cool/store/controller/DeskController.java | 4 ++-- 4 files changed, 12 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 1a8eb108f..ce71711ac 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 @@ -67,6 +67,7 @@ public enum ErrorCodeEnum { DATELINE_BEFORE_NOW(500012, "截止时间不能早于当前时间！", null), NO_BATCH_TRANSFER_REQUIRED(500014, "已选线索包含此招商经理现有私海线索，无需转让，请检查后重试!", null), PARTNER_MOBILE_EXIST(500010, "手机号码已存在，请核实！", null), + INVESTMENT_MANAGER_NOT_EXIST(500015, "当前招商经理不存在", null), INTERVIEW_ENTER_FAIL(1021101, "进入面试间失败", null), DINGDING_USER_NOT_EXIST(1021102, "用户钉钉信息不存在，无法发起资质审核！", null), 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 1f7fdc7ef..44b6bfa52 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,9 +55,9 @@ public interface HyPartnerLineInfoService { * @param lineId * @return */ - Boolean transferInvestmentManager(LoginUserInfo user, TransferInvestmentManagerRequest request,Boolean sendFlag) throws ApiException; + Boolean transferInvestmentManager(String user, TransferInvestmentManagerRequest request,Boolean sendFlag) throws ApiException; - List batchTransferInvestmentManager(LoginUserInfo user, BatchTransferInvestmentManagerRequest request) throws ApiException; + List batchTransferInvestmentManager(String userId, 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 9a46f9e7e..48be272cb 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 @@ -168,10 +168,14 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { @Override @Transactional - public Boolean transferInvestmentManager(LoginUserInfo user, TransferInvestmentManagerRequest request,Boolean sendFlag) throws ApiException { + public Boolean transferInvestmentManager(String userId, TransferInvestmentManagerRequest request,Boolean sendFlag) throws ApiException { if (StringUtil.isBlank(request.getUserId())||request.getLineId()==null){ throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); } + EnterpriseUserDO user = enterpriseUserDAO.getUserInfoById(userId); + if (user==null){ + throw new ServiceException(ErrorCodeEnum.INVESTMENT_MANAGER_NOT_EXIST); + } HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoDAO.selectByPrimaryKeySelective(request.getLineId()); //如果招商经理是当前登录用户，则无需转让 if (request.getUserId().equals(hyPartnerLineInfoDO.getInvestmentManager())){ @@ -228,7 +232,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { } @Override - public List batchTransferInvestmentManager(LoginUserInfo user, BatchTransferInvestmentManagerRequest request) throws ApiException { + public List batchTransferInvestmentManager(String userId, BatchTransferInvestmentManagerRequest request) throws ApiException { if (CollectionUtils.isEmpty(request.getLineIds())||StringUtils.isEmpty(request.getUserId())){ throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); } @@ -245,7 +249,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { transferInvestmentManagerRequest.setUserId(request.getUserId()); transferInvestmentManagerRequest.setLineId(lineId); try { - this.transferInvestmentManager(user,transferInvestmentManagerRequest,Boolean.FALSE); + this.transferInvestmentManager(userId,transferInvestmentManagerRequest,Boolean.FALSE); successLineIds.add(lineId); } catch (Exception e) { log.info("transferInvestmentManager_success Transfer_interview_management_failed,lineId:{}",lineId); 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 8cfab7848..880212a8d 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,13 +196,13 @@ public class DeskController { @PostMapping(path = "/transferInvestmentManager") @ApiOperation("转让招商经理") public ResponseResult transferInvestmentManager(@RequestBody TransferInvestmentManagerRequest request) throws ApiException { - return ResponseResult.success(hyPartnerLineInfoService.transferInvestmentManager(CurrentUserHolder.getUser(),request,Boolean.TRUE )); + return ResponseResult.success(hyPartnerLineInfoService.transferInvestmentManager(request.getUserId(),request,Boolean.TRUE )); } @PostMapping(path = "/batchTransferInvestmentManager") @ApiOperation("批量转让招商经理") public ResponseResult> batchTransferInvestmentManager(@RequestBody BatchTransferInvestmentManagerRequest request) throws ApiException { - return ResponseResult.success(hyPartnerLineInfoService.batchTransferInvestmentManager(CurrentUserHolder.getUser(),request )); + return ResponseResult.success(hyPartnerLineInfoService.batchTransferInvestmentManager(request.getUserId(),request )); }