no message

kxs-transfer/src/main/java/com/kxs/transfer/api/controller/DtsController.java

@@ -60,7 +60,7 @@ public class DtsController {
         //去重数据
         KxsDtsLog dtsLog = kxsDtsLogService.getOne(Wrappers.<KxsDtsLog>lambdaQuery().eq(KxsDtsLog::getDataId, dataId));
         if(dtsLog != null){
-            log.info("dts的数据重复:{}", dmlData.getValidFieldDataMap());
+            log.info("dts的数据重复:{}，dataID:{}", dmlData.getValidFieldDataMap(), dataId);
             record.commit(String.valueOf(record.getSourceTimestamp()));
             return;
         }

kxs-transfer/src/main/java/com/kxs/transfer/api/service/user/impl/KxsUserAddressServiceImpl.java

@@ -66,20 +66,21 @@ public class KxsUserAddressServiceImpl extends ServiceImpl<KxsUserAddressMapper,
                         address.setArea(split[2]);
                     }
                     break;
+                case "CreateDate":
+                    address.setCreateTime(LocalDateTimeUtil.parse(fieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
+                    break;
+                case "UpdateDate":
+                    address.setUpdateTime(LocalDateTimeUtil.parse(fieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
+                    break;
             }
         }
 
         if(operation.equals(OperationType.UPDATE)){
+            // 更新数据
             baseMapper.updateById(address);
         }
         if(operation.equals(OperationType.INSERT)){
-            FieldData createDate = fieldDataMap.get("CreateDate");
-            FieldData updateDate = fieldDataMap.get("UpdateDate");
-
-            LocalDateTime createTime = LocalDateTimeUtil.parse(createDate.getValue().toString(), DatePattern.NORM_DATETIME_PATTERN);
-            LocalDateTime updateTime = LocalDateTimeUtil.parse(updateDate.getValue().toString(), DatePattern.NORM_DATETIME_PATTERN);
-            address.setCreateTime(createTime);
-            address.setUpdateTime(updateTime);
+            // 插入数据
             baseMapper.insert(address);
         }
     }

kxs-transfer/src/main/java/com/kxs/transfer/api/service/user/impl/KxsUserServiceImpl.java

@@ -172,6 +172,9 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
                 case "LogOutDate":
                     user.setUpdateTime(LocalDateTimeUtil.parse(fieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
                     break;
+                case "CreateDate":
+                    user.setCreateTime(LocalDateTimeUtil.parse(fieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
+                    break;
             }
         }
 

kxs-transfer/src/main/resources/import.txt

@@ -15,9 +15,9 @@ select Id as user_id, SettleBankName as bank_name, Mobile as bank_phone, SettleB
 FROM Users where SettleBankCardNo is not null and SettleBankName<>''
 
 //用户收货地址表
-select Id as id,
+select Id as id, UserId as user_id,
 SUBSTRING_INDEX(Areas, ',', 1) AS province,
 SUBSTRING_INDEX(SUBSTRING_INDEX(Areas, ',', -2), ',', 1) AS city,
 SUBSTRING_INDEX(Areas, ',', -1) AS area,
-address, Mobile as phone, RealName as consignee, IsDefault as is_default
+address, Mobile as phone, RealName as consignee, IsDefault as is_default, CreateDate as create_time, UpdateDate as update_time
  FROM UserAddress