admin
2019-03-06 be16d59fa5dafed5d4029539ea9618a94aa32e19
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
@@ -435,12 +435,19 @@
         hongBaoMap.put("fontColor", hongbaoInfoFontColor);
         order.setHongBaoInfo(hongBaoMap);
         
         // 非自购的订单 不显示返利、免单详情
         if (HongBaoV2.TYPE_ZIGOU != hongBaoType) {
            // 订单标识
            order.setSignList(signList);;
            return;
         }
         
         // 是否免单商品
         boolean freeOrder = false;
         // 是否奖励成功
         boolean rewardSuccess = false;
         // 奖励订单、免单
         // 奖励订单、免单 使用记录
         if (couponRecordList != null && couponRecordList.size() > 0) {
            
            for (UserSystemCouponRecord couponRecord: couponRecordList) {