123

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

@@ -2,6 +2,7 @@ package com.ruoyi.cai.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.cai.enums.account.AccountChangeCodeEnum;
 import lombok.Data;
 import org.springframework.web.bind.annotation.DeleteMapping;
 
@@ -34,6 +35,9 @@ public class AccountChangeLog implements Serializable {
      * 蜜瓜号
      */
     private String usercode;
+    private Long tarUserId;
+    private String tarParam;
+    private String tarImg;
     /**
      * 账户类型 1-余额 2-收益
      */
@@ -70,4 +74,14 @@ public class AccountChangeLog implements Serializable {
 
     private LocalDateTime createTime;
 
+
+    public void init(AccountChangeCodeEnum change){
+        this.setAccountType(change.getAccountType().getCode());
+        this.setCateId(change.getCate().getCode());
+        this.setCateAppName(change.getText());
+        this.setCateAdminName(change.getText());
+        this.setTraceLinkType(change.getCate().name());
+        this.setRemark(change.getDesc());
+    }
+
 }

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

@@ -1,84 +0,0 @@
-package com.ruoyi.cai.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-/**
- * 账户明细对象 cai_account_detail
- *
- * @author 77
- * @date 2023-12-22
- */
-@Data
-@TableName("cai_account_detail")
-public class AccountDetail implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    /**
-     * 积分记录ID
-     */
-    @TableId(value = "id",type = IdType.AUTO)
-    private Long id;
-    /**
-     * 用户ID
-     */
-    private Long userId;
-    /**
-     * 账户类型ID 1 。充值的金额 2 。收益的金额 3 。充值的彩币 4 收益的彩币
-     */
-    private Integer accountType;
-    /**
-     * 类别
-     */
-    private Integer cateId;
-    /**
-     * 业务码
-     */
-    private Long businessCode;
-    /**
-     * 订单号
-     */
-    private String orderNo;
-    /**
-     * 原有积分
-     */
-    private BigDecimal beforeAmount;
-    /**
-     * 变化后积分
-     */
-    private BigDecimal afterAmount;
-    /**
-     * 变化值，为正 或者为负
-     */
-    private BigDecimal changeValue;
-    /**
-     *
-     */
-    private Long trackUserId;
-    /**
-     * 跟踪的关键字
-     */
-    private String trackParam;
-    /**
-     * 备注
-     */
-    private String remark;
-    /**
-     * 操作IP
-     */
-    private String operateIp;
-    /**
-     * 是否为后台用户手动调整
-     */
-    private Integer isAdmin;
-
-    private LocalDateTime createTime;
-
-}

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

@@ -34,8 +34,7 @@ public class ConsumeLog implements Serializable {
     /**
      * 业务状态码
      */
-    @Deprecated
-    private String businessEnum;
+    private String businessParam;
     /**
      * 跟踪ID
      */