‘linchangsheng’ há 1 mês atrás
pai
commit
1aa9255558

+ 8 - 24
src/main/java/com/gree/mall/miniapp/logic/coupon/CouponLogic.java

@@ -698,16 +698,11 @@ public class CouponLogic {
                     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) {
                     userCoupon.setState(now.before(coupon.getActiveEndTime()) && now.after(coupon.getActiveStartTime()));
                 }else {
@@ -755,20 +750,9 @@ public class CouponLogic {
                   if (coupon.getActiveDay() == null) {
                       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) {
                       userCoupon.setState(now.before(coupon.getActiveEndTime()) && now.after(coupon.getActiveStartTime()));
                   }else {