‘linchangsheng’ 1 mês atrás
pai
commit
4a761f904e

+ 11 - 2
src/main/java/com/gree/mall/miniapp/logic/coupon/CouponLogic.java

@@ -702,7 +702,12 @@ public class CouponLogic {
                     userCoupon.setActiveStartTime(DateUtils.getStartTimeByDay(1));
                     userCoupon.setActiveEndTime(DateUtils.getStartTimeByDay(coupon.getActiveDay() + 1));
                 }
-                userCoupon.setState(now.before(coupon.getActiveEndTime()) && now.after(coupon.getActiveStartTime()));
+                if (coupon.getActiveEndTime() != null) {
+                    userCoupon.setState(now.before(coupon.getActiveEndTime()) && now.after(coupon.getActiveStartTime()));
+                }else {
+                    userCoupon.setStatus(true);
+                }
+
                 userCoupon.setCompanyId(currentCompanyWechat.getUser().getCompanyId());
                 userCoupon.setCompanyName(currentCompanyWechat.getUser().getCompanyName());
                 listCouponUser.add(userCoupon);
@@ -754,7 +759,11 @@ public class CouponLogic {
                       userCoupon.setActiveStartTime(DateUtils.getStartTimeByDay(1));
                       userCoupon.setActiveEndTime(DateUtils.getStartTimeByDay(coupon.getActiveDay() + 1));
                   }
-                  userCoupon.setState(now.before(coupon.getActiveEndTime()) && now.after(coupon.getActiveStartTime()));
+                  if (coupon.getActiveEndTime() != null) {
+                      userCoupon.setState(now.before(coupon.getActiveEndTime()) && now.after(coupon.getActiveStartTime()));
+                  }else {
+                      userCoupon.setStatus(true);
+                  }
                   userCoupon.setCompanyId(currentCompanyWechat.getUser().getCompanyId());
                   userCoupon.setCompanyName(currentCompanyWechat.getUser().getCompanyName());
                   userCoupon.insert();