From 6f846284806e47fac7c2a4a9658473f7f8e9945b Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 02 三月 2026 12:10:23 +0800
Subject: [PATCH] 经销商管理
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/MemberCoupon.java | 7 ++++++-
1 files changed, 6 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 c573ce9..4d8fb43 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
@@ -146,6 +146,10 @@
@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){
@@ -159,7 +163,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)){
@@ -179,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