奖励券使用区分订单下单三方日期

yujian

2019-08-28 d88c167fc5973a2c15ff1539e4cdab36e4a7842c

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

@@ -329,7 +329,9 @@
      SimpleDateFormat formatday = new SimpleDateFormat("yyyy.MM.dd");



      // 是否存在奖励券

      boolean hasRewardCoupon = userSystemCouponService.hasRewardCoupon(uid);

      //boolean hasRewardCoupon = userSystemCouponService.hasRewardCoupon(uid);

      boolean hasRewardCoupon = userSystemCouponService.getIncludeNotExchange(uid);

      boolean exchangeCoupon = userSystemCouponService.getIncludeExchange(uid);



      // 2019.8.1开始返回维权信息

      Date august = null;

@@ -548,13 +550,13 @@
         } else {

            // 奖励订单、免单 使用记录

            if (sourceType == null) {

               setSystemCouponRecord(order, hasRewardCoupon, hongBaoState, hongBaoType, null, signList);

               setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType, null, signList, acceptData);

            } else if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {

               setSystemCouponRecord(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordTB, signList);

               setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType, listRecordTB, signList, acceptData);

            } else if (sourceType == Constant.SOURCE_TYPE_JD) {

               setSystemCouponRecord(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordJD, signList);

               setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType, listRecordJD, signList, acceptData);

            } else if (sourceType == Constant.SOURCE_TYPE_PDD) {

               setSystemCouponRecord(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordPDD, signList);

               setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType, listRecordPDD, signList, acceptData);

            }

         }



@@ -576,8 +578,8 @@
    * @param list

    * @param signList

    */

   public void setSystemCouponRecord(CommonOrderVO order, boolean hasRewardCoupon, Integer hongBaoState,

         Integer hongBaoType, List<UserSystemCouponRecord> list, List<String> signList) {

   public void setSystemCouponRecord(CommonOrderVO order, boolean hasRewardCoupon, boolean exchangeCoupon, Integer hongBaoState,

         Integer hongBaoType, List<UserSystemCouponRecord> list, List<String> signList, AcceptData acceptData) {



      // 是否免单商品

      boolean freeOrder = false;

@@ -597,7 +599,8 @@
                  signList.add(PIC_REWARD); // 加入奖励成功图片



               } else if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)

                     || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {

                     || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)

                     || CouponTypeEnum.freeCouponBuy.name().equals(systemCouponType)) {



                  if (UserSystemCouponRecord.STATE_FREE_ON == state) {

                     // 免单中

@@ -623,6 +626,21 @@
      // 订单标识

      order.setSignList(signList);



      // 1.6.5 是否存在新兑换的券

      if (!hasRewardCoupon && exchangeCoupon) {

         try {

            String downTime = order.getDownTime();

            if (!StringUtil.isNullOrEmpty(downTime)) {

               long downOrderTime = TimeUtil.convertDateToTemp2(downTime);

               long limitDate = TimeUtil.convertDateToTemp("2019-09-01");

               if (downOrderTime > limitDate )

                  hasRewardCoupon = true;

            }

         } catch (Exception e) {

            e.printStackTrace();

         }

      }

		
      boolean rewardOrder = false;



      int type = 1; // 1 常规跳转页面 2弹出选项（奖励券）

@@ -634,7 +652,7 @@
         // 有可用的奖励券 、非免单订单 、且已到账的 、返利订单

         type = 2;

         rewardOrder = true;

      }

      } 


      if (rewardOrder) {

         ClientTextStyleVO rewardStyleVO = new ClientTextStyleVO();

@@ -645,6 +663,9 @@


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

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

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

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

         }



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

         jump.put("type", type);

@@ -667,6 +688,9 @@


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

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

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

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

         }



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

         jump.put("type", 1); // 页面跳转

@@ -838,9 +862,17 @@
               goods = JDUtil.getGoodsFromWeb(itemOrder.getSkuId());

            }



            if (goods == null) {

               goods = new JDGoods();

               goods.setSkuName(itemOrder.getSkuName());

               goods.setPrice(itemOrder.getPrice());

               goods.setSkuId(itemOrder.getSkuId());

            }



            if (goods != null) {

               cog = CommonOrderGoodsFactory.create(goods);

            }



            cog.setCreateTime(new Date());

            cog.setUpdateTime(new Date());

            commonOrderGoodsMapper.insertSelective(cog);

@@ -892,10 +924,9 @@
      if (!StringUtil.isNullOrEmpty(commonOrder.getTradeId()))

         oldCommonOrder = commonOrderMapper.selectBySourceTypeAndTradeId(commonOrder.getSourceType(),

               commonOrder.getTradeId());

      else

         oldCommonOrder = commonOrderMapper.selectByOrderNoAndOrderTypeAndOrderBy(commonOrder.getOrderNo(),

               commonOrder.getSourceType(), commonOrder.getOrderBy());



      else {

         throw new CommonOrderException(10, "交易ID为空");

      }

      if (oldCommonOrder == null)// 新增

      {

         commonOrder.setCreateTime(new Date());

@@ -1158,7 +1189,8 @@
                  String systemCouponType = couponRecord.getCouponType();

                  Integer couponState = couponRecord.getState();

                  if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)

                        || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {

                        || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)

                        || CouponTypeEnum.freeCouponBuy.name().equals(systemCouponType)) {

                     if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {

                        // 免单成功

                        order.setOtherState(2);

@@ -1175,7 +1207,8 @@
                  String systemCouponType = couponRecord.getCouponType();

                  Integer couponState = couponRecord.getState();

                  if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)

                        || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {

                        || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)

                        || CouponTypeEnum.freeCouponBuy.name().equals(systemCouponType)) {

                     if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {

                        // 免单成功

                        order.setOtherState(2);

@@ -1192,7 +1225,8 @@
                  String systemCouponType = couponRecord.getCouponType();

                  Integer couponState = couponRecord.getState();

                  if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)

                        || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {

                        || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)

                        || CouponTypeEnum.freeCouponBuy.name().equals(systemCouponType)) {

                     if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {

                        // 免单成功

                        order.setOtherState(2);

@@ -1395,4 +1429,10 @@
      return commonOrderMapper.listBySourceTypeAndStateAndThirdCrateTime(sourceType, state, minTime, maxTime,

            (page - 1) * pageSize, pageSize);

   }

	
   @Override

   public List<CommonOrder> getByOrderNo(Long uid, String orderNO) {

      return commonOrderMapper.getByOrderNo(uid, orderNO);

   }



}