From 4d2dda710968035fa52e69dea47525985674422b Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 21 一月 2026 17:18:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/InviteRecord.java | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/InviteRecord.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/InviteRecord.java
index 0d1893a..7bf1095 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/InviteRecord.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/InviteRecord.java
@@ -30,14 +30,13 @@
private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="浜ゆ槗鏃堕棿" ,index =1,width = 10)
+ @ExcelColumn(name="娉ㄥ唽鏃堕棿" ,index =8,width = 10 ,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
private Integer editor;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
-
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -56,16 +55,23 @@
private String phone;
@ApiModelProperty(value = "鏄惁瀹屾垚棣栧崟锛�0鍚� 1鏄�", example = "1")
+ @ExcelColumn(name="瀹屾垚鏋佺" ,index =4,width = 10,valueMapping = "0=宸叉敞鍐�;1=瀹屾垚棣栧崟;")
private Integer firstOrderStatus;
@ApiModelProperty(value = "瀹屾垚棣栧崟鏃堕棿")
+ @ExcelColumn(name="瀹屾垚棣栧崟鏃堕棿" ,index =7,width = 10 ,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date firstFinishDate;
@ApiModelProperty(value = "閭�璇峰鍔辩Н鍒�")
+ @ExcelColumn(name="濂栧姳閭�璇蜂汉绉垎" ,index =5,width = 10 )
private BigDecimal rewardIntegral;
- @ApiModelProperty(value = "瀹屾垚棣栧崟濂栧姳绉垎")
- private BigDecimal firstRewardIntegral;
+ @ApiModelProperty(value = "閭�璇峰畬鎴愰鍗曞鍔变紭鎯犲埜涓婚敭 澶氫釜浠�,鍒嗗壊")
+ private String couponIds;
+
+ @ApiModelProperty(value = "閭�璇峰畬鎴愰鍗曞鍔变紭鎯犲埜鍚嶇О 澶氫釜浠�,鍒嗗壊")
+ @ExcelColumn(name="濂栧姳閭�璇蜂汉浼樻儬鍒�" ,index =6,width = 10 )
+ private String couponNames;
@ApiModelProperty(value = "琚個璇蜂汉澶村儚")
@TableField(exist = false)
@@ -73,6 +79,28 @@
@ApiModelProperty(value = "琚個璇蜂汉鍚嶇О")
@TableField(exist = false)
+ @ExcelColumn(name="琚個璇蜂汉锛堟樀绉�/濮撳悕/鎵嬫満鍙凤級" ,index =2,width = 20)
private String memberName;
+ @ApiModelProperty(value = "琚個璇蜂汉鍚嶇О")
+ @TableField(exist = false)
+ private String memberNickname;
+ @ApiModelProperty(value = "琚個璇蜂汉鎵嬫満鍙�")
+ @TableField(exist = false)
+ private String memberPhone;
+ @ApiModelProperty(value = "閭�璇蜂汉鏄电О")
+ @TableField(exist = false)
+ private String recNickname;
+ @ApiModelProperty(value = "閭�璇蜂汉鎵嬫満鍙�")
+ @TableField(exist = false)
+ private String recPhone;
+ @ApiModelProperty(value = "琚個璇蜂汉鍚嶇О")
+ @TableField(exist = false)
+ @ExcelColumn(name="閭�璇蜂汉锛堟樀绉�/濮撳悕/鎵嬫満鍙凤級" ,index =3,width = 20)
+ private String recName;
+ @ApiModelProperty(value = "琚個璇蜂汉鍚嶇О")
+ @TableField(exist = false)
+ @ExcelColumn(name="琚個璇蜂汉openid" ,index =1,width = 15)
+ private String openid;
+
}
--
Gitblit v1.9.3