From 4eed12c61f725bb74064a9c3264cc1dffa778a9a Mon Sep 17 00:00:00 2001
From: "xiaodong.hu" <1075471126@qq.com>
Date: Wed, 19 Jul 2023 16:00:10 +0800
Subject: [PATCH] =?UTF-8?q?ec=E6=9D=A5=E6=BA=90=E6=9B=B4=E6=94=B9=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/HyPartnerUserInfoMapper.xml    | 9 ++++++++-
 .../java/com/cool/store/entity/HyPartnerLineInfoDO.java  | 2 +-
 .../java/com/cool/store/entity/HyPartnerUserInfoDO.java  | 3 +++
 .../com/cool/store/service/impl/EcSyncServiceImpl.java   | 2 +-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml
index b78358495..a85d11647 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml
@@ -19,9 +19,10 @@
     <result column="recommend_partner_id" jdbcType="VARCHAR" property="recommendPartnerId" />
     <result column="recommend_partner_name" jdbcType="VARCHAR" property="recommendPartnerName" />
     <result column="recommend_partner_mobile" jdbcType="VARCHAR" property="recommendPartnerMobile" />
+    <result column="user_channel_id" jdbcType="VARCHAR" property="userChannelId" />
   </resultMap>
   <sql id="Base_Column_List">
-    id, partner_id, mobile, username, live_area, want_shop_area, accept_adjust_type, 
+    id, partner_id, mobile, username, live_area, want_shop_area, accept_adjust_type,user_channel_id,
     invite_code, is_write_partner_know, create_time, update_time, shop_code, shop_name, shop_id, recommend_partner_id, recommend_partner_name, recommend_partner_mobile
   </sql>
   <select id="selectByPartnerId" resultMap="BaseResultMap" >
@@ -115,6 +116,9 @@
       <if test="record.recommendPartnerMobile != null">
         recommend_partner_mobile,
         </if>
+      <if test="record.userChannelId != null">
+        user_channel_id,
+        </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="record.partnerId != null">
@@ -165,6 +169,9 @@
       <if test="record.recommendPartnerMobile != null">
         #{record.recommendPartnerMobile},
       </if>
+      <if test="record.userChannelId != null">
+        #{record.userChannelId},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective">
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLineInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLineInfoDO.java
index beda39416..b590f2f48 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLineInfoDO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLineInfoDO.java
@@ -80,6 +80,6 @@ public class HyPartnerLineInfoDO implements Serializable {
     @ApiModelProperty("移除黑名单原因")
     private String removeBlackReason;
 
-    @ApiModelProperty("hy_partner_user_channel.id")
+    @ApiModelProperty("hy_partner_user_channel.channel_id")
     private Integer userChannelId;
 }
\ No newline at end of file
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerUserInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerUserInfoDO.java
index c1f77aeae..6302f7cd7 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerUserInfoDO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerUserInfoDO.java
@@ -70,4 +70,7 @@ public class HyPartnerUserInfoDO implements Serializable {
 
     @ApiModelProperty("推荐加盟商手机号")
     private String recommendPartnerMobile;
+
+    @ApiModelProperty("hy_partner_user_channel.channel_id")
+    private Integer userChannelId;
 }
\ No newline at end of file
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java
index c8a981473..86a8f1e3a 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java
@@ -122,7 +122,7 @@ public class EcSyncServiceImpl implements EcSyncService {
         }
         String newPartnerId = UUIDUtils.get32UUID();
         HyPartnerUserInfoDO resultUser = new HyPartnerUserInfoDO();
-        resultUser.setUsername(customerInfoItem.getName()).setMobile(customerInfoItem.getMobile());
+        resultUser.setUsername(customerInfoItem.getName()).setMobile(customerInfoItem.getMobile()).setUserChannelId(Convert.toInt(channelId));
 
         HyPartnerLineInfoDO resultLine = new HyPartnerLineInfoDO();
         String followUserName = customerInfoItem.getFollowUserName();