From a84e4479f2e1296f85b0ca8a9e8383555879fa6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <zhuhong.su@coolcollege.cn>
Date: Thu, 6 Jul 2023 11:06:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8D=A2=E7=BB=91=E5=BE=AE=E4=BF=A1=20?=
 =?UTF-8?q?=E6=8D=A2=E7=BB=91=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/HyPartnerBaseInfoServiceImpl.java     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java
index 8f7c5aa53..ca44812f5 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerBaseInfoServiceImpl.java
@@ -206,6 +206,7 @@ public class HyPartnerBaseInfoServiceImpl implements HyPartnerBaseInfoService {
         // 把旧线索的身份证号置空，状态改为待提交
         HyPartnerBaseInfoDO oldBaseInfo = hyPartnerBaseInfoDAO.getByIdCard(idCard);
         HyPartnerLineInfoDO oldLineInfo = hyPartnerLineInfoDAO.selectByPrimaryKeySelective(oldBaseInfo.getPartnerLineId());
+        HyPartnerUserInfoDO oldPartnerUser = hyPartnerUserInfoDAO.selectByPartnerId(oldBaseInfo.getPartnerId());
         // 该身份证当前申请状态同步至该账号下，原账号变为【加盟意向申请 待提交状态】
         HyPartnerLineInfoDO newLineInfo =  hyPartnerLineInfoDAO.selectByPrimaryKeySelective(lineId);
         Long newLindId = newLineInfo.getId();
@@ -230,8 +231,15 @@ public class HyPartnerBaseInfoServiceImpl implements HyPartnerBaseInfoService {
             hyPartnerUserInfoDO.setUsername(oldBaseInfo.getUsername());
             hyPartnerUserInfoDO.setWantShopArea(oldIntentInfo.getWantShopArea());
             hyPartnerUserInfoDO.setAcceptAdjustType(oldIntentInfo.getAcceptAdjustType());
-            hyPartnerUserInfoDAO.updateByPrimaryKeySelective(hyPartnerUserInfoDO);
+
         }
+        hyPartnerUserInfoDO.setRecommendPartnerId(oldPartnerUser.getRecommendPartnerId());
+        hyPartnerUserInfoDO.setRecommendPartnerName(oldPartnerUser.getRecommendPartnerName());
+        hyPartnerUserInfoDO.setRecommendPartnerMobile(oldPartnerUser.getRecommendPartnerMobile());
+        hyPartnerUserInfoDO.setShopCode(oldPartnerUser.getShopCode());
+        hyPartnerUserInfoDO.setShopName(oldPartnerUser.getShopName());
+        hyPartnerUserInfoDO.setShopId(oldPartnerUser.getShopId());
+        hyPartnerUserInfoDAO.updateByPrimaryKeySelective(hyPartnerUserInfoDO);
         // 老的身份证信息置空
         fillBaseInfoIdCard(oldBaseInfo, null, null, null, null, null, null, null, null, null);
         oldBaseInfo.setStatus(Integer.valueOf(WorkflowStatusEnum.INTENT_0.getCode()));

From ffeac4b0de283ec763c727634e92630cba1bfb9f Mon Sep 17 00:00:00 2001
From: "xiaodong.hu" <1075471126@qq.com>
Date: Thu, 6 Jul 2023 11:29:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E6=9D=A5=E6=BA=90=E6=9C=AA=E5=90=8C=E6=AD=A5=E5=88=B0?=
 =?UTF-8?q?ec?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/HyPartnerUserInfoMapper.xml   | 14 +++++++-------
 .../cool/store/service/impl/EcSyncServiceImpl.java |  1 -
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml
index 4556e00e9..bf8536c1c 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml
@@ -52,16 +52,16 @@
     </where>
   </select>
     <select id="selectByHourDate" resultType="com.cool.store.entity.SyncEcCustomerDO" >
-      SELECT a.id as id, a.username as customername,a.mobile as customermobile,c.`name` as followname,c.mobile  as followmobile ,d.channel_id as channelId FROM  hy_partner_user_info   a  LEFT  join  hy_partner_line_info b  on
-        a.partner_id=b.partner_id    left join    enterprise_user  c on  b.investment_manager=c.user_id LEFT join  hy_partner_user_channel d  on   b.user_channel_id=d.id
-      WHERE  a.create_time BETWEEN #{selectTime}  and   #{now}  or
-        a.update_time BETWEEN #{selectTime}  and   #{now}    order by  a.id  Limit  #{limit1},#{limit2}
+      SELECT a.id as id, a.username as customername,a.mobile as customermobile,d.`name` as followname,d.mobile  as followmobile ,c.channel_id as channelId FROM  hy_partner_user_info   a  LEFT  join  hy_partner_line_info b  on
+        a.partner_id=b.partner_id     LEFT join   hy_partner_user_channel c   on b.user_channel_id=c.channel_id  left join    enterprise_user d  on b.investment_manager=d.user_id
+      WHERE ( a.create_time BETWEEN #{selectTime}  and   #{now}  or
+        a.update_time BETWEEN #{selectTime}  and   #{now}  )  order by  a.id  Limit  #{limit1},#{limit2}
     </select>
   <select id="selectByHourDateCount" resultType="java.lang.Integer">
     SELECT  count(*) FROM  hy_partner_user_info   a  LEFT  join  hy_partner_line_info b  on
-      a.partner_id=b.partner_id    left join    enterprise_user  c on  b.investment_manager=c.user_id
-    WHERE  a.create_time BETWEEN #{selectTime}  and   #{now}  or
-      a.update_time BETWEEN #{selectTime}  and   #{now}
+      a.partner_id=b.partner_id     LEFT join   hy_partner_user_channel c   on b.user_channel_id=c.channel_id  left join    enterprise_user d  on b.investment_manager=d.user_id
+    WHERE (a.create_time BETWEEN #{selectTime}  and   #{now}  or
+      a.update_time BETWEEN #{selectTime}  and   #{now} )
   </select>
 
   <insert id="insertSelective" keyColumn="id" keyProperty="record.id" useGeneratedKeys="true">
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 dfaf30931..0345e5d11 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
@@ -70,7 +70,6 @@ public class EcSyncServiceImpl implements EcSyncService {
     public boolean ecToApplet(List<CustomerInfoRequest> queryListData) {
         for (CustomerInfoRequest customerInfoItem : queryListData) {
             try {
-                Thread.sleep(500L);
                 insertSelectiveSync(customerInfoItem);
             } catch (Exception e) {
                 e.printStackTrace();