Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

coolstore-partner-common/src/main/java/com/cool/store/enums/OperateTypeEnum.java

@@ -29,8 +29,8 @@ public enum OperateTypeEnum {
     REJECT_INTERVIEW("reject_interview", "合作资格面试-拒绝并结束跟进", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME, REJECT_PUBLIC_REASON,REJECT_REAL_REASON, CERTIFY_FILE)),
     CREATE_QUALIFYVERIFY("create_qualifyverify", "合作资格面试-创建资格审核", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME,SUMMARY,QUALI_VERIFY_CONTENT)),
     USERINFO_UPDATE("userinfo_update", "修改（修改意向信息）", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME, BEFORE_USERINFO_UPDATE, AFTER_USERINFO_UPDATE)),
-    INTENT_INFO_SUBMIT("intent_info_submit", "提交意向申请书", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME)),
+    INTENT_INFO_SUBMIT("intent_info_submit", "提交意向申请书", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME, BEFORE_INTENT_INFO_UPDATE, AFTER_INTENT_INFO_UPDATE)),
-    INTENT_INFO_UPDATE("intent_info_update", "修改意向申请书", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME)),
+    INTENT_INFO_UPDATE("intent_info_update", "修改意向申请书", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME, BEFORE_INTENT_INFO_UPDATE, AFTER_INTENT_INFO_UPDATE)),
     ADD_TAGS("add_tags", "修改意向申请书", Arrays.asList(OPERATE_USER_ID,OPERATE_USER_NAME, MOBILE, OPERATE_TIME)),
     ;
 

coolstore-partner-model/src/main/java/com/cool/store/dto/log/WantInfoUpdateDTO.java

@@ -0,0 +1,89 @@
+package com.cool.store.dto.log;
+
+import lombok.Data;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+
+/**
+ * @Author: wxp
+ * @Date: 2023-06-30  10:23
+ * @Description:
+ */
+@Data
+@SuperBuilder
+public class WantInfoUpdateDTO extends LogBasicDTO{
+
+    private BaseInfoUpdate beforeBaseInfoUpdate;
+    private BaseInfoUpdate afterBaseInfoUpdate;
+
+    private IntentInfoUpdate beforeIntentInfoUpdate;
+    private IntentInfoUpdate afterIntentInfoUpdate;
+
+    private ClerkUpdate beforeClerkUpdate;
+    private ClerkUpdate afterClerkUpdate;
+
+    @Data
+    public static class BaseInfoUpdate{
+        private Long id;
+        private String partnerId;
+        private Long partnerLineId;
+        private String mobile;
+        private String username;
+        private Integer sex;
+        private String nation;
+        private Date birthdate;
+        private String idCard;
+        private String idCardPhotoFront;
+        private String idCardPhotoBlack;
+        private String liveAddress;
+        private String userPortrait;
+        private Integer status;
+        private String latestLogMessage;
+        private String passReason;
+        private String certifyFile;
+        private Date passTime;
+        private String passUserId;
+    }
+
+    @Data
+    public static class IntentInfoUpdate{
+        private Long id;
+        private String partnerId;
+        private Long partnerLineId;
+        private String liveArea;
+        private String wantShopArea;
+        private Integer acceptAdjustType;
+        private Integer isHaveWantShop;
+        private String wantShopInfo;
+        private String maxBudget;
+        private String moneySource;
+        private String moneyProve;
+        private String education;
+        private String workYear;
+        private Integer isHaveWorkExp;
+        private String workExp;
+        private Integer isConsumer;
+        private String otherBand;
+        private String brandStrength;
+        private String needImprove;
+        private String strength;
+        private String weakness;
+        private String passCause;
+        private Date passTime;
+        private String passUser;
+        private String passCertifyFile;
+    }
+
+    @Data
+    public static class ClerkUpdate{
+        private Long id;
+        private Long partnerLineId;
+        private String partnerId;
+        private String username;
+        private String relationship;
+        private Integer age;
+        private String chooseReason;
+    }
+
+}

coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonServiceImpl.java

