From 0c001d14de8a29465e2dff166d6cb92fc681e75f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 14 七月 2025 18:12:02 +0800
Subject: [PATCH] 前端
---
server/services/src/main/java/com/doumee/dao/business/model/MemberRevenue.java | 48 +++++++++++++++++++++++++++---------------------
1 files changed, 27 insertions(+), 21 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/MemberRevenue.java b/server/services/src/main/java/com/doumee/dao/business/model/MemberRevenue.java
index 5369aea..fa4b570 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/MemberRevenue.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/MemberRevenue.java
@@ -23,74 +23,60 @@
public class MemberRevenue {
@ApiModelProperty(value = "涓婚敭", example = "1")
- @ExcelColumn(name="涓婚敭")
private Integer id;
@ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1")
- @ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
private Integer deleted;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer createUser;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
+ @ExcelColumn(name="浜ゆ槗鏃堕棿",index = 8,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
private Date createTime;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer updateUser;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏇存柊鏃堕棿")
private Date updateTime;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
private String remark;
@ApiModelProperty(value = "浼氬憳涓婚敭", example = "1")
- @ExcelColumn(name="浼氬憳涓婚敭")
private Integer memberId;
@ApiModelProperty(value = "鍙樺姩绫诲瀷:0=鐢ㄥ伐鍗曟敹鍏ワ紱1=璐ц繍鍗曟敹鍏ワ紱2=渚涢鍗曟敹鍏ワ紱3=鎻愮幇鐢宠锛�", example = "1")
- @ExcelColumn(name="鍙樺姩绫诲瀷:0=鐢ㄥ伐鍗曟敹鍏ワ紱1=璐ц繍鍗曟敹鍏ワ紱2=渚涢鍗曟敹鍏ワ紱3=鎻愮幇鐢宠锛�")
private Integer type;
@ApiModelProperty(value = "鏀舵敮绫诲瀷:1=鏀跺叆锛�-1=鏀嚭锛�", example = "1")
- @ExcelColumn(name="鏀舵敮绫诲瀷:1=鏀跺叆锛�-1=鏀嚭锛�")
+ @ExcelColumn(name="鏀舵敮绫诲瀷", valueMapping="1=鏀跺叆;-1=鏀嚭;",index = 5,width = 5)
private Integer optType;
@ApiModelProperty(value = "鍙樺姩閲戦", example = "1")
- @ExcelColumn(name="鍙樺姩閲戦")
- private BigDecimal amount;
+ private Long amount;
@ApiModelProperty(value = "鍙樺姩鍓嶉噾棰�", example = "1")
- @ExcelColumn(name="鍙樺姩鍓嶉噾棰�")
- private BigDecimal beforeAmount;
+ private Long beforeAmount;
@ApiModelProperty(value = "鍙樺姩鍚庨噾棰�", example = "1")
- @ExcelColumn(name="鍙樺姩鍚庨噾棰�")
- private BigDecimal afterAmount;
+ private Long afterAmount;
@ApiModelProperty(value = "涓氬姟璁板綍涓婚敭", example = "1")
- @ExcelColumn(name="涓氬姟璁板綍涓婚敭")
private Integer objId;
@ApiModelProperty(value = "涓氬姟绫诲瀷:0=璁㈠崟涓氬姟锛�1=鎻愮幇涓氬姟锛�", example = "1")
- @ExcelColumn(name="涓氬姟绫诲瀷:0=璁㈠崟涓氬姟锛�1=鎻愮幇涓氬姟锛�")
private Integer objType;
@ApiModelProperty(value = "涓氬姟鐘舵��:0=鎴愬姛锛�1=澶辫触锛�2=澶勭悊涓紱", example = "1")
- @ExcelColumn(name="涓氬姟鐘舵��:0=鎴愬姛锛�1=澶辫触锛�2=澶勭悊涓紱")
private Integer status;
@ApiModelProperty(value = "鍙樺姩绫诲瀷:0=鐢ㄥ伐鍗曟敹鍏ワ紱1=璐ц繍鍗曟敹鍏ワ紱2=渚涢鍗曟敹鍏ワ紱3=鎻愮幇鐢宠锛�", example = "1")
@TableField(exist = false)
- @ExcelColumn(name="鍙樺姩绫诲瀷:0=鐢ㄥ伐鍗曟敹鍏ワ紱1=璐ц繍鍗曟敹鍏ワ紱2=渚涢鍗曟敹鍏ワ紱3=鎻愮幇鐢宠锛�")
+ @ExcelColumn(name="鍙樺姩涓氬姟绫诲瀷",index = 7,width = 8)
private String typeName;
@ApiModelProperty(value = "寰俊浜ゆ槗娴佹按鍙�", example = "1")
- @ExcelColumn(name="寰俊浜ゆ槗娴佹按鍙�")
+ @ExcelColumn(name="寰俊浜ゆ槗娴佹按鍙�",index = 9,width = 8)
private String transactionNo;
@ApiModelProperty(value = "鍙樻煡璇㈠紑濮嬫椂闂�", example = "1")
@@ -99,4 +85,24 @@
@ApiModelProperty(value = "鍙樻煡璇㈢粨鏉熸椂闂�", example = "1")
@TableField(exist = false)
private Date endTime;
+ @ApiModelProperty(value = "鍙樺姩閲戦(鍏冿級", example = "1")
+ @TableField(exist = false)
+ @ExcelColumn(name="鍙樺姩閲戦(鍏�)",index = 6,width = 8)
+ private Double amountInfo;
+ @ApiModelProperty(value = "鐢ㄦ埛濮撳悕", example = "1")
+ @TableField(exist = false)
+ @ExcelColumn(name="鐢ㄦ埛濮撳悕",index = 3,width = 5)
+ private String memberName;
+ @ApiModelProperty(value = "鐢ㄦ埛鏄电О", example = "1")
+ @TableField(exist = false)
+ @ExcelColumn(name="鐢ㄦ埛鏄电О",index = 2,width = 5)
+ private String memberNickname;
+ @ApiModelProperty(value = "鐢ㄦ埛鎵嬫満鍙�", example = "1")
+ @TableField(exist = false)
+ @ExcelColumn(name="鐢ㄦ埛鎵嬫満鍙�",index = 4,width = 6)
+ private String memberPhone;
+ @ApiModelProperty(value = "鐢ㄦ埛openId", example = "1")
+ @TableField(exist = false)
+ @ExcelColumn(name="鐢ㄦ埛openid" ,index = 1,width = 6)
+ private String openid;
}
--
Gitblit v1.9.3