插入日志

coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerTaskInfoLogDAO.java

@@ -0,0 +1,30 @@
+package com.cool.store.dao;
+
+import com.cool.store.entity.HyPartnerTaskInfoLogDO;
+import com.cool.store.mapper.HyPartnerTaskInfoLogMapper;
+import org.springframework.stereotype.Repository;
+
+import javax.annotation.Resource;
+
+/**
+ * @Author wxp
+ * @Date 2023/6/25 19:41
+ * @Version 1.0
+ */
+@Repository
+public class HyPartnerTaskInfoLogDAO {
+
+
+    @Resource
+    HyPartnerTaskInfoLogMapper hyPartnerTaskInfoLogMapper;
+
+
+    public int updateByPrimaryKeySelective(HyPartnerTaskInfoLogDO hyPartnerTaskInfoLogDO){
+        return hyPartnerTaskInfoLogMapper.updateByPrimaryKeySelective(hyPartnerTaskInfoLogDO);
+    }
+
+    public  int insertSelective( HyPartnerTaskInfoLogDO record){
+        return hyPartnerTaskInfoLogMapper.insertSelective(record);
+    }
+
+}

coolstore-partner-dao/src/main/resources/mapper/HyPartnerTaskInfoLogMapper.xml

@@ -11,7 +11,7 @@
     <result column="message" jdbcType="VARCHAR" property="message" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="partner_id" jdbcType="BIGINT" property="partnerId" />
+    <result column="partner_id" jdbcType="VARCHAR" property="partnerId" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.cool.store.entity.HyPartnerTaskInfoLogDO">
     <result column="field_copy" jdbcType="LONGVARCHAR" property="fieldCopy" />

coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerTaskInfoLogDO.java

@@ -46,8 +46,18 @@ public class HyPartnerTaskInfoLogDO implements Serializable {
     private Date updateTime;
 
     @ApiModelProperty("hy_partner_user_info.partner_id")
-    private Long partnerId;
+    private String partnerId;
 
     @ApiModelProperty("字段备份")
     private String fieldCopy;
+
+    public HyPartnerTaskInfoLogDO(String partnerId, Long partnerLineId, String workflowStage, String workflowStatus, String operateUserId, String operateUsername, String message) {
+        this.partnerId = partnerId;
+        this.partnerLineId = partnerLineId;
+        this.workflowStage = workflowStage;
+        this.workflowStatus = workflowStatus;
+        this.operateUserId = operateUserId;
+        this.operateUsername = operateUsername;
+        this.message = message;
+    }
 }

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

@@ -22,7 +22,7 @@ public interface HyPartnerBaseInfoService {
      */
     Boolean addTags(AddTagsRequest addTagsRequest);
 
-    Boolean submitPartnerBaseInfo(PartnerBaseInfoRequest request);
+    Boolean submitPartnerBaseInfo(PartnerBaseInfoRequest request, PartnerUserInfoVO currentUser);
 
     PartnerBaseInfoVO queryPartnerBaseInfo(String partnerId, Long lineId);
 

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

@@ -5,9 +5,11 @@ import com.alibaba.fastjson.JSONObject;
 import com.cool.store.constants.RedisConstant;
 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.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;
@@ -53,6 +55,10 @@ public class HyPartnerBaseInfoServiceImpl implements HyPartnerBaseInfoService {
     @Resource
     private RedisUtilPool redisUtilPool;
 
+    @Resource
+    HyPartnerTaskInfoLogDAO hyPartnerTaskInfoLogDAO;
+
+
     @Override
     public Boolean addTags(AddTagsRequest addTagsRequest) {
         HyPartnerBaseInfoDO hyPartnerBaseInfoDO = new HyPartnerBaseInfoDO();
@@ -69,7 +75,7 @@ public class HyPartnerBaseInfoServiceImpl implements HyPartnerBaseInfoService {
      * @return
      */
     @Override
-    public Boolean submitPartnerBaseInfo(PartnerBaseInfoRequest request) {
+    public Boolean submitPartnerBaseInfo(PartnerBaseInfoRequest request, PartnerUserInfoVO currentUser) {
         String cacheKey = MessageFormat.format(RedisConstant.PARTNER_BASEINFO_CACHE_KEY, request.getPartnerId(), request.getPartnerLineId());
         if(!request.getSubmitFlag()){
             // 自动保存时
@@ -94,6 +100,10 @@ public class HyPartnerBaseInfoServiceImpl implements HyPartnerBaseInfoService {
             HyPartnerBaseInfoDO hyPartnerBaseInfoDO = hyPartnerBaseInfoDAO.getByPartnerIdAndLineId(request.getPartnerId(), request.getPartnerLineId());
             hyPartnerBaseInfoDO.setStatus(Integer.valueOf(WorkflowStatusEnum.INTENT_1.getCode()));
             hyPartnerBaseInfoDAO.updateByPrimaryKeySelective(hyPartnerBaseInfoDO);
+
+            HyPartnerTaskInfoLogDO logDO = new  HyPartnerTaskInfoLogDO(request.getPartnerId(), request.getPartnerLineId(), WorkflowStageEnum.INTENT.getCode(), WorkflowStatusEnum.INTENT_1.getCode(), currentUser.getPartnerId(), currentUser.getUsername(), null);
+
+            hyPartnerTaskInfoLogDAO.insertSelective(logDO);
         }
         // 清空暂存信息
         redisUtilPool.delKey(cacheKey);

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

@@ -160,7 +160,9 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
         }
         HyPartnerIntentInfoDO intentInfoDO = hyPartnerIntentInfoDAO.getByPartnerIdAndLineId(userInfoVO.getPartnerId(), lineId);
         PartnerIntentInfoVO intentInfoVO = new PartnerIntentInfoVO();
+        intentInfoVO.setLiveArea(userInfoVO.getLiveArea());
         intentInfoVO.setWantShopArea(userInfoVO.getWantShopArea());
+        intentInfoVO.setAcceptAdjustType(userInfoVO.getAcceptAdjustType());
         if (intentInfoDO != null){
             BeanUtil.copyProperties(intentInfoDO, intentInfoVO);
         }

coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java

@@ -96,7 +96,8 @@ public class PartnerController {
     public ResponseResult<Boolean> submitPartnerBaseInfo(@RequestBody PartnerBaseInfoRequest baseInfoRequest){
         //前提 未提交加盟申请
         //成功 意向区域变更成功  失败 您已进入意向申请流程，当前不可变更意向区域
-        return ResponseResult.success(hyPartnerBaseInfoService.submitPartnerBaseInfo(baseInfoRequest));
+        PartnerUserInfoVO currentUser = PartnerUserHolder.getUser();
+        return ResponseResult.success(hyPartnerBaseInfoService.submitPartnerBaseInfo(baseInfoRequest, currentUser));
     }
 
     @PostMapping(path = "/submitPartnerClerkInfo")