Merge remote-tracking branch 'origin/master'

ruoyi-api/src/main/java/com/ruoyi/api/domain/dto/ExternalCustomerChangeLogData.java

@@ -10,29 +10,17 @@ import lombok.Data;
 @Data
 public class ExternalCustomerChangeLogData {
 
-    @JsonProperty("CustomerNameNew")
-    @JSONField(name = "CustomerNameNew")
-    private String customerNameNew;
+    @JsonProperty("ChangeTerm")
+    @JSONField(name = "ChangeTerm")
+    private String changeTerm;
 
-    @JsonProperty("CustomerNameOld")
-    @JSONField(name = "CustomerNameOld")
-    private String customerNameOld;
+    @JsonProperty("NewValue")
+    @JSONField(name = "NewValue")
+    private String newValue;
 
-    @JsonProperty("IdNoNew")
-    @JSONField(name = "IdNoNew")
-    private String idNoNew;
-
-    @JsonProperty("IdNoOld")
-    @JSONField(name = "IdNoOld")
-    private String idNoOld;
-
-    @JsonProperty("MobilePhoneNew")
-    @JSONField(name = "MobilePhoneNew")
-    private String mobilePhoneNew;
-
-    @JsonProperty("MobilePhoneOld")
-    @JSONField(name = "MobilePhoneOld")
-    private String mobilePhoneOld;
+    @JsonProperty("OldValue")
+    @JSONField(name = "OldValue")
+    private String oldValue;
 
     @JsonProperty("Operator")
     @JSONField(name = "Operator")
@@ -42,7 +30,35 @@ public class ExternalCustomerChangeLogData {
     @JSONField(name = "OperatorTime")
     private String operatorTime;
 
-    @JsonProperty("TransferReason")
-    @JSONField(name = "TransferReason")
-    private String transferReason;
+    @JsonProperty("ChangeReason")
+    @JSONField(name = "ChangeReason")
+    private String changeReason;
+
+//    @JsonProperty("CustomerNameNew")
+//    @JSONField(name = "CustomerNameNew")
+//    private String customerNameNew;
+//
+//    @JsonProperty("CustomerNameOld")
+//    @JSONField(name = "CustomerNameOld")
+//    private String customerNameOld;
+//
+//    @JsonProperty("IdNoNew")
+//    @JSONField(name = "IdNoNew")
+//    private String idNoNew;
+//
+//    @JsonProperty("IdNoOld")
+//    @JSONField(name = "IdNoOld")
+//    private String idNoOld;
+//
+//    @JsonProperty("MobilePhoneNew")
+//    @JSONField(name = "MobilePhoneNew")
+//    private String mobilePhoneNew;
+//
+//    @JsonProperty("MobilePhoneOld")
+//    @JSONField(name = "MobilePhoneOld")
+//    private String mobilePhoneOld;
+//
+//    @JsonProperty("TransferReason")
+//    @JSONField(name = "TransferReason")
+//    private String transferReason;
 }

ruoyi-api/src/main/java/com/ruoyi/api/service/impl/WwkjCustomerChangeLogServiceImpl.java

@@ -59,35 +59,38 @@ public class WwkjCustomerChangeLogServiceImpl implements IWwkjCustomerChangeLogS
 
             // 3. 转换数据并保存
             for (ExternalCustomerChangeLogData externalData : externalDataList) {
-                // 处理户名变更
-                if (externalData.getCustomerNameNew() != null || externalData.getCustomerNameOld() != null) {
-                    WwkjCustomerChangeLog changeLog = createChangeLog(
-                        queryVo.getCustomerCode(), "CustomerName", 
-                        externalData.getCustomerNameNew(), externalData.getCustomerNameOld(), externalData
-                    );
-                    results.add(changeLog);
-                    saveChangeLogToDatabase(changeLog);
-                }
-                
-                // 处理证件号码变更
-                if (externalData.getIdNoNew() != null || externalData.getIdNoOld() != null) {
-                    WwkjCustomerChangeLog changeLog = createChangeLog(
-                        queryVo.getCustomerCode(), "IdNo", 
-                        externalData.getIdNoNew(), externalData.getIdNoOld(), externalData
-                    );
-                    results.add(changeLog);
-                    saveChangeLogToDatabase(changeLog);
-                }
-                
-                // 处理手机号变更
-                if (externalData.getMobilePhoneNew() != null || externalData.getMobilePhoneOld() != null) {
-                    WwkjCustomerChangeLog changeLog = createChangeLog(
-                        queryVo.getCustomerCode(), "MobilePhone", 
-                        externalData.getMobilePhoneNew(), externalData.getMobilePhoneOld(), externalData
-                    );
-                    results.add(changeLog);
-                    saveChangeLogToDatabase(changeLog);
-                }
+                WwkjCustomerChangeLog customerChangeLog = createChangeLog(queryVo.getCustomerCode(), externalData);
+                results.add(customerChangeLog);
+                wwkjCustomerChangeLogMapper.insertWwkjCustomerChangeLog(customerChangeLog);
+//                // 处理户名变更
+//                if (externalData.getCustomerNameNew() != null || externalData.getCustomerNameOld() != null) {
+//                    WwkjCustomerChangeLog changeLog = createChangeLog(
+//                        queryVo.getCustomerCode(), "CustomerName",
+//                        externalData.getCustomerNameNew(), externalData.getCustomerNameOld(), externalData
+//                    );
+//                    results.add(changeLog);
+//                    saveChangeLogToDatabase(changeLog);
+//                }
+//
+//                // 处理证件号码变更
+//                if (externalData.getIdNoNew() != null || externalData.getIdNoOld() != null) {
+//                    WwkjCustomerChangeLog changeLog = createChangeLog(
+//                        queryVo.getCustomerCode(), "IdNo",
+//                        externalData.getIdNoNew(), externalData.getIdNoOld(), externalData
+//                    );
+//                    results.add(changeLog);
+//                    saveChangeLogToDatabase(changeLog);
+//                }
+//
+//                // 处理手机号变更
+//                if (externalData.getMobilePhoneNew() != null || externalData.getMobilePhoneOld() != null) {
+//                    WwkjCustomerChangeLog changeLog = createChangeLog(
+//                        queryVo.getCustomerCode(), "MobilePhone",
+//                        externalData.getMobilePhoneNew(), externalData.getMobilePhoneOld(), externalData
+//                    );
+//                    results.add(changeLog);
+//                    saveChangeLogToDatabase(changeLog);
+//                }
             }
 
             logger.info("成功获取并保存 {} 条客户信息变更日志", results.size());
@@ -102,15 +105,15 @@ public class WwkjCustomerChangeLogServiceImpl implements IWwkjCustomerChangeLogS
     /**
      * 创建变更日志实体
      */
-    private WwkjCustomerChangeLog createChangeLog(String customerCode, String changeTerm, String newValue, String oldValue,
-                                                 ExternalCustomerChangeLogData externalData) {
+    private WwkjCustomerChangeLog createChangeLog(String customerCode, ExternalCustomerChangeLogData externalData) {
         WwkjCustomerChangeLog changeLog = new WwkjCustomerChangeLog();
         changeLog.setCustomerCode(customerCode);
-        changeLog.setChangeTerm(changeTerm);
-        changeLog.setNewValue(newValue);
-        changeLog.setOldValue(oldValue);
+        changeLog.setChangeTerm(externalData.getChangeTerm());
+        changeLog.setNewValue(externalData.getNewValue());
+        changeLog.setOldValue(externalData.getOldValue());
         changeLog.setOperator(externalData.getOperator());
-        changeLog.setChangeReason(externalData.getTransferReason());
+        changeLog.setChangeReason(externalData.getChangeReason());
+//        changeLog.setChangeReason(externalData.getTransferReason());
         changeLog.setSyncStatus("1");
         changeLog.setDelFlag("0");