From 07d0a24ad81abeb81fb81f2fab190fdca9770bed Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 25 七月 2019 11:03:01 +0800
Subject: [PATCH] Merge branch 'master' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 9a694f1..33e4af3 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
@@ -855,9 +855,9 @@
commonOrder.getTradeId(), new Date(), commonOrder.getSourceType()));
return commonOrder;
} else {// 淇敼
- // 宸茬粡缁撶畻鎴栬�呭凡缁忓け鏁堢殑璁㈠崟涓嶅鐞�
- if (oldCommonOrder.getState() == CommonOrder.STATE_JS
- || oldCommonOrder.getState() == CommonOrder.STATE_SX) {
+ // 宸茬粡缁撶畻锛屽凡缁忓け鏁堬紝鐘舵�佹湭鏀瑰彉鐨勮鍗曚笉澶勭悊
+ if (oldCommonOrder.getState() == CommonOrder.STATE_JS || oldCommonOrder.getState() == CommonOrder.STATE_SX
+ || (oldCommonOrder.getState().intValue() == commonOrder.getState())) {
return oldCommonOrder;
}
// 浜ゆ槗ID涓�鑷存墠淇敼
--
Gitblit v1.8.0