Merge remote-tracking branch 'origin/div' into div

admin

2019-12-13 fb1d948a7b64cd02083b7b6f7ae18d16ad638609

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java

@@ -885,7 +885,7 @@
         throw new UserSystemCouponException(1, "该订单不能使用奖励券");

      

      long downOrderTime = thirdCreateTime.getTime();

      long limitDate = TimeUtil.parse(Constant.COUPON_REWARD_TIME).getTime();

      long limitDate = TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME);

      if (downOrderTime > limitDate) {

         boolean valid = false;

         Date endDay = DateUtil.plusDayDate(Constant.COUPON_REWARD_LIMIT_DAY, accountTime);