Merge branch 'hxd/feat/labelAndlLine' into dev/feat/partner1.3_20230828

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

@@ -20,12 +20,16 @@
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="close_time" jdbcType="TIMESTAMP" property="closeTime" />
     <result column="close_user_id" jdbcType="VARCHAR" property="closeUserId" />
+    <result column="create_user_id" jdbcType="VARCHAR" property="createUserId" />
+    <result column="create_user_mobile" jdbcType="VARCHAR" property="createUserMobile" />
+    <result column="operator_type" jdbcType="VARCHAR" property="operatorType" />
+    <result column="update_user_id" jdbcType="VARCHAR" property="updateUserId" />
   </resultMap>
   <sql id="Base_Column_List">
     id, partner_id, workflow_stage, workflow_status, line_status, investment_manager, 
     development_director, development_manager, deadline, pass_reason, reject_public_reason, 
     reject_real_reason, certify_file, deleted, create_time, update_time, close_time, 
-    close_user_id
+    close_user_id,create_user_id,create_user_mobile,operator_type,update_user_id
   </sql>
 
   <select id="selectByPrimaryKeySelective" resultMap="BaseResultMap">
@@ -124,6 +128,18 @@
       <if test="record.closeUserId != null">
         close_user_id,
       </if>
+      <if test="record.createUserId != null">
+        create_user_id,
+      </if>
+      <if test="record.createUserMobile != null">
+        create_user_mobile,
+      </if>
+      <if test="record.operatorType != null">
+        operator_type,
+      </if>
+      <if test="record.updateUserId != null">
+        update_user_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="record.partnerId != null">
@@ -177,6 +193,18 @@
       <if test="record.closeUserId != null">
         #{record.closeUserId},
       </if>
+      <if test="record.createUserId != null">
+        #{record.createUserId},
+      </if>
+      <if test="record.createUserMobile != null">
+        #{record.createUserMobile},
+      </if>
+      <if test="record.operatorType != null">
+        #{record.operatorType},
+      </if>
+      <if test="record.updateUserId != null">
+        #{record.updateUserId},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective">

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

@@ -82,4 +82,16 @@ public class HyPartnerLineInfoDO implements Serializable {
 
     @ApiModelProperty("hy_partner_user_channel.channel_id")
     private Integer userChannelId;
+
+    @ApiModelProperty("创建人")
+    private  String createUserId;
+
+    @ApiModelProperty("创建人手机号")
+    private  String createUserMobile;
+
+    @ApiModelProperty("操作类型")
+    private  String operatorType;
+
+    @ApiModelProperty("更新人")
+    private  String updateUserId;
 }

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

@@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.cool.store.constants.ExcelErrorConstants;
+import com.cool.store.context.CurrentUserHolder;
 import com.cool.store.dao.*;
 import com.cool.store.entity.*;
 import com.cool.store.enums.*;
@@ -77,7 +78,7 @@ public class LineHighSeasServiceImpl implements LineHighSeasService {
         if (ObjectUtil.isNotNull(hyPartnerUserInfoDO)) {
             throw new ServiceException(ErrorCodeEnum.PARTNER_MOBILE_EXIST);
         }
-        return add(request);
+        return add(request,"add");
     }
 
 
@@ -86,7 +87,7 @@ public class LineHighSeasServiceImpl implements LineHighSeasService {
      *
      * @param request
      */
-    public boolean add(AddLineRequest request) {
+    public boolean add(AddLineRequest request,String type) {
         Boolean flag =false;
         String partnerId = UUIDUtils.get32UUID();
         HyPartnerUserInfoDO resultUser = new HyPartnerUserInfoDO();
@@ -95,7 +96,9 @@ public class LineHighSeasServiceImpl implements LineHighSeasService {
         hyPartnerUserInfoDAO.insertSelective(resultUser);
 
         HyPartnerLineInfoDO resultLine = new HyPartnerLineInfoDO();
-        resultLine.setPartnerId(partnerId).setCreateTime(new Date()).setWorkflowStage(WorkflowStageEnum.INTENT.getCode());
+        resultLine.setPartnerId(partnerId).setCreateTime(new Date()).setWorkflowStage(WorkflowStageEnum.INTENT.getCode())
+                .setCreateUserId(CurrentUserHolder.getUserId()).setCreateUserMobile(CurrentUserHolder.getUser().getMobile())
+                .setOperatorType(type);
 
         //判断招商经理是否为空
         if (StringUtil.isNotEmpty(request.getInvestmentManager())) {
@@ -231,7 +234,7 @@ public class LineHighSeasServiceImpl implements LineHighSeasService {
             AddLineRequest addLineRequest = new AddLineRequest();
             BeanUtil.copyProperties(hyPartnerLineDO, addLineRequest);
             addLineRequest.setWantShopArea(hyPartnerLineDO.getWantShopArea().toString());
-            add(addLineRequest);
+            add(addLineRequest,"import");
         }
         return new ResponseResult(ResponseCodeEnum.SUCCESS.getCode(), "共上传" + lineDOList.size() + "条线索", new ErrorExcelResponse(lineDOList.size(), styleCells.size(), fileStr));
     }