yujian
2019-12-12 8c04d27e5cebb7e654c208533e9567c4df2c8acc
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
@@ -877,15 +877,17 @@
         throw new UserSystemCouponException(1, "亲,很遗憾,该订单已不能使用返利奖励券~");
      
      CommonOrderVO orderVO = listVo.get(0);
      // 版本区分:2.1
      if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
         boolean valid = false;
      // 2.1新版
         Date thirdCreateTime = orderVO.getThirdCreateTime();
         Date accountTime = orderVO.getAccountTime();
         if (thirdCreateTime != null && accountTime != null) {
      if (thirdCreateTime == null || accountTime == null)
         throw new UserSystemCouponException(1, "该订单不能使用奖励券");
            long downOrderTime = thirdCreateTime.getTime();
            long limitDate = TimeUtil.parse(Constant.COUPON_REWARD_TIME).getTime();
            if (downOrderTime > limitDate) {
         boolean valid = false;
               Date endDay = DateUtil.plusDayDate(Constant.COUPON_REWARD_LIMIT_DAY, accountTime);
               long currentTime = java.lang.System.currentTimeMillis();
               if (endDay.getTime() > currentTime) {
@@ -902,8 +904,6 @@
                     if (!valid && dateInfo.getSecond() > 0)
                        valid = true;
                  }
               }
            }
         }