From 6dc00c8f54bba2bc6ddac05e4b07b1fad553d51b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 28 Jun 2023 15:08:24 +0800 Subject: [PATCH] userInfo --- .../cool/store/enums/WorkflowStageEnum.java | 2 +- .../service/HyPartnerLineInfoService.java | 3 ++- .../impl/EnterpriseUserServiceImpl.java | 3 +++ .../impl/HyPartnerLineInfoServiceImpl.java | 24 ++++++++++--------- .../cool/store/controller/DeskController.java | 4 ++-- 5 files changed, 21 insertions(+), 15 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowStageEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowStageEnum.java index 8657255a8..9e2ba4d54 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowStageEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowStageEnum.java @@ -36,7 +36,7 @@ public enum WorkflowStageEnum { public static final HashMap getWorkflowStageMap(){ HashMap result = new HashMap<>(); result.put(INTENT.getCode(),WorkflowStatusEnum.INTENT_3.getCode()); - result.put(RESERVATION.getCode(),WorkflowStatusEnum.RESERVATION_7.getCode()); + result.put(RESERVATION.getCode(),WorkflowStatusEnum.RESERVATION_8.getCode()); result.put(INTERVIEW.getCode(),WorkflowStatusEnum.INTERVIEW_7.getCode()); return result; } 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 c4ccf9195..c1fd5af9a 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 @@ -6,6 +6,7 @@ import com.cool.store.exception.ApiException; import com.cool.store.request.CloseFollowRequest; import com.cool.store.request.LineRequest; import com.cool.store.request.PrivateSeaLineListRequest; +import com.cool.store.request.TransferInvestmentManagerRequest; import com.cool.store.vo.*; import com.cool.store.vo.interview.InterviewVO; import com.github.pagehelper.PageInfo; @@ -57,7 +58,7 @@ public interface HyPartnerLineInfoService { * @param lineId * @return */ - Boolean transferInvestmentManager(LoginUserInfo user,String userId,String userName,Long lineId); + Boolean transferInvestmentManager(LoginUserInfo user, TransferInvestmentManagerRequest request) throws ApiException; /** * 分配招商经理 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseUserServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseUserServiceImpl.java index 8825b0786..3d65c1dd0 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseUserServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseUserServiceImpl.java @@ -83,6 +83,9 @@ public class EnterpriseUserServiceImpl implements EnterpriseUserService { if (CommonConstants.TRANSFER.equals(type)){ enterpriseUserDOS = enterpriseUserDAO.searchUserByRegionIdsAndKeyword(new ArrayList<>(list), keyword, null); } + if (CollectionUtils.isEmpty(enterpriseUserDOS)){ + enterpriseUserDOS.add(userInfo); + } return EnterpriseUserSingleInfoVO.convertVO(enterpriseUserDOS); } 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 bea44f05a..a6b1bd038 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 @@ -14,10 +14,7 @@ import com.cool.store.entity.*; import com.cool.store.enums.*; import com.cool.store.exception.ApiException; import com.cool.store.exception.ServiceException; -import com.cool.store.request.CloseFollowRequest; -import com.cool.store.request.LineRequest; -import com.cool.store.request.PrivateSeaLineListRequest; -import com.cool.store.request.QueryByInterviewPlanIdReq; +import com.cool.store.request.*; import com.cool.store.service.*; import com.cool.store.utils.CoolDateUtils; import com.cool.store.utils.RedisUtilPool; @@ -137,21 +134,26 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { } @Override - public Boolean transferInvestmentManager(LoginUserInfo user,String userId,String userName, Long lineId) { - if (StringUtil.isBlank(userId)||lineId==null){ + public Boolean transferInvestmentManager(LoginUserInfo user, TransferInvestmentManagerRequest request) throws ApiException { + if (StringUtil.isBlank(request.getUserId())||request.getLineId()==null){ throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); } - HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoDAO.selectByPrimaryKeySelective(lineId); - hyPartnerLineInfoDAO.updateInvestmentManager(userId, Arrays.asList(lineId)); + HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoDAO.selectByPrimaryKeySelective(request.getLineId()); + hyPartnerLineInfoDAO.updateInvestmentManager(request.getUserId(), Arrays.asList(request.getLineId())); List userIdList = new ArrayList<>(); - userIdList.add(userId); + userIdList.add(request.getUserId()); if (StringUtils.isNotEmpty(hyPartnerLineInfoDO.getInvestmentManager())){ userIdList.add(hyPartnerLineInfoDO.getInvestmentManager()); } List userList = enterpriseUserDAO.getUserInfoByUserIds(userIdList); Map userDOMap = userList.stream().collect(Collectors.toMap(EnterpriseUserDO::getUserId, data -> data)); + //更新面试官 + if (WorkflowStageEnum.INTERVIEW.getCode().equals(hyPartnerLineInfoDO.getWorkflowStage())){ + workFlowService.transferInvestmentManager(WorkflowStageEnum.getWorkflowStageByCode(hyPartnerLineInfoDO.getWorkflowStage()),request); + } + //添加日志 LineLogInfo lineLogInfo = new LineLogInfo(hyPartnerLineInfoDO.getPartnerId(), hyPartnerLineInfoDO.getId(), user.getUserId(), user.getName(), OperateTypeEnum.TRANSFER_INVESTMENT_MANAGER, @@ -160,8 +162,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { TransferInvestmentManagerLogDTO logDTO = TransferInvestmentManagerLogDTO.builder().operateUserId(user.getUserId()).operateUsername(user.getName()) .beforeInvestmentManagerUsername(userDOMap.getOrDefault(hyPartnerLineInfoDO.getInvestmentManager(),new EnterpriseUserDO()).getName()) .beforeInvestmentManagerMobile(userDOMap.getOrDefault(hyPartnerLineInfoDO.getInvestmentManager(),new EnterpriseUserDO()).getMobile()) - .afterInvestmentManagerMobile(userDOMap.getOrDefault(userId,new EnterpriseUserDO()).getMobile()) - .afterInvestmentManagerUsername(userDOMap.getOrDefault(userId,new EnterpriseUserDO()).getName()) + .afterInvestmentManagerMobile(userDOMap.getOrDefault(request.getUserId(),new EnterpriseUserDO()).getMobile()) + .afterInvestmentManagerUsername(userDOMap.getOrDefault(request.getUserId(),new EnterpriseUserDO()).getName()) .mobile(user.getMobile()).operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC_2)).build(); lineLogInfo.setData(logDTO); hyPartnerTaskInfoLogDAO.addOperateLog(lineLogInfo); 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 76fd03581..78be148b6 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 @@ -200,8 +200,8 @@ public class DeskController { @PostMapping(path = "/transferInvestmentManager") @ApiOperation("转让招商经理") - public ResponseResult transferInvestmentManager(@RequestBody TransferInvestmentManagerRequest request){ - return ResponseResult.success(hyPartnerLineInfoService.transferInvestmentManager(CurrentUserHolder.getUser(),request.getUserId(),request.getUserName(),request.getLineId())); + public ResponseResult transferInvestmentManager(@RequestBody TransferInvestmentManagerRequest request) throws ApiException { + return ResponseResult.success(hyPartnerLineInfoService.transferInvestmentManager(CurrentUserHolder.getUser(),request )); }