券时间限制

yujian

2019-12-12 8c04d27e5cebb7e654c208533e9567c4df2c8acc

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java

@@ -688,16 +688,26 @@
      // 是否可使用奖励券

      if (!rewardSuccess && !freeOrder && HongBaoV2.TYPE_ZIGOU == hongBaoType 

            && HongBaoV2.STATE_YILINGQU == hongBaoState && !vip && CommonOrder.STATE_WQ != order.getState()) {

         if (version2_1) {

            rewardCounponLimitTime(order); // 2.1 版限制

         // 下单时间

         Date thirdCreateTime = order.getThirdCreateTime();

         // 到账时间

         Date accountTime = order.getAccountTime();

         if (thirdCreateTime == null || accountTime == null)

            return;

			
         // 下单日期是否是符合上线日期

         long downOrderTime = thirdCreateTime.getTime();

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

         if (downOrderTime > limitDate)  {

            // 2.1 开始新版

            rewardCounponLimitTime(order, accountTime);

         } else if (hasRewardCoupon) {

            Map<String, Object> rewardMap = new HashMap<String, Object>();



            // 在2.1新版上线之前订单-存在则显示奖励券可使用

            ClientTextStyleVO rewardStyleVO = new ClientTextStyleVO();

            rewardStyleVO.setColor("#E5005C");

            rewardStyleVO.setBottomColor("#FFDCEA");

            rewardStyleVO.setContent("返利奖励 >");

            rewardMap.put("text", rewardStyleVO);

				
            Map<String, Object> jumpLink = new HashMap<String, Object>();

            jumpLink.put("orderNo", order.getOrderNo());

            jumpLink.put("goodsType", order.getSourceType() + "");

@@ -706,24 +716,16 @@
            jump.put("type", 2); // 弹框

            jump.put("params", jumpLink);

            jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("rewardCouponDetail"));

				
            Map<String, Object> rewardMap = new HashMap<String, Object>();

            rewardMap.put("text", rewardStyleVO);

            rewardMap.put("jump", jump);

            order.setRewardDetail(rewardMap);

         } 
         }

      }

   }



   private void rewardCounponLimitTime(CommonOrderVO order) throws Exception {

      Date thirdCreateTime = order.getThirdCreateTime();

      Date accountTime = order.getAccountTime();

      if (thirdCreateTime == null || accountTime == null)

         return;

		
      // 下单日期是否是符合上线日期

      long downOrderTime = thirdCreateTime.getTime();

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

      if (downOrderTime < limitDate) 
         return;

		
   private void rewardCounponLimitTime(CommonOrderVO order,Date accountTime) throws Exception {

      // 倒计时验证

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

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