From b3bc4f358434ec82f90eaa8b87f68b68a2652fa7 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 22 十月 2024 15:08:17 +0800
Subject: [PATCH] fix: id
---
src/main/java/com/mzl/flower/mapper/wallet/WalletMapper.java | 6 ++++++
src/main/java/com/mzl/flower/entity/wallet/WithdrawRecordDO.java | 6 ++++--
src/main/java/com/mzl/flower/constant/Constants.java | 28 ++++++++++++++++++++++++++++
src/main/java/com/mzl/flower/entity/wallet/WalletDO.java | 5 +++--
src/main/java/com/mzl/flower/entity/wallet/WalletBillRecordDO.java | 11 ++++++-----
5 files changed, 47 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/mzl/flower/constant/Constants.java b/src/main/java/com/mzl/flower/constant/Constants.java
index fc79067..ed5b090 100644
--- a/src/main/java/com/mzl/flower/constant/Constants.java
+++ b/src/main/java/com/mzl/flower/constant/Constants.java
@@ -575,4 +575,32 @@
}
}
+
+ public enum BILL_CHANGE_TYPE {
+ withdraw("提现"), settlement("结算");
+
+ BILL_CHANGE_TYPE(String desc) {
+ this.desc = desc;
+ }
+
+ private String desc;
+
+ public String getDesc() {
+ return desc;
+ }
+ }
+ public enum BILL_CHANGE_METHOD {
+ add("增加"), reduce("减少");
+
+ BILL_CHANGE_METHOD(String desc) {
+ this.desc = desc;
+ }
+
+ private String desc;
+
+ public String getDesc() {
+ return desc;
+ }
+ }
+
}
diff --git a/src/main/java/com/mzl/flower/entity/wallet/WalletBillRecordDO.java b/src/main/java/com/mzl/flower/entity/wallet/WalletBillRecordDO.java
index 8da1872..dd22292 100644
--- a/src/main/java/com/mzl/flower/entity/wallet/WalletBillRecordDO.java
+++ b/src/main/java/com/mzl/flower/entity/wallet/WalletBillRecordDO.java
@@ -2,6 +2,7 @@
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.mzl.flower.base.BaseAutoEntity;
import com.mzl.flower.base.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -16,26 +17,26 @@
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("t_wallet_bill_record")
-public class WalletBillRecordDO extends BaseEntity {
+public class WalletBillRecordDO extends BaseAutoEntity {
@ApiModelProperty(value = "供应商Id")
- private Long supplierId;
+ private String supplierId;
@ApiModelProperty(value = "钱包Id")
private Long walletId;
@ApiModelProperty(value = "账单变动类型（提现,结算）")
- private Integer type;
+ private String type;
@ApiModelProperty(value = "类型明细")
- private Integer typeDetail;
+ private String typeDetail;
@ApiModelProperty(value = "转账Id")
private String transferId;
@ApiModelProperty(value = "变动方式（增加、减少")
- private Integer method;
+ private String method;
@ApiModelProperty(value = "原金额")
private BigDecimal originalAmount;
diff --git a/src/main/java/com/mzl/flower/entity/wallet/WalletDO.java b/src/main/java/com/mzl/flower/entity/wallet/WalletDO.java
index 7c1fcc2..9c33979 100644
--- a/src/main/java/com/mzl/flower/entity/wallet/WalletDO.java
+++ b/src/main/java/com/mzl/flower/entity/wallet/WalletDO.java
@@ -2,6 +2,7 @@
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.mzl.flower.base.BaseAutoEntity;
import com.mzl.flower.base.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -16,7 +17,7 @@
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("t_wallet")
-public class WalletDO extends BaseEntity {
+public class WalletDO extends BaseAutoEntity {
/**
@@ -29,7 +30,7 @@
* 供应商ID
*/
@ApiModelProperty(value = "供应商Id")
- private Long supplierId;
+ private String supplierId;
/**
* 总金额
diff --git a/src/main/java/com/mzl/flower/entity/wallet/WithdrawRecordDO.java b/src/main/java/com/mzl/flower/entity/wallet/WithdrawRecordDO.java
index a84fa99..e8d8948 100644
--- a/src/main/java/com/mzl/flower/entity/wallet/WithdrawRecordDO.java
+++ b/src/main/java/com/mzl/flower/entity/wallet/WithdrawRecordDO.java
@@ -3,6 +3,8 @@
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableName;
import java.time.LocalDateTime;
+
+import com.mzl.flower.base.BaseAutoEntity;
import com.mzl.flower.base.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,14 +19,14 @@
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("t_withdraw_record")
-public class WithdrawRecordDO extends BaseEntity {
+public class WithdrawRecordDO extends BaseAutoEntity {
/**
* 供应商ID
*/
@ApiModelProperty(value = "供应商Id")
- private Long supplierId;
+ private String supplierId;
/**
* 提现金额
diff --git a/src/main/java/com/mzl/flower/mapper/wallet/WalletMapper.java b/src/main/java/com/mzl/flower/mapper/wallet/WalletMapper.java
index f7f101c..19645d7 100644
--- a/src/main/java/com/mzl/flower/mapper/wallet/WalletMapper.java
+++ b/src/main/java/com/mzl/flower/mapper/wallet/WalletMapper.java
@@ -2,6 +2,9 @@
import com.mzl.flower.entity.wallet.WalletDO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
/**
* <p>
@@ -13,4 +16,7 @@
*/
public interface WalletMapper extends BaseMapper<WalletDO> {
+
+ @Select("select total_amount as totalAmount from t_wallet where supplier_id =#{supplierId}")
+ public BigDecimal getTotalAmount(String supplierId);
}
--
Gitblit v1.9.3