用户预扣款表更新同步

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

@@ -135,9 +135,9 @@ public class DtsController {
                 kxsUserAmountService.changeData(dmlData);
             }
             //用户预扣款表
-//            if ("ToChargeBackRecord".equals(dmlData.getTableName())) {
-//                kxsUserAdvanceService.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/impl/KxsUserAdvanceServiceImpl.java

@@ -63,21 +63,11 @@ public class KxsUserAdvanceServiceImpl extends ServiceImpl<KxsUserAdvanceMapper,
                     break;
                 case "ChargeType":
                     int advanceType = Integer.parseInt(validFieldDataMap.get(field).toString());
-                    if(advanceType == 1){
-                        advance.setAdvanceType(0);
-                    }
-                    if(advanceType == 2){
-                        advance.setAdvanceType(1);
-                    }
+                    advance.setAdvanceType(advanceType);
                     break;
                 case "Kind":
                     int kind = Integer.parseInt(validFieldDataMap.get(field).toString());
-                    if(kind == 2){
-                        advance.setAdvanceType(4);
-                    }
-                    if(kind == 1){
-                        advance.setAdvanceType(3);
-                    }
+                    advance.setKind(kind);
                     break;
                 case "Status":
                     int status = Integer.parseInt(validFieldDataMap.get(field).toString());

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

@@ -35,12 +35,7 @@ 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,
+ChargeType as advance_type, Kind as kind,
 	CASE Status WHEN -1 THEN 1 ELSE 0  END del_flag
 	FROM ToChargeBackRecord ORDER BY advance_type desc
 

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

@@ -74,12 +74,19 @@ public class KxsUserAdvance extends Model<KxsUserAdvance> implements Serializabl
 
 
     /**
-     * 预扣款类型 0过期机具扣款 1创客预扣款 2分期预扣款
+     * 预扣款类型 普通预扣款=1 分期预扣款=2 机具过期预扣款=124
      */
-    @Schema(description = "预扣款类型 0过期机具扣款 1创客预扣款 2分期预扣款 3盟主预扣款 4合伙人预扣款")
+    @Schema(description = "预扣款类型 普通预扣款=1 分期预扣款=2 机具过期预扣款=124")
     private Integer advanceType;
 
 
+    /**
+     * 待扣类别 创客预扣款=0 盟主预扣款=1 合伙人预扣款=2
+     */
+    @Schema(description = "待扣类别 创客预扣款=0 盟主预扣款=1 合伙人预扣款=2")
+    private Integer kind;
+
+
     /**
      * 备注信息
      */

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

@@ -10,6 +10,7 @@
         <result column="version" property="version" />
         <result column="user_id" property="userId" />
         <result column="advance_type" property="advanceType" />
+        <result column="kind" property="kind" />
         <result column="remark" property="remark" />
         <result column="amount" property="amount" />
         <result column="create_by" property="createBy" />