From ca7aa881987169d3d0202fe85d9f47d225111f33 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 01 三月 2019 18:34:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
index 1300046..ba7d697 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
+++ b/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;
}
--
Gitblit v1.8.0