yujian
2019-03-01 9dedfa92c34c92d42230e151766726a8e4a7806f
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
@@ -76,12 +76,12 @@
   
   
   // 奖励订单图片
   public final static String PIC_REWARD= "http://192.168.1.200/icon/jl.png";
   public final static String PIC_REWARD= "http://img.flqapp.com/resource/order/order_state_reward.png";
   
   // 免单状态图片
   public final static String PIC_FREE_ON = "http://192.168.1.200/icon/state1.png";
   public final static String PIC_FREE_FAIL =  "http://192.168.1.200/icon/state2.png";
   public final static String PIC_FREE_SUCCEED =  "http://192.168.1.200/icon/state3.png";
   public final static String PIC_FREE_ON = "http://img.flqapp.com/resource/order/order_state_freeing.png";
   public final static String PIC_FREE_FAIL =  "http://img.flqapp.com/resource/order/order_state_free_fail.png";
   public final static String PIC_FREE_SUCCEED =  "http://img.flqapp.com/resource/order/order_state_free_suc.png";
   @Override
@@ -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; 
         }