From 80d88f15a2222ec2dbe33f5d1d2b2296a890f41b Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 03 三月 2026 16:22:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/MemberCoupon.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 8736169..0e22679 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
@@ -114,6 +114,12 @@
@ApiModelProperty(value = "鎶樻墸鍗锋弧鍑忎笂闄愰噾棰�")
private BigDecimal maxPrice;
+ @ApiModelProperty(value = "杩囨湡閫氱煡锛�0=鏈�氱煡锛�1=宸查�氱煡", example = "1")
+ private Integer noticeStatus;
+
+ @ApiModelProperty(value = "閫氱煡鏃堕棿", example = "1")
+ private Date noticeTime;
+
@ApiModelProperty(value = "鏄电О")
@TableField(exist = false)
@ExcelColumn(name="鐢ㄦ埛",width = 10,index = 1)
@@ -163,7 +169,7 @@
insert.setMemberId(member.getId());
insert.setShopId(coupon.getShopId());
insert.setType(coupon.getType());
- insert.setCouponType(coupon.getType());
+ insert.setCouponType(coupon.getCouponType());
insert.setLimitPrice(coupon.getLimitPrice());
insert.setPrice(coupon.getPrice());
if(Constants.equalsObject(coupon.getUseType(),Constants.ZERO)){
--
Gitblit v1.9.3