suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828

Browse Source
This commit is contained in:
俞扬
2023-08-16 16:04:56 +08:00
parent eb5441b4a0 4533b233df
commit 882f4e28d4
5 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-dao/src/main/java/com/cool/store/dao/HyFollowTaskDAO.java
View File

@@ -141,7 +141,7 @@ public class HyFollowTaskDAO {
* @param userId
*/
public void updateUndoTaskFollowUserId(Long partnerLineId, String userId){
if(Objects.isNull(partnerLineId) || StringUtils.isNotBlank(userId)){
if(Objects.isNull(partnerLineId) || StringUtils.isBlank(userId)){
return;
}
hyFollowTaskMapper.updateUndoTaskFollowUserId(partnerLineId, userId);

9
coolstore-partner-service/src/main/java/com/cool/store/service/FollowTaskService.java
View File

@@ -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);
/**
* 编辑跟进任务

18
coolstore-partner-service/src/main/java/com/cool/store/service/impl/FollowTaskServiceImpl.java
View File

@@ -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);

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
View File

@@ -190,7 +190,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
noticeService.sendFeiShuNotice(FeiShuNoticeMsgEnum.TRANS_INVESTMENT_MANAGER,Arrays.asList(request.getUserId()),DateUtil.formatDateTime(new Date()),hyPartnerBaseInfoDO.getUsername(),hyPartnerBaseInfoDO.getMobile());
//作废待完成&已逾期的任务
hyFollowTaskDAO.cancelUndoFollowTask(request.getLineId());
hyFollowTaskDAO.updateUndoTaskFollowUserId(request.getLineId(), request.getUserId());
//添加日志
LineLogInfo lineLogInfo = new LineLogInfo(hyPartnerLineInfoDO.getPartnerId(), hyPartnerLineInfoDO.getId(), user.getUserId(),

4
coolstore-partner-webb/src/main/java/com/cool/store/controller/FollowTaskController.java
View File

@@ -49,13 +49,13 @@ public class FollowTaskController {
@ApiOperation("添加跟进日志")
@PostMapping("/follow/log/add")
public ResponseResult<Integer> 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<Long> addFollowTask(@RequestBody @Validated AddFollowTaskRequest request){
return ResponseResult.success(followTaskService.addFollowTask(request, CurrentUserHolder.getUserId()));
return ResponseResult.success(followTaskService.addFollowTask(request, CurrentUserHolder.getUser()));
}
@ApiOperation("编辑跟进任务")