init

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

@@ -46,9 +46,9 @@ public class CaiConsumeLog implements Serializable {
      */
     private Long oneAmount;
     /**
-     * 二级金额
+     * 工会金额
      */
-    private Long twoAmount;
+    private Long unionAmount;
     /**
      * 平台金额
      */
@@ -125,7 +125,7 @@ public class CaiConsumeLog implements Serializable {
     /**
      * 状态  0-待计算分销 1-已计算分销
      */
-    private String calculateStatus;
+    private Boolean calculateStatus;
     /**
      * 状态  -1-无须分销 0-待分销 1-已分销
      */
@@ -133,7 +133,7 @@ public class CaiConsumeLog implements Serializable {
     /**
      * 状态  0-否 1-是
      */
-    private String admin;
+    private Boolean admin;
     /**
      * 管理员ID
      */

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

@@ -28,14 +28,20 @@ public class GuardLog implements Serializable {
      * 女神
      */
     private Long fromUserId;
+    private String fromUsercode;
+    private String fromMobile;
+
     /**
      * 赠送人
      */
     private Long toUserId;
+    private String toUsercode;
+    private String toMobile;
     /**
      * 赠送个数
      */
     private Long guardNum;
+    private Long guardPrice;
     /**
      * 守护值
      */

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

@@ -28,10 +28,14 @@ public class GuardTotal implements Serializable {
      * 被守护人的user_id(大咖)
      */
     private Long fromUserId;
+    private String fromUsercode;
+    private String fromMobile;
     /**
      * 守护人的user_id
      */
     private Long toUserId;
+    private String toUsercode;
+    private String toMobile;
     /**
      * 累计守护符个数
      */

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

@@ -32,14 +32,21 @@ public class UserGift implements Serializable {
      * 赠送者
      */
     private Long fromUid;
+    private String fromUsercode;
+    private String fromMobile;
     /**
      * 接受者
      */
     private Long toUid;
+    private String toUsercode;
+    private String toMobile;
     /**
      * 礼物ID
      */
     private Long giftId;
+    private String giftImg;
+    private String giftName;
+    private Long giftPrice;
     /**
      * 礼物数量
      */