免单券相关修改

admin

2019-02-27 60200c7ced052a8148b1511d8c0c2807b3ffd89f

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

@@ -488,8 +488,9 @@
         if (rewardSuccess) {

            // 奖励成功

            rewardOrder = true; 

         } else if(hasRewardCoupon && !freeOrder && HongBaoV2.STATE_YILINGQU == hongBaoState) {

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

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

               HongBaoV2.STATE_YILINGQU == hongBaoState) {

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

            type = 2;

            rewardOrder = true; 

         }