init

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiAccount.java

@@ -32,14 +32,6 @@ public class CaiAccount implements Serializable {
      * 用户ID
      */
     private Long userId;
-    /**
-     * 充值的可用余额
-     */
-    private BigDecimal money;
-    /**
-     * 收益的金额
-     */
-    private BigDecimal incomeMoney;
     /**
      * 当前彩币数量
      */
@@ -48,11 +40,6 @@ public class CaiAccount implements Serializable {
      * 收益的彩币数量
      */
     private Long incomeCoin;
-    private Long totalCoin;
-    /**
-     * 当前魅力值
-     */
-    private Long loveValue;
     /**
      * 充值总额
      */

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiAnchor.java

@@ -71,6 +71,10 @@ public class CaiAnchor implements Serializable{
      * 视频分成比例
      */
     private BigDecimal videoRate;
+    /**
+     * 守护分成比例
+     */
+    private BigDecimal guardRate;
     /**
      * 礼物分成比列
      */

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiConsumeLog.java

@@ -1,17 +1,12 @@
 package com.ruoyi.cai.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.math.BigDecimal;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.domain.BaseEntity;
+import java.time.LocalDateTime;
 
 /**
  * 消费记录对象 cai_consume_log
@@ -41,27 +36,27 @@ public class CaiConsumeLog implements Serializable {
     /**
      * 发生金额
      */
-    private BigDecimal amount;
+    private Long amount;
     /**
      * 主播金额
      */
-    private BigDecimal anchorAmount;
+    private Long anchorAmount;
     /**
      * 一级金额
      */
-    private BigDecimal oneAmount;
+    private Long oneAmount;
     /**
      * 二级金额
      */
-    private BigDecimal twoAmount;
+    private Long twoAmount;
     /**
      * 平台金额
      */
-    private BigDecimal platformAmount;
+    private Long platformAmount;
     /**
      * 消费方用户
      */
-    private Integer sourceUserId;
+    private Long sourceUserId;
     /**
      * 消费方用户
      */
@@ -73,7 +68,7 @@ public class CaiConsumeLog implements Serializable {
     /**
      * 接收方用户
      */
-    private Integer targetUserId;
+    private Long targetUserId;
     /**
      * 接收方用户
      */
@@ -82,11 +77,14 @@ public class CaiConsumeLog implements Serializable {
      * 接收方用户
      */
     private String targetPhone;
+    /**
+     * 接收方的费率
+     */
     private BigDecimal targetRate;
     /**
      * 一级分销方
      */
-    private Integer oneUserId;
+    private Long oneUserId;
     /**
      * 一级分销方
      */
@@ -99,6 +97,9 @@ public class CaiConsumeLog implements Serializable {
      * 一级分销方抽成比例
      */
     private BigDecimal oneRate;
+    /**
+     * 是否有效
+     */
     private Boolean oneJoin;
     /**
      * 是否为工会管理员 0=否 1=是
@@ -107,7 +108,7 @@ public class CaiConsumeLog implements Serializable {
     /**
      * 工会提成
      */
-    private Integer unionUserId;
+    private Long unionUserId;
     /**
      * 工会提成
      */
@@ -157,4 +158,13 @@ public class CaiConsumeLog implements Serializable {
 
     private LocalDateTime createTime;
 
+    public void init(CaiUser fromUser,CaiUser toUser){
+        this.setSourceUserId(fromUser.getId());
+        this.setSourcePhone(fromUser.getMobile());
+        this.setSourceUsercode(fromUser.getUsercode());
+        this.setTargetUserId(toUser.getId());
+        this.setTargetUsercode(toUser.getUsercode());
+        this.setTargetPhone(toUser.getMobile());
+    }
+
 }

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUnion.java

@@ -34,17 +34,13 @@ public class CaiUnion implements Serializable {
      */
     private String name;
     /**
-     * 0=可用 1=不可用
+     * 是否开启提成
      */
-    private Integer status;
+    private Boolean enableRate;
     /**
      * 工会默认二级支付奖励比例
      */
-    private BigDecimal unionPayRate;
-    /**
-     * 工会默认二级收益奖励比例
-     */
-    private BigDecimal unionIncomeRate;
+    private BigDecimal defaultIncomeRate;
     /**
      * 全部人数
      */

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUnionUser.java

@@ -46,9 +46,9 @@ public class CaiUnionUser implements Serializable {
      */
     private BigDecimal vipDivide;
     /**
-     * 0=不分成 1=分成
+     * 是否开启提成
      */
-    private Integer type;
+    private Boolean enableRate;
     /**
      * 收益
      */

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserGift.java

@@ -49,6 +49,8 @@ public class CaiUserGift implements Serializable {
      */
     private Long giftAmount;
 
+    private Long consumerLogId;
+
     private LocalDateTime createTime;
 
 }

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUserInvite.java

@@ -34,21 +34,29 @@ public class CaiUserInvite implements Serializable {
      */
     private Long inviteId;
     /**
-     * 奖励好友收入的比率
+     * 奖励好友收入视频提成比率
      */
-    private BigDecimal rewardIncomeRate;
+    private BigDecimal videoIncomeRate;
+    /**
+     * 奖励好友守护的比例
+     */
+    private BigDecimal guardIncomeRate;
+    /**
+     * 奖励好友礼物的比例
+     */
+    private BigDecimal giftIncomeRate;
     /**
      * 奖励好友充值的比率
      */
-    private BigDecimal rewardRechargeRate;
+    private BigDecimal payIncomeRate;
     /**
      * 邀请奖励汇总
      */
-    private BigDecimal rewardMoneyTotal;
+    private Long rewardCoinTotal;
     /**
      * 是否有效 0=无效 1=有效
      */
-    private Integer isValid;
+    private Boolean enableRate;
 
     private LocalDateTime createTime;