Merge branch 'bugfix-20250408' into developer

# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/InteractRecordService.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/impl/InteractRecordServiceImpl.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/content/PotentialCustomerApiServiceImpl.java

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/content/PotentialCustomerApiService.java

@@ -28,4 +28,13 @@ public interface PotentialCustomerApiService {
      * @return
      */
     ServiceResponse<Long> markPotentialCustomer(PotentialCustomerMarkRecordDTO potentialCustomerMarkRecordDTO);
+
+    /**
+     * 更新unionId
+     * @param enterpriseId
+     * @param oldUnionId
+     * @param newUnionId
+     * @return
+     */
+    ServiceResponse<Void> modifyUnionId(String enterpriseId, String oldUnionId, String newUnionId);
 }

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

@@ -136,5 +136,12 @@ public interface TabHaobanInteractRecordMapper {
      */
     int memberAuthorized(@Param("memberId") String memberId, @Param("unionId") String unionId);
 
+    /**
+     * 更新unionId
+     * @param enterpriseId
+     * @return
+     */
+    int modifyUnionId(@Param("enterpriseId") String enterpriseId, @Param("oldUnionId") String oldUnionId, @Param("newUnionId") String newUnionId);
+
 }
 

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

@@ -93,5 +93,13 @@ public interface TabHaobanPotentialCustomerMapper {
      */
     int updateMemberDealRecordNum(@Param("enterpriseId") String enterpriseId, @Param("memberId") String memberId);
 
+    /**
+     * 更新unionId
+     * @param enterpriseId
+     * @return
+     */
+    int modifyUnionId(@Param("enterpriseId") String enterpriseId, @Param("oldUnionId") String oldUnionId, @Param("newUnionId") String newUnionId);
+
+
 }
 

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

@@ -77,6 +77,14 @@ public interface InteractRecordService {
     InteractRecordBO queryLeastRecord(String enterpriseId, String clerkId, String bizId, String memberId);
 
     /**
+     * 更新unionId
+     * @param enterpriseId
+     * @param oldUnionId
+     * @param newUnionId
+     */
+    void modifyUnionId(String enterpriseId, String oldUnionId, String newUnionId);
+
+    /**
      * 查询会员对应时间后最新的互动记录
      * @param enterpriseId
      * @param clerkId

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

 package com.gic.haoban.manage.service.service.content;
 
 import com.gic.api.base.commons.Page;
+import com.gic.api.base.commons.ServiceResponse;
 import com.gic.haoban.manage.service.pojo.bo.content.PotentialCustomerBO;
 import com.gic.haoban.manage.service.pojo.bo.content.context.PotentialCustomerNotifyContext;
 import com.gic.haoban.manage.service.pojo.qo.content.PotentialCustomerQO;
@@ -69,4 +70,13 @@ public interface PotentialCustomerService {
      * @param memberId
      */
     void updateMemberDealFlag(String enterpriseId, String memberId);
+
+    /**
+     * 更新unionId
+     * @param enterpriseId
+     * @param oldUnionId
+     * @param newUnionId
+     */
+    void modifyUnionId(String enterpriseId, String oldUnionId, String newUnionId);
+
 }

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

@@ -262,6 +262,11 @@ public class InteractRecordServiceImpl implements InteractRecordService {
     }
 
     @Override
+    public void modifyUnionId(String enterpriseId, String oldUnionId, String newUnionId) {
+        tabHaobanInteractRecordMapper.modifyUnionId(enterpriseId, oldUnionId, newUnionId);
+    }
+
+    @Override
     public List<InteractRecordBO> lastInteractRecord(String enterpriseId, String clerkId, List<MemberLastInteractBO> list) {
         if (CollectionUtils.isEmpty(list)) {
             return new ArrayList<>();

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

@@ -345,4 +345,9 @@ public class PotentialCustomerServiceImpl implements PotentialCustomerService {
         }
         potentialCustomerMapper.updateMemberDealRecordNum(enterpriseId, memberId);
     }
+
+    @Override
+    public void modifyUnionId(String enterpriseId, String oldUnionId, String newUnionId) {
+        potentialCustomerMapper.modifyUnionId(enterpriseId, oldUnionId, newUnionId);
+    }
 }

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

@@ -12,6 +12,7 @@ import com.gic.haoban.manage.api.service.content.PotentialCustomerApiService;
 import com.gic.haoban.manage.service.pojo.bo.content.InteractRecordExtendInfoBO;
 import com.gic.haoban.manage.service.pojo.bo.content.PotentialCustomerBO;
 import com.gic.haoban.manage.service.pojo.qo.content.PotentialCustomerQO;
+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.InteractRecordBuilder;
 import org.apache.commons.collections.CollectionUtils;
@@ -36,6 +37,8 @@ public class PotentialCustomerApiServiceImpl implements PotentialCustomerApiServ
     @Autowired
     PotentialCustomerService potentialCustomerService;
     @Autowired
+    InteractRecordService interactRecordService;
+    @Autowired
     InteractRecordBuilder interactRecordBuilder;
 
     /**
@@ -96,4 +99,11 @@ public class PotentialCustomerApiServiceImpl implements PotentialCustomerApiServ
         potentialCustomerService.markPotentialCustomer(potentialCustomerBO);
         return ServiceResponse.success(potentialCustomerBO.getId());
     }
+
+    @Override
+    public ServiceResponse<Void> modifyUnionId(String enterpriseId, String oldUnionId, String newUnionId) {
+        interactRecordService.modifyUnionId(enterpriseId,oldUnionId,newUnionId);
+        potentialCustomerService.modifyUnionId(enterpriseId,oldUnionId,newUnionId);
+        return ServiceResponse.success();
+    }
 }

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

@@ -361,5 +361,11 @@
         and (member_id is null or member_id = '')
     </update>
 
+    <update id="modifyUnionId">
+        update tab_haoban_potential_customer
+        set union_id = #{newUnionId}
+        where enterprise_id = #{enterpriseId} and union_id = #{oldUnionId} and delete_flag = 0
+    </update>
+
 </mapper>
 

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

@@ -320,5 +320,11 @@
         where member_id = #{memberId} and enterprise_id = #{enterpriseId} and delete_flag = 0
     </update>
 
+    <update id="modifyUnionId">
+        update tab_haoban_potential_customer
+        set union_id = #{newUnionId}
+        where enterprise_id = #{enterpriseId} and union_id = #{oldUnionId} and delete_flag = 0
+    </update>
+
 </mapper>