|
@@ -698,16 +698,11 @@ public class CouponLogic {
|
|
userCoupon.setActiveStartTime(coupon.getActiveStartTime());
|
|
userCoupon.setActiveStartTime(coupon.getActiveStartTime());
|
|
userCoupon.setActiveEndTime(coupon.getActiveEndTime());
|
|
userCoupon.setActiveEndTime(coupon.getActiveEndTime());
|
|
}
|
|
}
|
|
- //当日起多少天
|
|
|
|
- if (coupon.getActiveType() == CouponActiveTypeEnum.TODAY.getActiveType()) {
|
|
|
|
- userCoupon.setActiveStartTime(DateUtils.getStartTime());
|
|
|
|
- userCoupon.setActiveEndTime(DateUtils.getStartTimeByDay(coupon.getActiveDay()));
|
|
|
|
- }
|
|
|
|
- //次日起多少天
|
|
|
|
- if (coupon.getActiveType() == CouponActiveTypeEnum.NEXTDAY.getActiveType()) {
|
|
|
|
- userCoupon.setActiveStartTime(DateUtils.getStartTimeByDay(1));
|
|
|
|
- userCoupon.setActiveEndTime(DateUtils.getStartTimeByDay(coupon.getActiveDay() + 1));
|
|
|
|
- }
|
|
|
|
|
|
+
|
|
|
|
+ userCoupon.setActiveStartTime(coupon.getActiveStartTime());
|
|
|
|
+ userCoupon.setActiveEndTime(coupon.getActiveEndTime());
|
|
|
|
+
|
|
|
|
+
|
|
if (coupon.getActiveEndTime() != null) {
|
|
if (coupon.getActiveEndTime() != null) {
|
|
userCoupon.setState(now.before(coupon.getActiveEndTime()) && now.after(coupon.getActiveStartTime()));
|
|
userCoupon.setState(now.before(coupon.getActiveEndTime()) && now.after(coupon.getActiveStartTime()));
|
|
}else {
|
|
}else {
|
|
@@ -755,20 +750,9 @@ public class CouponLogic {
|
|
if (coupon.getActiveDay() == null) {
|
|
if (coupon.getActiveDay() == null) {
|
|
coupon.setActiveDay(0);
|
|
coupon.setActiveDay(0);
|
|
}
|
|
}
|
|
- if (coupon.getActiveType() == CouponActiveTypeEnum.COMMON.getActiveType()) {
|
|
|
|
- userCoupon.setActiveStartTime(coupon.getActiveStartTime());
|
|
|
|
- userCoupon.setActiveEndTime(coupon.getActiveEndTime());
|
|
|
|
- }
|
|
|
|
- //当日起多少天
|
|
|
|
- if (coupon.getActiveType() == CouponActiveTypeEnum.TODAY.getActiveType()) {
|
|
|
|
- userCoupon.setActiveStartTime(DateUtils.getStartTime());
|
|
|
|
- userCoupon.setActiveEndTime(DateUtils.getStartTimeByDay(coupon.getActiveDay()));
|
|
|
|
- }
|
|
|
|
- //次日起多少天
|
|
|
|
- if (coupon.getActiveType() == CouponActiveTypeEnum.NEXTDAY.getActiveType()) {
|
|
|
|
- userCoupon.setActiveStartTime(DateUtils.getStartTimeByDay(1));
|
|
|
|
- userCoupon.setActiveEndTime(DateUtils.getStartTimeByDay(coupon.getActiveDay() + 1));
|
|
|
|
- }
|
|
|
|
|
|
+
|
|
|
|
+ userCoupon.setActiveStartTime(coupon.getActiveStartTime());
|
|
|
|
+ userCoupon.setActiveEndTime(coupon.getActiveEndTime());
|
|
if (coupon.getActiveEndTime() != null) {
|
|
if (coupon.getActiveEndTime() != null) {
|
|
userCoupon.setState(now.before(coupon.getActiveEndTime()) && now.after(coupon.getActiveStartTime()));
|
|
userCoupon.setState(now.before(coupon.getActiveEndTime()) && now.after(coupon.getActiveStartTime()));
|
|
}else {
|
|
}else {
|