Commit 3d2f4eda by chongfu.liang

券当日核销不限时

parent 05d390ba
...@@ -62,6 +62,10 @@ public class ActivityCouponBean { ...@@ -62,6 +62,10 @@ public class ActivityCouponBean {
* 今日剩余可使用次数(频次券才包含) * 今日剩余可使用次数(频次券才包含)
*/ */
private Integer dailyAvailableTimes; private Integer dailyAvailableTimes;
/**
* 总可使用次数(频次券才包含)
*/
private Integer availableTimes;
/** /**
......
...@@ -561,7 +561,9 @@ public class CouponServiceImpl implements CouponService { ...@@ -561,7 +561,9 @@ public class CouponServiceImpl implements CouponService {
activityCouponBean.setActivityCode(memberCoupon.getActivityCode()); activityCouponBean.setActivityCode(memberCoupon.getActivityCode());
activityCouponBean.setCouponType(couponStateVo.getType()); activityCouponBean.setCouponType(couponStateVo.getType());
activityCouponBean.setDateDescribe(couponAdapter.getDateDescribe(memberCoupon.getStatus(), memberCoupon.getStartTime(), memberCoupon.getEndTime())); activityCouponBean.setDateDescribe(couponAdapter.getDateDescribe(memberCoupon.getStatus(), memberCoupon.getStartTime(), memberCoupon.getEndTime()));
activityCouponBean.setDailyAvailableTimes(couponStateVo.getDailyAvailableTimes()); if (couponStateVo.getDailyAvailableTimes() == null && couponStateVo.getAvailableTimes() != null){
activityCouponBean.setDailyAvailableTimes(couponStateVo.getAvailableTimes());
}
// 券状态 0 可用 1 不可用 2 限制可用 // 券状态 0 可用 1 不可用 2 限制可用
if (Objects.equals(activityCouponBean.getCouponCode(), couponCode)) { if (Objects.equals(activityCouponBean.getCouponCode(), couponCode)) {
activityCouponBean.setSelected(YesOrNoEnum.YES.getCode()); activityCouponBean.setSelected(YesOrNoEnum.YES.getCode());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment