diff --git a/excel-handle/src/main/java/com/ruoyi/excel/wecom/domain/CustomerExportData.java b/excel-handle/src/main/java/com/ruoyi/excel/wecom/domain/CustomerExportData.java index 461d5d3..8d30fe0 100644 --- a/excel-handle/src/main/java/com/ruoyi/excel/wecom/domain/CustomerExportData.java +++ b/excel-handle/src/main/java/com/ruoyi/excel/wecom/domain/CustomerExportData.java @@ -23,6 +23,8 @@ public class CustomerExportData implements Serializable { private Long id; private String corpId; + //客户唯一id + private String customerUserId; /** * 客户名称 diff --git a/excel-handle/src/main/java/com/ruoyi/excel/wecom/mapper/CustomerExportDataMapper.java b/excel-handle/src/main/java/com/ruoyi/excel/wecom/mapper/CustomerExportDataMapper.java index ad5dcf9..de61cc1 100644 --- a/excel-handle/src/main/java/com/ruoyi/excel/wecom/mapper/CustomerExportDataMapper.java +++ b/excel-handle/src/main/java/com/ruoyi/excel/wecom/mapper/CustomerExportDataMapper.java @@ -53,7 +53,7 @@ public interface CustomerExportDataMapper extends BaseMapper */ CustomerExportData selectByUniqueKey( @Param("corpId") String corpId, - @Param("customerName") String customerName, + @Param("customerUserId") String customerUserId, @Param("addUserAccount") String addUserAccount, @Param("addTime") Date addTime ); diff --git a/excel-handle/src/main/java/com/ruoyi/excel/wecom/service/CustomerDataChangeTrackingService.java b/excel-handle/src/main/java/com/ruoyi/excel/wecom/service/CustomerDataChangeTrackingService.java index 478115e..6897a33 100644 --- a/excel-handle/src/main/java/com/ruoyi/excel/wecom/service/CustomerDataChangeTrackingService.java +++ b/excel-handle/src/main/java/com/ruoyi/excel/wecom/service/CustomerDataChangeTrackingService.java @@ -83,6 +83,7 @@ public class CustomerDataChangeTrackingService { try { // 构建用于计算指纹的字符串(排除id字段) StringBuilder sb = new StringBuilder(); + sb.append(data.getCustomerUserId()).append("|"); sb.append(data.getCustomerName()).append("|"); sb.append(data.getDescription()).append("|"); sb.append(data.getGender()).append("|"); diff --git a/excel-handle/src/main/java/com/ruoyi/excel/wecom/service/CustomerExportService.java b/excel-handle/src/main/java/com/ruoyi/excel/wecom/service/CustomerExportService.java index 486fb54..5c18864 100644 --- a/excel-handle/src/main/java/com/ruoyi/excel/wecom/service/CustomerExportService.java +++ b/excel-handle/src/main/java/com/ruoyi/excel/wecom/service/CustomerExportService.java @@ -117,7 +117,7 @@ public class CustomerExportService { // 根据唯一标识(客户名称+添加人账号+添加时间)查询是否已存在 CustomerExportData existingData = customerExportDataMapper.selectByUniqueKey( corpId, - exportData.getCustomerName(), + exportData.getCustomerUserId(), exportData.getAddUserAccount(), exportData.getAddTime() ); @@ -186,6 +186,7 @@ public class CustomerExportService { //设置性别 if(externalContact != null) { exportData.setGender(externalContact.getGender()); + exportData.setCustomerUserId(externalContact.getExternalUserid()); } // 获取跟进信息 diff --git a/excel-handle/src/main/resources/mapper/wecom/CustomerExportDataMapper.xml b/excel-handle/src/main/resources/mapper/wecom/CustomerExportDataMapper.xml index 13e60b1..384ecd7 100644 --- a/excel-handle/src/main/resources/mapper/wecom/CustomerExportDataMapper.xml +++ b/excel-handle/src/main/resources/mapper/wecom/CustomerExportDataMapper.xml @@ -114,7 +114,7 @@ WHERE corp_id = #{corpId} and - customer_name = #{customerName} + customer_user_id = #{customerUserId} AND add_user_account = #{addUserAccount} AND add_time = #{addTime} LIMIT 1