blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
yujian
2019-02-28 f92377709d27a03726001e8fb1de51512c43d5e2 
 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; 



         }