@@ -68,12 +68,7 @@ public class CommonServiceImpl implements CommonService {
         } else if (workflowStage.equals(WorkflowStageEnum.INTERVIEW.getCode()) && workflowStatus.equals(WorkflowStatusEnum.INTERVIEW_4.getCode())) {
             return getInterviewTips(partnerLineId, OperateTypeEnum.FINISH_INTERVIEW, "结束面试");
         }else if (workflowStage.equals(WorkflowStageEnum.INTERVIEW.getCode()) && workflowStatus.equals(WorkflowStatusEnum.INTERVIEW_5.getCode())) {
-            HyPartnerCertificationInfoDO partnerCertificationInfoDO = hyPartnerCertificationInfoMapper.selectByPartnerLineId(partnerLineId);
+            return getInterviewTips(partnerLineId, OperateTypeEnum.FINISH_INTERVIEW, "发起加盟商资质审核");
-            String intentionContractNo = null;
-            if(partnerCertificationInfoDO != null){
-                intentionContractNo = partnerCertificationInfoDO.getIntentionContractNo();
-            }
-            return getInterviewTips(partnerLineId, OperateTypeEnum.FINISH_INTERVIEW, "发起加盟商资质审核 | "+intentionContractNo);
         }else if (workflowStage.equals(WorkflowStageEnum.INTERVIEW.getCode()) && workflowStatus.equals(WorkflowStatusEnum.INTERVIEW_6.getCode())) {
             HyPartnerCertificationInfoDO partnerCertificationInfoDO = hyPartnerCertificationInfoMapper.selectByPartnerLineId(partnerLineId);
             String intentionContractNo = null;

coolstore-partner-service/src/main/java/com/cool/store/service/impl/ContentServiceImpl.java

@@ -64,11 +64,6 @@ public class ContentServiceImpl implements ContentService {
      */
     @Override
     public void updateContent(ContentUpdateDto dto) throws ApiException {
-        //增加不允许重复标题的逻辑
-        Boolean isDuplicated = contentInfoMapper.whetherTitleDuplicated(dto.getContentTitle());
-        if (isDuplicated) {
-            throw new ApiException(ErrorCodeEnum.CONTENT_DUPLICATED);
-        }
         HyContentInfoDO hyContentInfoDO = new HyContentInfoDO();
         BeanUtil.copyProperties(dto, hyContentInfoDO);
         hyContentInfoDO.setId(Long.parseLong(dto.getContentId()));

coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java

@@ -208,8 +208,12 @@ public class HyPartnerBaseInfoServiceImpl implements HyPartnerBaseInfoService {
         oldBaseInfo.setStatus(Integer.valueOf(WorkflowStatusEnum.INTENT_0.getCode()));
         //修改名称
         HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(newPartnerId);
-        if(!hyPartnerUserInfoDO.getUsername().equals(oldBaseInfo.getUsername())){
+        HyPartnerIntentInfoDO oldIntentInfo = hyPartnerIntentInfoDAO.getByPartnerIdAndLineId(oldLineInfo.getPartnerId(), oldLineInfo.getId());
+        if(!hyPartnerUserInfoDO.getUsername().equals(oldBaseInfo.getUsername()) || !hyPartnerUserInfoDO.getWantShopArea().equals(oldIntentInfo.getWantShopArea())
+                || !hyPartnerUserInfoDO.getAcceptAdjustType().equals(oldIntentInfo.getAcceptAdjustType())){
             hyPartnerUserInfoDO.setUsername(oldBaseInfo.getUsername());
+            hyPartnerUserInfoDO.setWantShopArea(oldIntentInfo.getWantShopArea());
+            hyPartnerUserInfoDO.setAcceptAdjustType(oldIntentInfo.getAcceptAdjustType());
             hyPartnerUserInfoDAO.updateByPrimaryKeySelective(hyPartnerUserInfoDO);
         }
         hyPartnerBaseInfoDAO.updateByPrimaryKey(oldBaseInfo);

coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java

@@ -6,10 +6,12 @@ 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.context.PartnerUserHolder;
 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.log.WantInfoUpdateDTO;
 import com.cool.store.dto.partner.PartnerIntentApplyInfoDTO;
 import com.cool.store.entity.HyOpenAreaInfoDO;
 import com.cool.store.entity.HyPartnerIntentInfoDO;
@@ -38,6 +40,7 @@ import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -72,6 +75,8 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
     HyPhoneLocationService hyPhoneLocationService;
     @Resource
     HyPartnerTaskInfoLogDAO hyPartnerTaskInfoLogDAO;
+    @Autowired
+    private LogService logService;
 
     @Override
     public PageInfo<PartnerIntentApplyInfoVO> getPartnerIntentApplyList(String userId, String type, Integer pageSize, Integer pageNumber) {
@@ -186,14 +191,20 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
             redisUtilPool.setString(cacheKey, JSONObject.toJSONString(request), RedisConstant.ONE_DAY_SECONDS);
             return null;
         }
+        WantInfoUpdateDTO.IntentInfoUpdate beforeIntentInfoUpdate = new WantInfoUpdateDTO.IntentInfoUpdate();
+        WantInfoUpdateDTO.IntentInfoUpdate afterIntentInfoUpdate = new WantInfoUpdateDTO.IntentInfoUpdate();
+
         HyPartnerIntentInfoDO intentInfoDO = hyPartnerIntentInfoDAO.getByPartnerIdAndLineId(request.getPartnerId(), request.getPartnerLineId());
         if(intentInfoDO == null){
             intentInfoDO = new HyPartnerIntentInfoDO();
             fillIntentInfo(intentInfoDO, request);
             hyPartnerIntentInfoDAO.insertSelective(intentInfoDO);
+            BeanUtil.copyProperties(intentInfoDO, beforeIntentInfoUpdate);
         }else {
+            BeanUtil.copyProperties(intentInfoDO, beforeIntentInfoUpdate);
             fillIntentInfo(intentInfoDO, request);
             hyPartnerIntentInfoDAO.updateByPrimaryKeySelective(intentInfoDO);
+            BeanUtil.copyProperties(intentInfoDO, afterIntentInfoUpdate);
         }
         redisUtilPool.delKey(cacheKey);
         HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(request.getPartnerId());
@@ -215,6 +226,12 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
                 hyPartnerLineInfoDAO.updateByPrimaryKeySelective(hyPartnerLineInfoDO);
             }
         }
+        //记录日志
+        PartnerUserInfoVO operator = PartnerUserHolder.getUser();
+        WantInfoUpdateDTO log = WantInfoUpdateDTO.builder().mobile(operator.getMobile()).operateUserId(operator.getPartnerId()).operateUsername(operator.getUsername())
+                .operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC))
+                .beforeIntentInfoUpdate(beforeIntentInfoUpdate).afterIntentInfoUpdate(afterIntentInfoUpdate).build();
+        logService.recordPartnerBizLog(operator,hyPartnerLineInfoDO.getId(), OperateTypeEnum.INTENT_INFO_UPDATE,log);
         return hyPartnerLineInfoDO.getLineStatus();
     }