From 4fabfe4dbd2eb28d07a4350597d314958cc1c281 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 09 十月 2025 11:16:43 +0800
Subject: [PATCH] 优化
---
server/services/src/main/java/com/doumee/dao/business/model/DiscountMember.java | 86 +++++++++++++++++++++++++------------------
1 files changed, 50 insertions(+), 36 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/DiscountMember.java b/server/services/src/main/java/com/doumee/dao/business/model/DiscountMember.java
index b00dd03..dbf46d2 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/DiscountMember.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/DiscountMember.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -10,6 +11,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import java.math.BigDecimal;
+import java.util.List;
/**
* 鐢ㄦ埛楠戣濂楅鍗″叧鑱旇〃
@@ -22,141 +24,153 @@
public class DiscountMember {
@ApiModelProperty(value = "缂栫爜")
- @ExcelColumn(name="缂栫爜")
private String id;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ExcelColumn(name="鍒涘缓鏃堕棿",index = 8,width = 16,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date createDate;
@ApiModelProperty(value = "鍒涘缓浜�")
- @ExcelColumn(name="鍒涘缓浜�")
private String creator;
@ApiModelProperty(value = "缂栬緫鏃堕棿")
- @ExcelColumn(name="缂栬緫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date editDate;
@ApiModelProperty(value = "缂栬緫浜�")
- @ExcelColumn(name="缂栬緫浜�")
private String editor;
@ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1")
- @ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
private Integer isdeleted;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
private String info;
@ApiModelProperty(value = "绁ㄥ彿")
- @ExcelColumn(name="绁ㄥ彿")
+ @ExcelColumn(name="濂楅绁ㄥ彿",index = 0,width = 16)
private String code;
@ApiModelProperty(value = "鍚嶇О")
- @ExcelColumn(name="鍚嶇О")
+ @ExcelColumn(name="濂楅鍚嶇О",index = 2,width = 10)
private String name;
@ApiModelProperty(value = "绫诲瀷 0鏈熼檺鍗� 1娆″崱", example = "1")
- @ExcelColumn(name="绫诲瀷 0鏈熼檺鍗� 1娆″崱")
+ @ExcelColumn(name="濂楅绫诲瀷",index = 1,valueMapping = "0=鏈熼檺鍗�;1=娆″崱;",width = 10)
private Integer type;
@ApiModelProperty(value = "姣忔棩楠戣闄愬埗绫诲瀷 0涓嶉檺鍒� 1闄愬埗", example = "1")
- @ExcelColumn(name="姣忔棩楠戣闄愬埗绫诲瀷 0涓嶉檺鍒� 1闄愬埗")
private Integer limitType;
@ApiModelProperty(value = "姣忔棩楠戣闄愬埗鏃堕棿锛堝垎閽燂級", example = "1")
- @ExcelColumn(name="姣忔棩楠戣闄愬埗鏃堕棿锛堝垎閽燂級")
private Integer limitTime;
@ApiModelProperty(value = "閿�鍞环锛堝厓锛�", example = "1")
- @ExcelColumn(name="閿�鍞环锛堝厓锛�")
private BigDecimal price;
@ApiModelProperty(value = "鍒掔嚎浠凤紙鍏冿級", example = "1")
- @ExcelColumn(name="鍒掔嚎浠凤紙鍏冿級")
private BigDecimal linePrice;
@ApiModelProperty(value = "閿�鍞笭閬� 0灏忕▼搴�", example = "1")
- @ExcelColumn(name="閿�鍞笭閬� 0灏忕▼搴�")
private Integer channel;
@ApiModelProperty(value = "濂楅鍥剧墖")
- @ExcelColumn(name="濂楅鍥剧墖")
private String imgurl;
@ApiModelProperty(value = "绠�浠�")
- @ExcelColumn(name="绠�浠�")
private String descs;
@ApiModelProperty(value = "鎻忚堪")
- @ExcelColumn(name="鎻忚堪")
private String content;
@ApiModelProperty(value = "閿�鍞紑濮嬫棩鏈�")
- @ExcelColumn(name="閿�鍞紑濮嬫棩鏈�")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date startDate;
@ApiModelProperty(value = "閿�鍞粨鏉熸棩鏈�")
- @ExcelColumn(name="閿�鍞粨鏉熸棩鏈�")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date endDate;
@ApiModelProperty(value = "浣跨敤鏃堕棿绫诲瀷 0鍥哄畾鏃堕棿娈� 1璐拱鍚庣敓鏁� 2鎸囧畾鏃ユ湡鐢熸晥", example = "1")
- @ExcelColumn(name="浣跨敤鏃堕棿绫诲瀷 0鍥哄畾鏃堕棿娈� 1璐拱鍚庣敓鏁� 2鎸囧畾鏃ユ湡鐢熸晥")
private Integer useType;
@ApiModelProperty(value = "浣跨敤寮�濮嬫棩鏈�")
- @ExcelColumn(name="浣跨敤寮�濮嬫棩鏈�")
+ @ExcelColumn(name="鏈夋晥鏈熷紑濮�",index = 5,width = 16,dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date useStartDate;
@ApiModelProperty(value = "浣跨敤缁撴潫鏃ユ湡")
- @ExcelColumn(name="浣跨敤缁撴潫鏃ユ湡")
+ @ExcelColumn(name="鏈夋晥鏈熺粨鏉�",index = 6,width = 16,dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date useEndDate;
@ApiModelProperty(value = "浣跨敤鏈夋晥澶╂暟", example = "1")
- @ExcelColumn(name="浣跨敤鏈夋晥澶╂暟")
private Integer useDays;
@ApiModelProperty(value = "鑺傚亣鏃ユ槸鍚﹀彲浠� 0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="鑺傚亣鏃ユ槸鍚﹀彲浠� 0鍚� 1鏄�")
private Integer useHoliday;
@ApiModelProperty(value = "宸ヤ綔鏃ユ槸鍚﹀彲浠� 0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="宸ヤ綔鏃ユ槸鍚﹀彲浠� 0鍚� 1鏄�")
private Integer useWorkday;
@ApiModelProperty(value = "閿�閲忔�婚檺棰�", example = "1")
- @ExcelColumn(name="閿�閲忔�婚檺棰�")
private Integer saleLimit;
@ApiModelProperty(value = "閿�閲忔瘡澶╅檺棰�", example = "1")
- @ExcelColumn(name="閿�閲忔瘡澶╅檺棰�")
private Integer saleDayLimit;
- @ApiModelProperty(value = "鐘舵�� 0姝ｅ父 1浣滃簾 2杩囨湡鎴栫敤瀹�", example = "1")
- @ExcelColumn(name="鐘舵�� 0姝ｅ父 1浣滃簾 2杩囨湡鎴栫敤瀹�")
+ @ApiModelProperty(value = "鐘舵�� 0姝ｅ父 1浣滃簾 2寰呮敮浠�", example = "1")
+ @ExcelColumn(name="濂楅鐘舵��",index = 7,width = 10,valueMapping = "0=姝ｅ父;1=浣滃簾;2=寰呮敮浠�")
private Integer status;
@ApiModelProperty(value = "鐢ㄦ埛缂栫爜锛堝叧鑱攎ember)")
- @ExcelColumn(name="鐢ㄦ埛缂栫爜锛堝叧鑱攎ember)")
private String memberId;
@ApiModelProperty(value = "鍏宠仈璁㈠崟缂栫爜(鍏宠仈goodsorder锛�")
- @ExcelColumn(name="鍏宠仈璁㈠崟缂栫爜(鍏宠仈goodsorder锛�")
private String goodsorderId;
@ApiModelProperty(value = "鏄惁鏀寔鑷杞﹁鍗� 0涓嶆敮鎸� 1鏀寔", example = "1")
- @ExcelColumn(name="鏄惁鏀寔鑷杞﹁鍗� 0涓嶆敮鎸� 1鏀寔")
private Integer isbike;
@ApiModelProperty(value = "鏄惁鏀寔鐢靛姩杞� 0涓嶆敮鎸� 1鏀寔", example = "1")
- @ExcelColumn(name="鏄惁鏀寔鐢靛姩杞� 0涓嶆敮鎸� 1鏀寔")
private Integer iselecbike;
+
+ @ApiModelProperty(value = "鐢ㄦ埛opneid")
+ @ExcelColumn(name="鐢ㄦ埛淇℃伅",index = 3,width = 20)
+ @TableField(exist = false)
+ private String openid;
+
+
+ @ApiModelProperty(value = "浣跨敤娆℃暟")
+ @ExcelColumn(name="浣跨敤娆℃暟",index = 4,width = 20)
+ @TableField(exist = false)
+ private Integer useTimes;
+
+ @ApiModelProperty(value = "浣跨敤鏃堕暱")
+ @TableField(exist = false)
+ private Integer useTime;
+
+ @ApiModelProperty(value = "鍓╀綑鏃堕暱",hidden = true)
+ @TableField(exist = false)
+ private Integer surplusTime;
+
+ @ApiModelProperty(value = "楠戣璁板綍")
+ @TableField(exist = false)
+ private List<DiscountLog> discountLogList;
+
+
+ @ApiModelProperty(value = "鎿嶄綔璁板綍")
+ @TableField(exist = false)
+ private List<DiscountLog> optLogList;
+
+ @ApiModelProperty(value = "鏌ヨ寮�濮嬫棩鏈燂紙鍖呭惈锛�", example = "2023-10-01 15:12:01")
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date startCreateDate;
+
+ @ApiModelProperty(value = "鏌ヨ鎴鏃ユ湡锛堝寘鍚級", example = "2023-10-09 15:12:05")
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date endCreateDate;
}
--
Gitblit v1.9.3