维权订单不显示奖励券入口

yujian

2019-12-10 8cbb5ef78af910b4193e45fd6454d2dc862e0a8c

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

@@ -78,6 +78,7 @@
import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.TokenUtil;

import com.yeshi.fanli.util.VersionUtil;

import com.yeshi.fanli.util.annotation.RequestSerializableByKeyService;

@@ -861,13 +862,12 @@
      if (orderVO == null)

         throw new UserSystemCouponException(1, "订单信息获取失败");



      // 版本区分：2.0.2

      // 版本区分：2.1

      if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {

         Date thirdCreateTime = orderVO.getThirdCreateTime();

         if (thirdCreateTime != null) {

            long downOrderTime = thirdCreateTime.getTime();

            long limitDate = Long.parseLong("1573315200000"); // TODO

                                                   // 日期待确定2019-11-10

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

            if (downOrderTime > limitDate) {

               Date endDay = DateUtil.plusDayDate(4, thirdCreateTime);

               long currentTime = java.lang.System.currentTimeMillis();

@@ -884,12 +884,12 @@
                     if (!valid && dateInfo.getMinute() > 0)

                        valid = true;



                     if (!valid && dateInfo.getSecond() >= 0)

                     if (!valid && dateInfo.getSecond() > 0)

                        valid = true;

                  }



                  if (!valid)

                     throw new UserSystemCouponException(1, "该订单已不能使用使用奖励券，详情请咨询客服");

                     throw new UserSystemCouponException(1, "该订单已超过有效使用奖励券时间");

               }

            }

         }