添加日志

2023-07-04 10:45:34 +08:00
parent df663b9a8c
commit 30859295d6
11 changed files with 102 additions and 22 deletions
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerBaseInfoService.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerBaseInfoService.java
@@ -1,5 +1,6 @@
 package com.cool.store.service;

+import com.cool.store.context.LoginUserInfo;
 import com.cool.store.entity.HyPartnerBaseInfoDO;
 import com.cool.store.entity.HyPartnerUserInfoDO;
 import com.cool.store.request.AddTagsRequest;
@@ -20,7 +21,7 @@ public interface HyPartnerBaseInfoService {
     * @param addTagsRequest
     * @return
     */
-    Boolean addTags(AddTagsRequest addTagsRequest);
+    Boolean addTags(LoginUserInfo userInfo,AddTagsRequest addTagsRequest);

    Boolean submitPartnerBaseInfo(PartnerBaseInfoRequest request, PartnerUserInfoVO currentUser);

--- a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerIntentInfoService.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerIntentInfoService.java
@@ -1,5 +1,6 @@
 package com.cool.store.service;

+import com.cool.store.context.LoginUserInfo;
 import com.cool.store.request.BaseUserInfoRequest;
 import com.cool.store.request.IndustryCognitionInfoRequest;
 import com.cool.store.request.PartnerIntentInfoRequest;
@@ -39,7 +40,7 @@ public interface HyPartnerIntentInfoService {
     * @param baseUserInfoRequest
     * @return
     */
-    Boolean updatePartnerIntentInfo(BaseUserInfoRequest baseUserInfoRequest);
+    Boolean updatePartnerIntentInfo(LoginUserInfo userInfo,BaseUserInfoRequest baseUserInfoRequest);

    Integer submitPartnerIntentInfo(PartnerIntentInfoRequest partnerIntentInfoRequest);

--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java
@@ -1,26 +1,30 @@
 package com.cool.store.service.impl;

 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.cool.store.constants.RedisConstant;
+import com.cool.store.context.CurrentUserHolder;
+import com.cool.store.context.LoginUserInfo;
 import com.cool.store.dao.HyPartnerBaseInfoDAO;
 import com.cool.store.dao.HyPartnerLineInfoDAO;
 import com.cool.store.dao.HyPartnerTaskInfoLogDAO;
 import com.cool.store.dao.HyPartnerUserInfoDAO;
+import com.cool.store.dto.log.AddTagsDTO;
+import com.cool.store.dto.log.BlackListLogDTO;
+import com.cool.store.dto.log.LineLogInfo;
 import com.cool.store.entity.HyPartnerBaseInfoDO;
 import com.cool.store.entity.HyPartnerLineInfoDO;
 import com.cool.store.entity.HyPartnerTaskInfoLogDO;
 import com.cool.store.entity.HyPartnerUserInfoDO;
-import com.cool.store.enums.ErrorCodeEnum;
-import com.cool.store.enums.LineStatusEnum;
-import com.cool.store.enums.WorkflowStageEnum;
-import com.cool.store.enums.WorkflowStatusEnum;
+import com.cool.store.enums.*;
 import com.cool.store.exception.ServiceException;
 import com.cool.store.request.AddTagsRequest;
 import com.cool.store.request.PartnerBaseInfoRequest;
 import com.cool.store.service.HyPartnerBaseInfoService;
 import com.cool.store.service.HyPartnerLineInfoService;
 import com.cool.store.service.HyPhoneLocationService;
+import com.cool.store.utils.CoolDateUtils;
 import com.cool.store.utils.RedisUtilPool;
 import com.cool.store.vo.PartnerBaseInfoVO;
 import com.cool.store.vo.PartnerUserInfoVO;
@@ -65,11 +69,24 @@ public class HyPartnerBaseInfoServiceImpl implements HyPartnerBaseInfoService {


    @Override
-    public Boolean addTags(AddTagsRequest addTagsRequest) {
-        HyPartnerBaseInfoDO hyPartnerBaseInfoDO = new HyPartnerBaseInfoDO();
-        hyPartnerBaseInfoDO.setId(addTagsRequest.getPartnerBaseInfoId());
-        hyPartnerBaseInfoDO.setUserPortrait(CollectionUtils.isNotEmpty(addTagsRequest.getTags())? JSONObject.toJSONString(addTagsRequest.getTags()):"");
-        hyPartnerBaseInfoDAO.updateByPrimaryKeySelective(hyPartnerBaseInfoDO);
+    public Boolean addTags(LoginUserInfo user, AddTagsRequest addTagsRequest) {
+        HyPartnerBaseInfoDO hyPartnerBaseInfo = hyPartnerBaseInfoDAO.selectById(addTagsRequest.getPartnerBaseInfoId());
+        if (hyPartnerBaseInfo==null){
+            throw new ServiceException(ErrorCodeEnum.PARTNER_BASE_INFO_NOT_EXIST);
+        }
+        hyPartnerBaseInfo.setId(addTagsRequest.getPartnerBaseInfoId());
+        hyPartnerBaseInfo.setUserPortrait(CollectionUtils.isNotEmpty(addTagsRequest.getTags())? JSONObject.toJSONString(addTagsRequest.getTags()):"");
+        hyPartnerBaseInfoDAO.updateByPrimaryKeySelective(hyPartnerBaseInfo);
+        HyPartnerLineInfoDO line = hyPartnerLineInfoDAO.getByPartnerId(hyPartnerBaseInfo.getPartnerId());
+        //添加日志
+        LineLogInfo lineLogInfo = new LineLogInfo(line.getPartnerId(), line.getId(), user.getUserId(),
+                user.getName(), OperateTypeEnum.ADD_TAGS,
+                WorkflowStageEnum.getWorkflowStageByCode(line.getWorkflowStage()),
+                line.getWorkflowStatus(), "");
+        AddTagsDTO logDTO = AddTagsDTO.builder().operateUserId(user.getUserId()).operateUsername(user.getName())
+                .mobile(user.getMobile()).operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC_2)).build();
+        lineLogInfo.setData(logDTO);
+        hyPartnerTaskInfoLogDAO.addOperateLog(lineLogInfo);
        return Boolean.TRUE;
    }

--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java
@@ -1,19 +1,21 @@
 package com.cool.store.service.impl;

 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.cool.store.constants.CommonConstants;
 import com.cool.store.constants.RedisConstant;
+import com.cool.store.context.LoginUserInfo;
 import com.cool.store.dao.*;
+import com.cool.store.dto.log.AddTagsDTO;
+import com.cool.store.dto.log.LineLogInfo;
+import com.cool.store.dto.log.UserInfoUpdateDTO;
 import com.cool.store.dto.partner.PartnerIntentApplyInfoDTO;
 import com.cool.store.entity.HyOpenAreaInfoDO;
 import com.cool.store.entity.HyPartnerIntentInfoDO;
 import com.cool.store.entity.HyPartnerLineInfoDO;
 import com.cool.store.entity.HyPartnerUserInfoDO;
-import com.cool.store.enums.ErrorCodeEnum;
-import com.cool.store.enums.LineStatusEnum;
-import com.cool.store.enums.WorkflowStageEnum;
-import com.cool.store.enums.WorkflowStatusEnum;
+import com.cool.store.enums.*;
 import com.cool.store.exception.ServiceException;
 import com.cool.store.request.BaseUserInfoRequest;
 import com.cool.store.request.IndustryCognitionInfoRequest;
@@ -22,6 +24,8 @@ import com.cool.store.request.PartnerWantShopInfoRequest;
 import com.cool.store.service.HyPartnerIntentInfoService;
 import com.cool.store.service.HyPartnerLineInfoService;
 import com.cool.store.service.HyPhoneLocationService;
+import com.cool.store.service.LogService;
+import com.cool.store.utils.CoolDateUtils;
 import com.cool.store.utils.RedisUtilPool;
 import com.cool.store.utils.StringUtil;
 import com.cool.store.vo.PartnerIntentApplyInfoVO;
@@ -38,10 +42,7 @@ import org.springframework.stereotype.Service;

 import javax.annotation.Resource;
 import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;

 /**
@@ -69,6 +70,8 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
    HyPartnerLineInfoService hyPartnerLineInfoService;
    @Resource
    HyPhoneLocationService hyPhoneLocationService;
+    @Resource
+    HyPartnerTaskInfoLogDAO hyPartnerTaskInfoLogDAO;

    @Override
    public PageInfo<PartnerIntentApplyInfoVO> getPartnerIntentApplyList(String userId, String type, Integer pageSize, Integer pageNumber) {
@@ -95,13 +98,15 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
        partnerIntentApplyInfo.setList(resultList);
        return partnerIntentApplyInfo;
    }
+
    @Override
-    public Boolean updatePartnerIntentInfo(BaseUserInfoRequest baseUserInfoRequest) {
+    public Boolean updatePartnerIntentInfo(LoginUserInfo userInfo, BaseUserInfoRequest baseUserInfoRequest) {

        HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(String.valueOf(baseUserInfoRequest.getPartnerId()));
        if (hyPartnerUserInfoDO==null){
            throw new ServiceException(ErrorCodeEnum.PARTNER_USER_NOT_EXIST);
        }
+        UserInfoUpdateDTO.UserInfoUpdate beforeUserinfoUpdate = new UserInfoUpdateDTO.UserInfoUpdate(hyPartnerUserInfoDO.getUsername(), hyPartnerUserInfoDO.getMobile(), hyPartnerUserInfoDO.getLiveArea(), hyPartnerUserInfoDO.getWantShopArea(), hyPartnerUserInfoDO.getAcceptAdjustType());
        hyPartnerUserInfoDO.setUsername(baseUserInfoRequest.getUsername());
        hyPartnerUserInfoDO.setMobile(baseUserInfoRequest.getMobile());
        hyPartnerUserInfoDO.setLiveArea(baseUserInfoRequest.getLiveArea());
@@ -109,6 +114,9 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
        hyPartnerUserInfoDO.setAcceptAdjustType(baseUserInfoRequest.getAcceptAdjustType());
        hyPartnerUserInfoDAO.updateByPrimaryKeySelective(hyPartnerUserInfoDO);

+        UserInfoUpdateDTO.UserInfoUpdate afterUserinfoUpdate = new UserInfoUpdateDTO.UserInfoUpdate(baseUserInfoRequest.getUsername(), baseUserInfoRequest.getMobile(), baseUserInfoRequest.getLiveArea(), baseUserInfoRequest.getWantShopArea(), baseUserInfoRequest.getAcceptAdjustType());
+
+
        //修改意向申请信息中的加盟商名称与手机号
        hyPartnerBaseInfoDAO.updateByPartnerId(baseUserInfoRequest.getUsername(),baseUserInfoRequest.getMobile(),baseUserInfoRequest.getPartnerId());

@@ -136,6 +144,15 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
            }
        }

+        LineLogInfo lineLogInfo = new LineLogInfo(hyPartnerLineInfoDO.getPartnerId(), hyPartnerLineInfoDO.getId(), userInfo.getUserId(),
+                userInfo.getName(), OperateTypeEnum.USERINFO_UPDATE,
+                WorkflowStageEnum.getWorkflowStageByCode(hyPartnerLineInfoDO.getWorkflowStage()),
+                hyPartnerLineInfoDO.getWorkflowStatus(), "");
+        UserInfoUpdateDTO logDTO = UserInfoUpdateDTO.builder().operateUserId(userInfo.getUserId()).operateUsername(userInfo.getName())
+                .beforeUserinfoUpdate(beforeUserinfoUpdate).afterUserinfoUpdate(afterUserinfoUpdate)
+                .mobile(userInfo.getMobile()).operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC_2)).build();
+        lineLogInfo.setData(logDTO);
+        hyPartnerTaskInfoLogDAO.addOperateLog(lineLogInfo);
        return Boolean.TRUE;
    }