品牌修改

yujian

2019-12-03 06e70064fbc059c8cc9c654376ce589945e9702d

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

@@ -215,7 +215,7 @@
    */

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

         Integer hongBaoState, Integer hongBaoType, List<UserSystemCouponRecord> list, List<String> signList,

         AcceptData acceptData) {

         Long uid, AcceptData acceptData) {



      // 是否免单商品

      boolean freeOrder = false;

@@ -284,10 +284,11 @@
            rewardOrder = true; // 奖励成功 2.0.2 消失

         }

      } else if (hasRewardCoupon && !freeOrder && HongBaoV2.TYPE_ZIGOU == hongBaoType

            && HongBaoV2.STATE_YILINGQU == hongBaoState) {

         // 有可用的奖励券 、非免单订单 、且已到账的 、返利订单

         type = 2;

         rewardOrder = true;

            && HongBaoV2.STATE_YILINGQU == hongBaoState) { // 有可用的奖励券 、非免单订单 、且已到账的 、返利订单

         if (!userVIPInfoService.isVIP(uid)) { // 非会员可使用奖励券

            type = 2; 
            rewardOrder = true; 
         }

      }



      if (rewardOrder) {

@@ -772,16 +773,16 @@
            // 奖励订单、免单 使用记录

            if (sourceType == null) {

               setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType, null,

                     signList, acceptData);

                     signList, uid, acceptData);

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

               setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType,

                     listRecordTB, signList, acceptData);

                     listRecordTB, signList, uid, acceptData);

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

               setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType,

                     listRecordJD, signList, acceptData);

                     listRecordJD, signList, uid, acceptData);

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

               setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType,

                     listRecordPDD, signList, acceptData);

                     listRecordPDD, signList, uid, acceptData);

            }

         }