BUG修复

src/main/java/com/lanren/huhu/partner/dao/UserAgentMapper.java

@@ -31,12 +31,6 @@ public interface UserAgentMapper extends BaseMapper<UserAgent> {
      */
     @SelectProvider(type = UserAgentSqlProvider.class, method = "getChildListByUserId")
     List<UserAgent> getChildListByUserId(@Param("userId") Integer userId, @Param("parentColumnName") String parentColumnName);
-    /**
-     * 将手机号为from的代理商的 平推 上级改为手机号为to的代理商
-     */
-    int updatePingtuiRelation(String from, String to);
-    /**
-     * 将手机号为from的代理商的 层级 上级改为手机号为to的代理商
-     */
-    int updateCengjiRelation(String from, String to);
+
+    UserAgent getUserAgentByPhone(String phone);
 }
\ No newline at end of file

src/main/java/com/lanren/huhu/partner/domain/UserAgent.java

@@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
-import lombok.Data;
 
 @Data
 @TableName(value = "user_agent")
@@ -14,30 +15,60 @@ public class UserAgent implements Serializable {
     @TableId(value = "agent_id", type = IdType.AUTO)
     private Integer agentId;
 
+    /**
+     * 用户ID
+     */
     @TableField(value = "user_id")
     private Integer userId;
 
+    /**
+     * 代理商名称
+     */
     @TableField(value = "agent_name")
     private String agentName;
 
+    /**
+     * 代理商电话
+     */
     @TableField(value = "agent_phone")
     private String agentPhone;
 
+    /**
+     * 代理商等级
+     */
     @TableField(value = "agent_level")
     private Integer agentLevel;
 
+    /**
+     * 等级名称
+     */
     @TableField(value = "node_agent_level_name")
     private String nodeAgentLevelName;
 
+    /**
+     * 上级代理商
+     */
     @TableField(value = "parent_agent_id")
     private Integer parentAgentId;
 
+    /**
+     * 公司昵称
+     */
+    @TableField(value = "company")
+    private String company;
+
     @TableField(value = "parent_agent_list")
     private String parentAgentList;
 
+    /**
+     * 持卡数量
+     */
     @TableField(value = "card_num")
     private Integer cardNum;
 
+    /**
+     * 未激活数量
+     */
     @TableField(value = "card_activate_num")
     private Integer cardActivateNum;
 
@@ -99,6 +130,15 @@ public class UserAgent implements Serializable {
     private Integer deletedAt;
 
     /**
+     * 推荐者ID 默认为上级ID 只有4级代理商用户有这个值
+     */
+    @TableField(value = "presenter_id")
+    private Integer presenterId;
+
+    @TableField(value = "present_time")
+    private Integer presentTime;
+
+    /**
      * level1 id
      */
     @TableField(value = "agent_level_one")
@@ -136,6 +176,8 @@ public class UserAgent implements Serializable {
 
     public static final String COL_PARENT_AGENT_ID = "parent_agent_id";
 
+    public static final String COL_COMPANY = "company";
+
     public static final String COL_PARENT_AGENT_LIST = "parent_agent_list";
 
     public static final String COL_CARD_NUM = "card_num";
@@ -172,6 +214,10 @@ public class UserAgent implements Serializable {
 
     public static final String COL_DELETED_AT = "deleted_at";
 
+    public static final String COL_PRESENTER_ID = "presenter_id";
+
+    public static final String COL_PRESENT_TIME = "present_time";
+
     public static final String COL_AGENT_LEVEL_ONE = "agent_level_one";
 
     public static final String COL_AGENT_LEVEL_TWO = "agent_level_two";

src/main/resources/mapper/UserAgentMapper.xml

@@ -10,6 +10,7 @@
     <result column="agent_level" property="agentLevel" />
     <result column="node_agent_level_name" property="nodeAgentLevelName" />
     <result column="parent_agent_id" property="parentAgentId" />
+    <result column="company" property="company" />
     <result column="parent_agent_list" property="parentAgentList" />
     <result column="card_num" property="cardNum" />
     <result column="card_activate_num" property="cardActivateNum" />
@@ -28,6 +29,8 @@
     <result column="created_at" property="createdAt" />
     <result column="updated_at" property="updatedAt" />
     <result column="deleted_at" property="deletedAt" />
+    <result column="presenter_id" property="presenterId" />
+    <result column="present_time" property="presentTime" />
     <result column="agent_level_one" property="agentLevelOne" />
     <result column="agent_level_two" property="agentLevelTwo" />
     <result column="agent_level_three" property="agentLevelThree" />
@@ -36,10 +39,10 @@
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
     agent_id, user_id, agent_name, agent_phone, agent_level, node_agent_level_name, parent_agent_id, 
-    parent_agent_list, card_num, card_activate_num, commission_rate, pid, jd_pid, `identity`, 
-    account_type, account, have_card, remark, register_from, invite_time, active_time, 
-    agent_state, created_at, updated_at, deleted_at, agent_level_one, agent_level_two, 
-    agent_level_three, agent_level_four
+    company, parent_agent_list, card_num, card_activate_num, commission_rate, pid, jd_pid, 
+    `identity`, account_type, account, have_card, remark, register_from, invite_time, 
+    active_time, agent_state, created_at, updated_at, deleted_at, presenter_id, present_time, 
+    agent_level_one, agent_level_two, agent_level_three, agent_level_four
   </sql>
   <update id="updateBatch" parameterType="java.util.List">
     <!--@mbg.generated-->
@@ -75,6 +78,11 @@
           when agent_id = #{item.agentId} then #{item.parentAgentId}
         </foreach>
       </trim>
+      <trim prefix="company = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when agent_id = #{item.agentId} then #{item.company}
+        </foreach>
+      </trim>
       <trim prefix="parent_agent_list = case" suffix="end,">
         <foreach collection="list" index="index" item="item">
           when agent_id = #{item.agentId} then #{item.parentAgentList}
@@ -165,6 +173,16 @@
           when agent_id = #{item.agentId} then #{item.deletedAt}
         </foreach>
       </trim>
+      <trim prefix="presenter_id = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when agent_id = #{item.agentId} then #{item.presenterId}
+        </foreach>
+      </trim>
+      <trim prefix="present_time = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when agent_id = #{item.agentId} then #{item.presentTime}
+        </foreach>
+      </trim>
       <trim prefix="agent_level_one = case" suffix="end,">
         <foreach collection="list" index="index" item="item">
           when agent_id = #{item.agentId} then #{item.agentLevelOne}
@@ -195,17 +213,18 @@
     <!--@mbg.generated-->
     insert into user_agent
     (user_id, agent_name, agent_phone, agent_level, node_agent_level_name, parent_agent_id, 
-      parent_agent_list, card_num, card_activate_num, commission_rate, pid, jd_pid, `identity`, 
-      account_type, account, have_card, remark, register_from, invite_time, active_time, 
-      agent_state, created_at, updated_at, deleted_at, agent_level_one, agent_level_two, 
-      agent_level_three, agent_level_four)
+      company, parent_agent_list, card_num, card_activate_num, commission_rate, pid, 
+      jd_pid, `identity`, account_type, account, have_card, remark, register_from, invite_time, 
+      active_time, agent_state, created_at, updated_at, deleted_at, presenter_id, present_time, 
+      agent_level_one, agent_level_two, agent_level_three, agent_level_four)
     values
     <foreach collection="list" item="item" separator=",">
       (#{item.userId}, #{item.agentName}, #{item.agentPhone}, #{item.agentLevel}, #{item.nodeAgentLevelName}, 
-        #{item.parentAgentId}, #{item.parentAgentList}, #{item.cardNum}, #{item.cardActivateNum}, 
-        #{item.commissionRate}, #{item.pid}, #{item.jdPid}, #{item.identity}, #{item.accountType}, 
-        #{item.account}, #{item.haveCard}, #{item.remark}, #{item.registerFrom}, #{item.inviteTime}, 
-        #{item.activeTime}, #{item.agentState}, #{item.createdAt}, #{item.updatedAt}, #{item.deletedAt}, 
+        #{item.parentAgentId}, #{item.company}, #{item.parentAgentList}, #{item.cardNum}, 
+        #{item.cardActivateNum}, #{item.commissionRate}, #{item.pid}, #{item.jdPid}, #{item.identity}, 
+        #{item.accountType}, #{item.account}, #{item.haveCard}, #{item.remark}, #{item.registerFrom}, 
+        #{item.inviteTime}, #{item.activeTime}, #{item.agentState}, #{item.createdAt}, 
+        #{item.updatedAt}, #{item.deletedAt}, #{item.presenterId}, #{item.presentTime}, 
         #{item.agentLevelOne}, #{item.agentLevelTwo}, #{item.agentLevelThree}, #{item.agentLevelFour}
         )
     </foreach>
@@ -223,6 +242,7 @@
       agent_level,
       node_agent_level_name,
       parent_agent_id,
+      company,
       parent_agent_list,
       card_num,
       card_activate_num,
@@ -241,6 +261,8 @@
       created_at,
       updated_at,
       deleted_at,
+      presenter_id,
+      present_time,
       agent_level_one,
       agent_level_two,
       agent_level_three,
@@ -257,6 +279,7 @@
       #{agentLevel},
       #{nodeAgentLevelName},
       #{parentAgentId},
+      #{company},
       #{parentAgentList},
       #{cardNum},
       #{cardActivateNum},
@@ -275,6 +298,8 @@
       #{createdAt},
       #{updatedAt},
       #{deletedAt},
+      #{presenterId},
+      #{presentTime},
       #{agentLevelOne},
       #{agentLevelTwo},
       #{agentLevelThree},
@@ -291,6 +316,7 @@
       agent_level = #{agentLevel},
       node_agent_level_name = #{nodeAgentLevelName},
       parent_agent_id = #{parentAgentId},
+      company = #{company},
       parent_agent_list = #{parentAgentList},
       card_num = #{cardNum},
       card_activate_num = #{cardActivateNum},
@@ -309,6 +335,8 @@
       created_at = #{createdAt},
       updated_at = #{updatedAt},
       deleted_at = #{deletedAt},
+      presenter_id = #{presenterId},
+      present_time = #{presentTime},
       agent_level_one = #{agentLevelOne},
       agent_level_two = #{agentLevelTwo},
       agent_level_three = #{agentLevelThree},
@@ -340,6 +368,9 @@
       <if test="parentAgentId != null">
         parent_agent_id,
       </if>
+      <if test="company != null">
+        company,
+      </if>
       <if test="parentAgentList != null">
         parent_agent_list,
       </if>
@@ -394,6 +425,12 @@
       <if test="deletedAt != null">
         deleted_at,
       </if>
+      <if test="presenterId != null">
+        presenter_id,
+      </if>
+      <if test="presentTime != null">
+        present_time,
+      </if>
       <if test="agentLevelOne != null">
         agent_level_one,
       </if>
@@ -430,6 +467,9 @@
       <if test="parentAgentId != null">
         #{parentAgentId},
       </if>
+      <if test="company != null">
+        #{company},
+      </if>
       <if test="parentAgentList != null">
         #{parentAgentList},
       </if>
@@ -484,6 +524,12 @@
       <if test="deletedAt != null">
         #{deletedAt},
       </if>
+      <if test="presenterId != null">
+        #{presenterId},
+      </if>
+      <if test="presentTime != null">
+        #{presentTime},
+      </if>
       <if test="agentLevelOne != null">
         #{agentLevelOne},
       </if>
@@ -520,6 +566,9 @@
       <if test="parentAgentId != null">
         parent_agent_id = #{parentAgentId},
       </if>
+      <if test="company != null">
+        company = #{company},
+      </if>
       <if test="parentAgentList != null">
         parent_agent_list = #{parentAgentList},
       </if>
@@ -574,6 +623,12 @@
       <if test="deletedAt != null">
         deleted_at = #{deletedAt},
       </if>
+      <if test="presenterId != null">
+        presenter_id = #{presenterId},
+      </if>
+      <if test="presentTime != null">
+        present_time = #{presentTime},
+      </if>
       <if test="agentLevelOne != null">
         agent_level_one = #{agentLevelOne},
       </if>
@@ -588,14 +643,7 @@
       </if>
     </trim>
   </insert>
-  <update id="updatePingtuiRelation">
-    UPDATE user_agent
-    SET presenter_id=(SELECT agent_id FROM user_agent WHERE agent_phone=#{to})
-    WHERE agent_phone=#{from}
-  </update>
-  <update id="updateCengjiRelation">
-    UPDATE user_agent
-    SET parent_agent_id=(SELECT agent_id FROM user_agent WHERE agent_phone=#{to})
-    WHERE agent_phone=#{from}
-  </update>
+  <select id="getUserAgentByPhone" resultMap="BaseResultMap">
+    SELECT * FROM user_agent b WHERE agent_phone=#{phone}
+  </select>
 </mapper>
\ No newline at end of file