From 4533b233df590ad2d705409afab7c1f4bd7d9bba Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Wed, 16 Aug 2023 15:50:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=9F=E8=BF=9B=E6=97=A5=E5=BF=97=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/service/FollowTaskService.java | 9 +++++---- .../service/impl/FollowTaskServiceImpl.java | 18 ++++++++---------- .../store/controller/FollowTaskController.java | 4 ++-- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/FollowTaskService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/FollowTaskService.java index 871610204..e49090ee8 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/FollowTaskService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/FollowTaskService.java @@ -1,5 +1,6 @@ package com.cool.store.service; +import com.cool.store.context.LoginUserInfo; import com.cool.store.request.follow.AddFollowLogRequest; import com.cool.store.request.follow.AddFollowTaskRequest; import com.cool.store.request.follow.FollowTaskIdRequest; @@ -39,18 +40,18 @@ public interface FollowTaskService { /** * 添加跟进日志 * @param request - * @param userId + * @param userInfo * @return */ - Integer addFollowLog(AddFollowLogRequest request, String userId); + Integer addFollowLog(AddFollowLogRequest request, LoginUserInfo userInfo); /** * 新增跟进任务 * @param request - * @param userId + * @param userInfo * @return */ - Long addFollowTask(AddFollowTaskRequest request, String userId); + Long addFollowTask(AddFollowTaskRequest request, LoginUserInfo userInfo); /** * 编辑跟进任务 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FollowTaskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FollowTaskServiceImpl.java index 8b1dd2ac1..5f41fa7a8 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FollowTaskServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FollowTaskServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; import com.cool.store.constants.CommonConstants; import com.cool.store.constants.MessageConstants; +import com.cool.store.context.LoginUserInfo; import com.cool.store.dao.EnterpriseUserDAO; import com.cool.store.dao.HyFollowTaskDAO; import com.cool.store.dao.HyPartnerLineInfoDAO; @@ -27,6 +28,7 @@ import com.cool.store.request.follow.FollowTaskIdRequest; import com.cool.store.request.follow.UpdateFollowTaskRequest; import com.cool.store.service.CallService; import com.cool.store.service.FollowTaskService; +import com.cool.store.service.LogService; import com.cool.store.utils.CoolDateUtils; import com.cool.store.utils.RedisUtilPool; import com.cool.store.vo.follow.FollowTaskLogVO; @@ -60,6 +62,8 @@ public class FollowTaskServiceImpl implements FollowTaskService { @Resource private HyPartnerLineInfoDAO hyPartnerLineInfoDAO; @Resource + private LogService logService; + @Resource private HyPartnerTaskInfoLogDAO hyPartnerTaskInfoLogDAO; @Resource private EnterpriseUserDAO enterpriseUserDAO; @@ -115,19 +119,16 @@ public class FollowTaskServiceImpl implements FollowTaskService { } @Override - public Integer addFollowLog(AddFollowLogRequest request, String userId) { + public Integer addFollowLog(AddFollowLogRequest request, LoginUserInfo userInfo) { HyPartnerLineInfoDO lineInfo = checkLine(request.getPartnerLineId()); - String userName = enterpriseUserDAO.getUserName(userId); - LineLogInfo lineLogInfo = new LineLogInfo(lineInfo.getPartnerId(), request.getPartnerLineId(), userId, userName, OperateTypeEnum.ADD_FOLLOW_LOG, WorkflowStageEnum.getWorkflowStageByCode(lineInfo.getWorkflowStage()), lineInfo.getWorkflowStatus(), null); JSONObject jsonObject = new JSONObject(); jsonObject.put(OperateLogFieldValueEnum.FOLLOW_LOG.getCode(), request.getFollowLog()); - lineLogInfo.setData(jsonObject); - hyPartnerTaskInfoLogDAO.addOperateLog(lineLogInfo); + logService.recordBizLog(userInfo, request.getPartnerLineId(), OperateTypeEnum.ADD_FOLLOW_LOG, jsonObject); return null; } @Override - public Long addFollowTask(AddFollowTaskRequest request, String userId) { + public Long addFollowTask(AddFollowTaskRequest request, LoginUserInfo userInfo) { if(request.getDeadline().getTime() < System.currentTimeMillis()){ throw new ServiceException(ErrorCodeEnum.DATELINE_BEFORE_NOW); } @@ -135,12 +136,9 @@ public class FollowTaskServiceImpl implements FollowTaskService { HyFollowTaskDO task = AddFollowTaskRequest.convertDO(request); task.setFollowUserId(lineInfo.getInvestmentManager()); Long followTaskId = hyFollowTaskDAO.addFollowTask(task); - String userName = enterpriseUserDAO.getUserName(userId); - LineLogInfo lineLogInfo = new LineLogInfo(lineInfo.getPartnerId(), request.getPartnerLineId(), userId, userName, OperateTypeEnum.ADD_FOLLOW_TASK, WorkflowStageEnum.getWorkflowStageByCode(lineInfo.getWorkflowStage()), lineInfo.getWorkflowStatus(), null); JSONObject jsonObject = new JSONObject(); jsonObject.put(OperateLogFieldValueEnum.FOLLOW_TASK_ID.getCode(), followTaskId); - lineLogInfo.setData(jsonObject); - hyPartnerTaskInfoLogDAO.addOperateLog(lineLogInfo); + logService.recordBizLog(userInfo, request.getPartnerLineId(), OperateTypeEnum.ADD_FOLLOW_TASK, jsonObject); if((request.getDeadline().getTime() - System.currentTimeMillis()) /CommonConstants.ONE_THOUSAND < CommonConstants.AN_HOUR_SECONDS){ //一小时内的任务立即发送通知 sendMessage(task); diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/FollowTaskController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/FollowTaskController.java index b46bc33fb..5a1ad08cd 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/FollowTaskController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/FollowTaskController.java @@ -49,13 +49,13 @@ public class FollowTaskController { @ApiOperation("添加跟进日志") @PostMapping("/follow/log/add") public ResponseResult addFollowLog(@RequestBody @Validated AddFollowLogRequest request){ - return ResponseResult.success(followTaskService.addFollowLog(request, CurrentUserHolder.getUserId())); + return ResponseResult.success(followTaskService.addFollowLog(request, CurrentUserHolder.getUser())); } @ApiOperation("新增跟进任务") @PostMapping("/follow/task/add") public ResponseResult addFollowTask(@RequestBody @Validated AddFollowTaskRequest request){ - return ResponseResult.success(followTaskService.addFollowTask(request, CurrentUserHolder.getUserId())); + return ResponseResult.success(followTaskService.addFollowTask(request, CurrentUserHolder.getUser())); } @ApiOperation("编辑跟进任务")