This commit is contained in:
dute7liang
2023-12-29 21:55:03 +08:00
parent 7ae0f94bb6
commit 01bb9912d9
18 changed files with 283 additions and 100 deletions

View File

@@ -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());
}
}