init

ruoyi-xq/src/main/java/com/ruoyi/xq/domain/AccountChangeLog.java

@@ -37,13 +37,13 @@ public class AccountChangeLog implements Serializable {
      */
     private String usercode;
     /**
-     * 账户类型 1-余额 2-收益
-     */
-    private Integer accountType;
-    /**
-     * 目标用户ID
+     * 来源用户
      */
     private Long tarUserId;
+    /**
+     * 来源用户编码
+     */
+    private String tarUsercode;
     /**
      * 目标用户基本信息备份
      */
@@ -56,21 +56,16 @@ public class AccountChangeLog implements Serializable {
      * 变化编号
      */
     private Integer changeType;
-    /**
-     * 变化编号
-     */
-    private BigDecimal changeValue;
     /**
      * 变化值，为正 或者为负
      */
-    private Long traceId;
-    /**
-     * 是否为后台用户手动调整
-     */
+    private BigDecimal changeValue;
+    private String traceId;
     private Integer isAdmin;
-
+    private Long adminId;
+    private String adminName;
+    private String remark;
     private LocalDateTime createTime;
-
     private LocalDateTime updateTime;
 
 }

ruoyi-xq/src/main/java/com/ruoyi/xq/domain/ConsumeLog.java

@@ -49,7 +49,7 @@ public class ConsumeLog implements Serializable {
     /**
      * 一级金额
      */
-    private Long oneAmount;
+    private BigDecimal oneAmount;
     /**
      * 消费方用户
      */
@@ -81,11 +81,11 @@ public class ConsumeLog implements Serializable {
     /**
      * 是否参与分销
      */
-    private String oneJoin;
+    private Boolean oneJoin;
     /**
      * 状态  0-待计算分销 1-已计算分销
      */
-    private String calculateStatus;
+    private Boolean calculateStatus;
     /**
      * 状态  -1-无须分销 0-待分销 1-已分销
      */
@@ -125,4 +125,10 @@ public class ConsumeLog implements Serializable {
 
     private LocalDateTime updateTime;
 
+    public void init(User user){
+        this.setSourceUserId(user.getId());
+        this.setSourcePhone(user.getMobile());
+        this.setSourceUsercode(user.getUsercode());
+    }
+
 }

ruoyi-xq/src/main/java/com/ruoyi/xq/domain/UserExtend.java

@@ -33,6 +33,10 @@ public class UserExtend implements Serializable {
      * 用户号
      */
     private String usercode;
+    /**
+     * vip邀请返现比例
+     */
+    private BigDecimal vipInviteRate;
     /**
      * 收益的余额
      */

ruoyi-xq/src/main/java/com/ruoyi/xq/domain/UserInvite.java

@@ -45,6 +45,7 @@ public class UserInvite implements Serializable {
      * 给上家的返现提成
      */
     private BigDecimal cashbackTotal;
+    private Boolean enableRate;
 
     private LocalDateTime createTime;
     private LocalDateTime updateTime;

ruoyi-xq/src/main/java/com/ruoyi/xq/domain/VipOrder.java

@@ -33,6 +33,7 @@ public class VipOrder implements Serializable {
      * 用户号
      */
     private String usercode;
+    private String traceId;
     /**
      * VIP-ID
      */