From bde0a39623f35d6e23aafbbc81920d095f8b1e5f Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期六, 23 七月 2022 10:07:41 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActUserWalletTradeDO.java | 47 ++++++++++++++++++++++++++++++-----------------
1 files changed, 30 insertions(+), 17 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActUserWalletTradeDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActUserWalletTradeDO.java
index 448cb4e..97a2b57 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActUserWalletTradeDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActUserWalletTradeDO.java
@@ -1,14 +1,14 @@
package com.panzhihua.service_community.model.dos;
-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.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import lombok.Data;
/**
* @auther lyq
@@ -25,7 +25,7 @@
/**
* 主键id
*/
- @TableId(type = IdType.AUTO)
+ @TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
@@ -73,18 +73,31 @@
*/
private Long walletId;
+ /**
+ * 变动类型（1.增加 2.减少）
+ */
+ private Integer changeType;
+
@Override
public String toString() {
- return "ComActUserWalletTradeDO{" +
- "id=" + id +
- ", userId=" + userId +
- ", communityId=" + communityId +
- ", serviceId=" + serviceId +
- ", amount=" + amount +
- ", type=" + type +
- ", remark=" + remark +
- ", createAt=" + createAt +
- ", createBy=" + createBy +
- "}";
+ return "ComActUserWalletTradeDO{" + "id=" + id + ", userId=" + userId + ", communityId=" + communityId
+ + ", serviceId=" + serviceId + ", amount=" + amount + ", type=" + type + ", remark=" + remark
+ + ", createAt=" + createAt + ", createBy=" + createBy + "}";
+ }
+
+ /**
+ * 交易类型（1.发布随手拍 2.结算）
+ */
+ public interface type {
+ int fb = 1;
+ int js = 2;
+ }
+
+ /**
+ * 变动类型（1.增加 2.减少）
+ */
+ public interface changeType {
+ int add = 1;
+ int reduce = 2;
}
}
\ No newline at end of file
--
Gitblit v1.7.1