From 9c09cead959dbeef292628f345e5f80c30fc3d17 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 19 八月 2019 17:42:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mater-1.6.0' into div
---
fanli/src/main/java/com/yeshi/fanli/util/factory/goods/CommonOrderFactory.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/CommonOrderFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/CommonOrderFactory.java
index 5144686..becc65e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/CommonOrderFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/CommonOrderFactory.java
@@ -44,7 +44,10 @@
} else if (3 == order.getOrderStatus()) {
state = CommonOrder.STATE_FK;
} else if (4 == order.getOrderStatus()) {
- state = CommonOrder.STATE_WQ;
+ if (order.getOrderReceiveTime() == null || order.getOrderReceiveTime() == 0)
+ state = CommonOrder.STATE_SX;
+ else
+ state = CommonOrder.STATE_WQ;
} else if (5 == order.getOrderStatus()) {
state = CommonOrder.STATE_JS;
} else if (8 == order.getOrderStatus()) {
--
Gitblit v1.8.0