123

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

@@ -30,6 +30,7 @@ public class AccountCash implements Serializable {
      *
      */
     private Long userId;
+    private Long traceId;
     /**
      * 订单号
      */

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

@@ -3,6 +3,7 @@ package com.ruoyi.cai.domain;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
+import org.springframework.web.bind.annotation.DeleteMapping;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -28,7 +29,7 @@ public class AccountChangeLog implements Serializable {
     /**
      * 用户ID
      */
-    private Integer userId;
+    private Long userId;
     /**
      * 蜜瓜号
      */
@@ -44,15 +45,12 @@ public class AccountChangeLog implements Serializable {
     /**
      * 名称
      */
-    private Integer cateName;
-    /**
-     * 业务码
-     */
-    private Long businessCode;
+    private String cateName;
+    private Long traceId;
     /**
      * 变化值，为正 或者为负
      */
-    private BigDecimal changeValue;
+    private Long changeValue;
     /**
      * 备注
      */
@@ -60,6 +58,7 @@ public class AccountChangeLog implements Serializable {
     /**
      * 操作IP
      */
+    @Deprecated
     private String operateIp;
     /**
      * 是否为后台用户手动调整

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

@@ -30,10 +30,15 @@ public class ConsumeLog implements Serializable {
      * 类型 1-充值 2-礼物 3-守护 4-通话
      */
     private Integer type;
+
     /**
-     * 业务ID
+     * 业务状态码
      */
-    private Integer sourceBusinessId;
+    private String businessEnum;
+    /**
+     * 跟踪ID
+     */
+    private Long traceId;
     /**
      * 发生金额
      */
@@ -163,9 +168,11 @@ public class ConsumeLog implements Serializable {
         this.setSourceUserId(fromUser.getId());
         this.setSourcePhone(fromUser.getMobile());
         this.setSourceUsercode(fromUser.getUsercode());
-        this.setTargetUserId(toUser.getId());
-        this.setTargetUsercode(toUser.getUsercode());
-        this.setTargetPhone(toUser.getMobile());
+        if(toUser != null){
+            this.setTargetUserId(toUser.getId());
+            this.setTargetUsercode(toUser.getUsercode());
+            this.setTargetPhone(toUser.getMobile());
+        }
     }
 
 }

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

@@ -47,10 +47,7 @@ public class GuardLog implements Serializable {
      * 守护值
      */
     private Long guardValue;
-    /**
-     * 流水ID
-     */
-    private Long consumeLogId;
+    private Long traceId;
 
     private LocalDateTime createTime;
     private LocalDateTime updateTime;

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

@@ -30,6 +30,7 @@ public class RechargeOrder implements Serializable {
      * 用户ID
      */
     private Long userId;
+    private Long traceId;
     /**
      * 商品ID
      */

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

@@ -57,7 +57,7 @@ public class UserGift implements Serializable {
      */
     private Long giftAmount;
 
-    private Long consumerLogId;
+    private Long traceId;
 
     private LocalDateTime createTime;