Merge branch 'feature-content2' into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/content/TabHaobanPotentialCustomerMapper.java

@@ -83,7 +83,7 @@ public interface TabHaobanPotentialCustomerMapper {
      * @param mergeMemberId
      * @param memberId
      */
-    void mergeMember(@Param("mergeMemberId") String mergeMemberId, @Param("memberId") String memberId);
+    void mergeMember(@Param("mergeMemberId") String mergeMemberId, @Param("memberId") String memberId, @Param("memberPhone") String memberPhone);
 
     /**
      * 更新会员成交标识

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/impl/PotentialCustomerServiceImpl.java

@@ -10,6 +10,7 @@ import com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated;
 import com.gic.haoban.manage.service.entity.content.TabHaobanPotentialCustomer;
 import com.gic.haoban.manage.service.pojo.bo.content.PotentialCustomerBO;
 import com.gic.haoban.manage.service.pojo.bo.content.PotentialCustomerStaticsBO;
+import com.gic.haoban.manage.service.pojo.bo.content.context.InteractRecordMessageContext;
 import com.gic.haoban.manage.service.pojo.bo.content.context.PotentialCustomerNotifyContext;
 import com.gic.haoban.manage.service.pojo.qo.content.InteractRecordQO;
 import com.gic.haoban.manage.service.pojo.qo.content.PotentialCustomerQO;
@@ -18,8 +19,10 @@ import com.gic.haoban.manage.service.service.MemberQueryService;
 import com.gic.haoban.manage.service.service.StaffClerkRelationService;
 import com.gic.haoban.manage.service.service.content.InteractRecordService;
 import com.gic.haoban.manage.service.service.content.PotentialCustomerService;
+import com.gic.haoban.manage.service.service.content.adaptor.InteractRecordMessageBuilder;
 import com.gic.haoban.manage.service.service.content.adaptor.PotentialCustomerNotifyBuilder;
 import com.gic.member.api.dto.es.MemberDataDTO;
+import com.gic.member.api.service.MemberOutApiService;
 import com.gic.search.engine.api.constant.MemberDataEnum;
 import com.github.pagehelper.PageHelper;
 import lombok.extern.slf4j.Slf4j;
@@ -53,6 +56,8 @@ public class PotentialCustomerServiceImpl implements PotentialCustomerService {
     @Autowired
     private PotentialCustomerNotifyBuilder potentialCustomerNotifyBuilder;
     @Autowired
+    private InteractRecordMessageBuilder interactRecordMessageBuilder;
+    @Autowired
     private InteractRecordService interactRecordService;
     @Autowired
     private ExternalClerkRelatedService externalClerkRelatedService;
@@ -275,7 +280,12 @@ public class PotentialCustomerServiceImpl implements PotentialCustomerService {
         if (StringUtils.isAnyBlank(mergeMemberId, memberId)) {
             return;
         }
-        potentialCustomerMapper.mergeMember(mergeMemberId, memberId);
+        InteractRecordMessageContext.MemberInfo memberInfo = interactRecordMessageBuilder.queryMemberInfo(memberId);
+        String memberPhone = null;
+        if (memberInfo != null ) {
+            memberPhone = memberInfo.getMemberPhone();
+        }
+        potentialCustomerMapper.mergeMember(mergeMemberId, memberId, memberPhone);
     }
 
     /**

haoban-manage3-service/src/main/resources/mapper/content/TabHaobanPotentialCustomerMapper.xml

@@ -280,6 +280,9 @@
     <update id="mergeMember">
         update tab_haoban_potential_customer
             set member_id = #{memberId}
+            <if test="memberPhone != null and memberPhone != ''">
+                , member_phone = #{memberPhone}
+            </if>
         where member_id = #{mergeMemberId} and delete_flag = 0
     </update>