用户预扣款同步

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

@@ -36,8 +36,10 @@ public class DtsController {
     private final KxsDtsErrorLogService kxsDtsErrorLogService;
 
     private final KxsUserService kxsUserService;
+    private final KxsUserPresetLogService kxsUserPresetLogService;
     private final KxsUserAddressService kxsUserAddressService;
     private final KxsUserAmountService kxsUserAmountService;
+    private final KxsUserAdvanceService kxsUserAdvanceService ;
     private final KxsUserAmountLogService kxsUserAmountLogService;
     private final KxsUserWithdrawalService kxsUserWithdrawalService;
     private final KxsLeaderService kxsLeaderService;
@@ -79,6 +81,10 @@ public class DtsController {
             if ("Users".equals(dmlData.getTableName())) {
                 kxsUserService.changeUser(dmlData);
             }
+            //用户预设职级表
+            if ("UserRankWhite".equals(dmlData.getTableName())) {
+                kxsUserPresetLogService.changeUser(dmlData);
+            }
             //密码操作
             if ("UserMoveInfo".equals(dmlData.getTableName())) {
                 kxsUserService.changeUserPwd(dmlData);
@@ -91,6 +97,10 @@ public class DtsController {
             if ("UserAccount".equals(dmlData.getTableName()) && "KxsProfitServer".equals(dmlData.getDatabaseName())) {
                 kxsUserAmountService.changeData(dmlData);
             }
+            //用户预扣款表
+            if ("ToChargeBackRecord".equals(dmlData.getTableName())) {
+                kxsUserAdvanceService.changeData(dmlData);
+            }
             //用户账户余额日志
             if ("UserAccountRecord".equals(dmlData.getTableName())) {
                 kxsUserAmountLogService.changeData(dmlData);

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

@@ -2,6 +2,7 @@ package com.kxs.transfer.api.service.user;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.kxs.common.core.util.R;
+import com.kxs.transfer.api.model.table.DMLData;
 import com.kxs.user.api.model.KxsUserAdvance;
 
 /**
@@ -13,5 +14,6 @@ import com.kxs.user.api.model.KxsUserAdvance;
 public interface KxsUserAdvanceService extends IService<KxsUserAdvance> {
 
 
+    void changeData(DMLData dmlData);
 }
 

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

@@ -1,6 +1,7 @@
 package com.kxs.transfer.api.service.user;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.transfer.api.model.table.DMLData;
 import com.kxs.user.api.model.KxsUserPresetLog;
 
 /**
@@ -11,5 +12,6 @@ import com.kxs.user.api.model.KxsUserPresetLog;
  */
 public interface KxsUserPresetLogService extends IService<KxsUserPresetLog> {
 
+    void changeUser(DMLData dmlData);
 }
 

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

@@ -6,13 +6,10 @@ import com.aliyun.dts.subscribe.clients.record.OperationType;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kxs.transfer.api.mapper.user.KxsLeaderMapper;
 import com.kxs.transfer.api.model.table.DMLData;
-import com.kxs.transfer.api.model.table.FieldData;
 import com.kxs.transfer.api.service.user.KxsLeaderService;
 import com.kxs.user.api.model.KxsLeader;
-import com.kxs.user.api.model.KxsUserWithdrawal;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 

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

@@ -30,8 +30,6 @@ public class KxsUserAddressServiceImpl extends ServiceImpl<KxsUserAddressMapper,
     public void changeData(DMLData dmlData) {
         //修改的字段值
         Map<String, Object> validFieldDataMap = dmlData.getValidFieldDataMap();
-        //全部字段值
-        Map<String, FieldData> fieldDataMap = dmlData.getFieldDataMap();
         //修改的字段
         List<String> changeFieldList = dmlData.getChangeFieldList();
         //操作的主键

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

@@ -1,12 +1,22 @@
 package com.kxs.transfer.api.service.user.impl;
 
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.LocalDateTimeUtil;
+import com.aliyun.dts.subscribe.clients.record.OperationType;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kxs.transfer.api.mapper.user.KxsUserAdvanceMapper;
+import com.kxs.transfer.api.model.table.DMLData;
+import com.kxs.transfer.api.model.table.FieldData;
 import com.kxs.transfer.api.service.user.KxsUserAdvanceService;
 import com.kxs.user.api.model.KxsUserAdvance;
+import com.kxs.user.api.model.KxsUserPresetLog;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
 /**
  * 客小爽用户预扣款表(KxsUserAdvance)表服务实现类
  *
@@ -18,5 +28,87 @@ import org.springframework.stereotype.Service;
 public class KxsUserAdvanceServiceImpl extends ServiceImpl<KxsUserAdvanceMapper, KxsUserAdvance> implements KxsUserAdvanceService {
 
 
+    @Override
+    public void changeData(DMLData dmlData) {
+        //修改的字段值
+        Map<String, Object> validFieldDataMap = dmlData.getValidFieldDataMap();
+        //修改的字段
+        List<String> changeFieldList = dmlData.getChangeFieldList();
+        //操作的主键
+        int id = Integer.parseInt(dmlData.getId());
+
+        KxsUserAdvance advance = new KxsUserAdvance();
+        advance.setId(id);
+        //操作类型
+        OperationType operation = dmlData.getOperation();
+        if(operation.equals(OperationType.DELETE)){
+            // 更新数据
+            baseMapper.deleteById(id);
+            return;
+        }
+        for (String field : changeFieldList) {
+
+            switch (field) {
+                case "UserId":
+                    advance.setUserId(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    break;
+                case "ChargeAmount":
+                    advance.setAmount(new BigDecimal(validFieldDataMap.get(field).toString()));
+                    break;
+                case "Remark":
+                    advance.setRemark(validFieldDataMap.get(field).toString());
+                    break;
+                case "SeoTitle":
+                    advance.setCreateBy(validFieldDataMap.get(field).toString());
+                    break;
+                case "ChargeType":
+                    int advanceType = Integer.parseInt(validFieldDataMap.get(field).toString());
+                    if(advanceType == 1){
+                        advance.setAdvanceType(0);
+                    }
+                    if(advanceType == 2){
+                        advance.setAdvanceType(1);
+                    }
+                    break;
+                case "Kind":
+                    int kind = Integer.parseInt(validFieldDataMap.get(field).toString());
+                    if(kind == 2){
+                        advance.setAdvanceType(4);
+                    }
+                    if(kind == 1){
+                        advance.setAdvanceType(3);
+                    }
+                    break;
+                case "Status":
+                    int status = Integer.parseInt(validFieldDataMap.get(field).toString());
+                    if(status == -1){
+                        advance.setDelFlag("1");
+                    }
+                    advance.setStatus(status);
+                    break;
+                case "CreateDate":
+                    advance.setCreateTime(LocalDateTimeUtil.parse(validFieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
+                    break;
+                case "UpdateDate":
+                    advance.setUpdateTime(LocalDateTimeUtil.parse(validFieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
+                    break;
+            }
+        }
+
+        if(operation.equals(OperationType.UPDATE)){
+            // 更新数据
+            baseMapper.updateById(advance);
+        }
+        if(operation.equals(OperationType.INSERT)){
+
+            KxsUserAdvance userAdvance = baseMapper.selectById(advance.getId());
+            if (userAdvance != null){
+                baseMapper.updateById(advance);
+            }else{
+                // 插入数据
+                baseMapper.insert(advance);
+            }
+        }
+    }
 }
 

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

@@ -1,11 +1,20 @@
 package com.kxs.transfer.api.service.user.impl;
 
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.LocalDateTimeUtil;
+import com.aliyun.dts.subscribe.clients.record.OperationType;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kxs.transfer.api.mapper.user.KxsUserPresetLogMapper;
+import com.kxs.transfer.api.model.table.DMLData;
+import com.kxs.transfer.api.model.table.FieldData;
 import com.kxs.transfer.api.service.user.KxsUserPresetLogService;
+import com.kxs.user.api.model.KxsUserAddress;
 import com.kxs.user.api.model.KxsUserPresetLog;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 用户预设职级日志表(KxsUserPresetLog)表服务实现类
  *
@@ -15,5 +24,61 @@ import org.springframework.stereotype.Service;
 @Service("kxsUserPresetLogService")
 public class KxsUserPresetLogServiceImpl extends ServiceImpl<KxsUserPresetLogMapper, KxsUserPresetLog> implements KxsUserPresetLogService {
 
+    @Override
+    public void changeUser(DMLData dmlData) {
+        //修改的字段值
+        Map<String, Object> validFieldDataMap = dmlData.getValidFieldDataMap();
+        //修改的字段
+        List<String> changeFieldList = dmlData.getChangeFieldList();
+        //操作的主键
+        int id = Integer.parseInt(dmlData.getId());
+
+        KxsUserPresetLog presetLog = new KxsUserPresetLog();
+        presetLog.setId(id);
+        //操作类型
+        OperationType operation = dmlData.getOperation();
+        if(operation.equals(OperationType.DELETE)){
+            // 更新数据
+            baseMapper.deleteById(id);
+            return;
+        }
+        for (String field : changeFieldList) {
+
+            switch (field) {
+                case "UserId":
+                    presetLog.setUserId(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    break;
+                case "Rank":
+                    presetLog.setPresetLevel(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    break;
+                case "QueryCount":
+                    presetLog.setCreateById(Integer.valueOf(validFieldDataMap.get(field).toString()));
+                    break;
+                case "CreateDate":
+                    presetLog.setStartTime(LocalDateTimeUtil.parse(validFieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
+                    presetLog.setCreateTime(LocalDateTimeUtil.parse(validFieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
+                    break;
+                case "UpdateDate":
+                    presetLog.setEndTime(LocalDateTimeUtil.parse(validFieldDataMap.get(field).toString(), DatePattern.NORM_DATETIME_PATTERN));
+                    break;
+            }
+        }
+
+        if(operation.equals(OperationType.UPDATE)){
+            // 更新数据
+            baseMapper.updateById(presetLog);
+        }
+        if(operation.equals(OperationType.INSERT)){
+
+            KxsUserPresetLog userPresetLog = baseMapper.selectById(presetLog.getId());
+            if (userPresetLog != null){
+                baseMapper.updateById(presetLog);
+            }else{
+                // 插入数据
+                baseMapper.insert(presetLog);
+            }
+        }
+
+    }
 }
 

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

@@ -4,6 +4,10 @@ ParentUserId as pid, CONCAT('0',REPLACE(ParentNav,',,',','))  as pid_path, Maker
 UserLevel as user_level, AuthFlag as real_status, MerchantType as is_merchant_maker, Remark as remark, CreateDate as create_time, UpdateDate as update_time
 FROM Users
 
+//用户预设职级记录表
+SELECT Id as id, UserId as user_id, CreateDate as create_time, CreateDate as start_time, UpdateDate as end_time, Rank as preset_level, QueryCount as create_by_id
+FROM UserRankWhite
+
 //用户实名信息表
 select Id as id, Id as user_id, RealName as real_name, CertId as id_card, HandCertImage as id_card_hand, CertReverseImage as id_card_rear,
  CertFrontImage as id_card_front, AuthDate as create_time
@@ -28,6 +32,18 @@ TotalAmount as total_amount, FreezeAmount as frozen_amount, WithdrawAmount as ca
 LeaderToChargeAmount as leader_advance_amount, OperateToChargeAmount as partner_advance_amount
 from UserAccount
 
+//用户预扣款表
+SELECT Id as id, UserId as user_id,CreateDate as create_time, UpdateDate as update_time,
+	ChargeAmount	as amount, Remark as remark, SeoTitle as create_by, Status as status,
+	CASE
+	WHEN ChargeType = 1 AND Kind =0 THEN 0
+	WHEN ChargeType = 2 AND Kind =0 THEN 1
+	WHEN ChargeType = 1 AND Kind =1 THEN 3
+	WHEN ChargeType = 1 AND Kind =2 THEN 4
+	END advance_type,
+	CASE Status WHEN -1 THEN 1 ELSE 0  END del_flag
+	FROM ToChargeBackRecord ORDER BY advance_type desc
+
 //用户提现申请表
 select Id as id, UserId as user_id,CreateDate as create_time, UpdateDate as update_time,
 CASE TradeType WHEN 2 THEN 0 ELSE TradeType END withdrawal_type, Status as status, CASE QueryCount WHEN 0 THEN 0 ELSE 1  END apply_status,

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

@@ -74,21 +74,7 @@ public class KxsUser extends Model<KxsUser> {
      */     
     @Schema(description = "实名状态 0未实名 1已实名")
     private Integer realStatus;
-    
-    
-    /**
-     * 预设等级状态 0未预设 1已预设
-     */     
-    @Schema(description = "预设等级状态 0未预设 1已预设")
-    private Integer presetLevelStatus;
-    
-    
-    /**
-     * 预设等级
-     */     
-    @Schema(description = "预设等级")
-    private Integer presetLevel;
-    
+
     
     /**
      * 手势密码

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

@@ -66,6 +66,12 @@ public class KxsUserPresetLog extends Model<KxsUserPresetLog> implements Seriali
     @Schema(description = "版本")
     private Integer version;
 
+    /**
+     * 设置人
+     */
+    @Schema(description = "设置人")
+    private Integer createById;
+
 
     /**
      * 用户ID

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

@@ -9,8 +9,6 @@
         <result column="status" property="status" />
         <result column="version" property="version" />
         <result column="real_status" property="realStatus" />
-        <result column="preset_level_status" property="presetLevelStatus" />
-        <result column="preset_level" property="presetLevel" />
         <result column="hand_pwd" property="handPwd" />
         <result column="pay_pwd" property="payPwd" />
         <result column="user_level" property="userLevel" />

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

@@ -12,6 +12,7 @@
         <result column="start_time" property="startTime" />
         <result column="end_time" property="endTime" />
         <result column="preset_level" property="presetLevel" />
+        <result column="create_by_id" property="createById" />
 
     </resultMap>