From 8fd09daba5c89106b4a9aacd8d5ef9354afc93be Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期六, 28 二月 2026 14:22:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/MemberCoupon.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/MemberCoupon.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/MemberCoupon.java
index 1b3922e..8736169 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/MemberCoupon.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/MemberCoupon.java
@@ -14,6 +14,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import java.math.BigDecimal;
+import java.util.List;
import java.util.Objects;
/**
@@ -137,11 +138,18 @@
@ApiModelProperty(value = "鐢ㄦ埛鎵嬫満鍙�")
@TableField(exist = false)
private String memberPhone;
+ @ApiModelProperty(value = "棰嗗彇鏂瑰紡闆嗗悎")
+ @TableField(exist = false)
+ private List<Integer> methodList;
@ApiModelProperty(value = "浼樻儬閲戦锛堝厓锛�", example = "1")
@ExcelColumn(name="浼樻儬閲戦锛堝厓锛�",width = 10,index = 7)
@TableField(exist = false)
private BigDecimal couponPrice ;
+ @ApiModelProperty(value = "鏄惁杩囨湡 0鏈繃鏈� 1宸茶繃鏈�", example = "1")
+ @ExcelColumn(name="鏄惁杩囨湡",width = 10,index = 14,valueMapping = "0=鏈繃鏈�;1=宸茶繃鏈�;")
+ @TableField(exist = false)
+ private Integer isexpire;
public static MemberCoupon couponToBean(Coupon coupon, Member member , Date now, Integer getMethod, LoginUserInfo loginUserInfo){
@@ -175,6 +183,7 @@
insert.setApplyIds(coupon.getApplyIds());
insert.setApplyType(coupon.getApplyType());
insert.setCouponId(coupon.getId());
+ insert.setMaxPrice(coupon.getMaxPrice());
return insert;
}
--
Gitblit v1.9.3