同步用户余额变动记录

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

@@ -74,6 +74,10 @@ public class DtsController {
         if("Users".equals(dmlData.getTableName())){
             kxsUserService.changeUser(dmlData);
         }
+        //密码操作
+        if("UserMoveInfo".equals(dmlData.getTableName())){
+            kxsUserService.changeUserPwd(dmlData);
+        }
         //用户地址表
         if("UserAddress".equals(dmlData.getTableName())){
             kxsUserAddressService.changeData(dmlData);
@@ -82,10 +86,6 @@ public class DtsController {
         if("UserAccount".equals(dmlData.getTableName())){
             kxsUserAmountService.changeData(dmlData);
         }
-        //密码操作
-        if("UserMoveInfo".equals(dmlData.getTableName())){
-            kxsUserService.changeUserPwd(dmlData);
-        }
         //用户账户余额日志
         if("UserAccountRecord".equals(dmlData.getTableName())){
             kxsUserAmountLogService.changeData(dmlData);

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

@@ -67,10 +67,10 @@ public class KxsUserAddressServiceImpl extends ServiceImpl<KxsUserAddressMapper,
                     }
                     break;
                 case "CreateDate":
-                    address.setCreateTime(LocalDateTimeUtil.parse(fieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
+                    address.setCreateTime(LocalDateTimeUtil.parse(validFieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
                     break;
                 case "UpdateDate":
-                    address.setUpdateTime(LocalDateTimeUtil.parse(fieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
+                    address.setUpdateTime(LocalDateTimeUtil.parse(validFieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
                     break;
             }
         }

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

@@ -69,10 +69,10 @@ public class KxsUserAmountLogServiceImpl extends ServiceImpl<KxsUserAmountLogMap
                     userAmountLog.setAfterAmount(new BigDecimal(validFieldDataMap.get(field).toString()));
                     break;
                 case "CreateDate":
-                    userAmountLog.setCreateTime(LocalDateTimeUtil.parse(fieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
+                    userAmountLog.setCreateTime(LocalDateTimeUtil.parse(validFieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
                     break;
                 case "UpdateDate":
-                    userAmountLog.setUpdateTime(LocalDateTimeUtil.parse(fieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
+                    userAmountLog.setUpdateTime(LocalDateTimeUtil.parse(validFieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
                     break;
             }
         }

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

@@ -74,10 +74,10 @@ public class KxsUserAmountServiceImpl extends ServiceImpl<KxsUserAmountMapper, K
                     userAmount.setPartnerAdvanceAmount(new BigDecimal(validFieldDataMap.get(field).toString()));
                     break;
                 case "CreateDate":
-                    userAmount.setCreateTime(LocalDateTimeUtil.parse(fieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
+                    userAmount.setCreateTime(LocalDateTimeUtil.parse(validFieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
                     break;
                 case "UpdateDate":
-                    userAmount.setUpdateTime(LocalDateTimeUtil.parse(fieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
+                    userAmount.setUpdateTime(LocalDateTimeUtil.parse(validFieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
                     break;
             }
         }

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

@@ -169,6 +169,9 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
                 case "Remark":
                     user.setRemark(fieldDataMap.get(field).toString());
                     break;
+                case "MerchantDate":
+                    user.setToMerchantMakerTime(LocalDateTimeUtil.parse(fieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
+                    break;
                 case "LogOutDate":
                     user.setUpdateTime(LocalDateTimeUtil.parse(fieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
                     break;

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/model/KxsUser.java

@@ -52,7 +52,7 @@ public class KxsUser extends Model<KxsUser> {
      * 成为商户型创客时间
      */
     @Schema(description = "成为商户型创客时间")
-    private Integer toMerchantMakerTime;
+    private LocalDateTime toMerchantMakerTime;
     
     
     /**

kxs-user/kxs-user-biz/src/main/resources/mapper/KxsUserMapper.xml

@@ -28,6 +28,7 @@
         <result column="del_flag" property="delFlag" />
         <result column="update_time" property="updateTime" />
         <result column="create_time" property="createTime" />
+        <result column="to_merchant_maker_time" property="toMerchantMakerTime" />
     </resultMap>
     <select id="findUserRealBankInfo" resultType="com.kxs.user.api.vo.kxsapp.user.RealUserInfoVO">
         select a.phone, a.user_code, r.real_name, r.id_card, b.bank_name, b.bank_open, b.bank_phone, b.bank_code