admin
2019-12-11 8b3371befea773bda4e08b19189c25c32ea6818f
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
@@ -262,20 +262,34 @@
      // 订单标识
      order.setSignList(signList);
      boolean rewardOrder = false;
      int type = 1; // 1 常规跳转页面 2弹出选项(奖励券)
      if (rewardSuccess) {
         if (!VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
            rewardOrder = true; // 奖励成功 2.0.2 消失
      boolean rewardOrder = false;
      if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
         if (rewardSuccess) {
            rewardOrder = true; // 以前版本奖励成功 的显示入口
         }
      } else if (hasRewardCoupon && !freeOrder && HongBaoV2.TYPE_ZIGOU == hongBaoType
            && HongBaoV2.STATE_YILINGQU == hongBaoState) { // 有可用的奖励券 、非免单订单 、且已到账的 、返利订单
         if (!userVIPInfoService.isVIP(uid)) { // 非会员可使用奖励券
         // 已到账的返利订单、非会员可使用奖励券
         if (!freeOrder && HongBaoV2.TYPE_ZIGOU == hongBaoType && HongBaoV2.STATE_YILINGQU == hongBaoState
               && !userVIPInfoService.isVIP(uid)) {
            type = 2; 
            rewardOrder = true; 
         }
      } else if (hasRewardCoupon && !freeOrder && HongBaoV2.TYPE_ZIGOU == hongBaoType
               && HongBaoV2.STATE_YILINGQU == hongBaoState && !userVIPInfoService.isVIP(uid)) {
          // 有可用的奖励券 、非免单订单 、且已到账的 、返利订单、 非超级会员
         type = 2;
         rewardOrder = true;
      }
      // 维权订单 不可使用
      Integer orderState = order.getState();
      if(CommonOrder.STATE_WQ == orderState) {
         rewardOrder = false;
      }
      if (rewardOrder) {
         try {
            boolean newEdition = false;
@@ -283,13 +297,12 @@
            String unit = null;
            boolean canUse = false;
            // 版本区分:2.1
            // 版本区分:2.1  奖励券倒计时
            if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
               Date thirdCreateTime = order.getThirdCreateTime();
               if (thirdCreateTime != null) {
                  long downOrderTime = thirdCreateTime.getTime();
                  long limitDate = Long.parseLong("1571760000000"); // TODO
                                                         // 日期待确定2019-11-10
                  long limitDate = TimeUtil.parse(Constant.COUPON_REWARD_TIME).getTime();
                  if (downOrderTime > limitDate) {
                     newEdition = true;
                     Date endDay = DateUtil.plusDayDate(4, thirdCreateTime);