From f15251f01d6c55fb3e3b706af79744d00481b39d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 21 八月 2019 10:14:30 +0800
Subject: [PATCH] 拼多多订单修改
---
fanli/src/main/java/com/yeshi/fanli/util/factory/goods/CommonOrderFactory.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 7b17e87..8a69b3c 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
@@ -39,12 +39,15 @@
state = CommonOrder.STATE_FK;
} else if (1 == order.getOrderStatus()) {
state = CommonOrder.STATE_FK;
- } else if (2 == order.getOrderStatus()) {
- state = CommonOrder.STATE_FK;
+ } else if (2 == order.getOrderStatus()) {//纭鏀惰揣
+ state = CommonOrder.STATE_JS;
} 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()) {
@@ -89,6 +92,7 @@
commonOrder.setThirdCreateTime(new Date(order.getOrder().getOrderTime()));
commonOrder.setUpdateTime(new Date());
commonOrder.setTradeId(order.getTradeId());
+ commonOrder.setEstimate(order.getEstimateFee());
return commonOrder;
}
--
Gitblit v1.8.0