From dcf2cbd967146934ee8081c264019504ac7a7426 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 21 八月 2019 10:40:40 +0800
Subject: [PATCH] 拼多多订单修改
---
fanli/src/main/java/com/yeshi/fanli/util/factory/goods/CommonOrderFactory.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 8a69b3c..df62970 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
@@ -15,16 +15,23 @@
CommonOrder commonOrder = new CommonOrder();
commonOrder.setCount(order.getGoodsQuantity());
commonOrder.setCreateTime(new Date());
- if (order.getOrderStatus() == 3) {
+ if (order.getOrderStatus() == 3) {// 瀹℃牳閫氳繃
commonOrder.seteIncome(
MoneyBigDecimalUtil.div(new BigDecimal(order.getPromotionAmount()), new BigDecimal(100)));
commonOrder.setSettlement(
MoneyBigDecimalUtil.div(new BigDecimal(order.getOrderAmount()), new BigDecimal(100)));// 缁撶畻閲戦
commonOrder.setSettleTime(new Date(order.getOrderVerifyTime() * 1000));
+ } else if (order.getOrderStatus() == 2) {// 纭鏀惰揣褰掍负瀹℃牳閫氳繃
+ commonOrder.seteIncome(
+ MoneyBigDecimalUtil.div(new BigDecimal(order.getPromotionAmount()), new BigDecimal(100)));
+ commonOrder.setSettlement(
+ MoneyBigDecimalUtil.div(new BigDecimal(order.getOrderAmount()), new BigDecimal(100)));// 缁撶畻閲戦
+ commonOrder.setSettleTime(new Date(order.getOrderReceiveTime() * 1000));
} else {
commonOrder.seteIncome(new BigDecimal(0));
commonOrder.setSettlement(new BigDecimal(0));
}
+
commonOrder
.setEstimate(MoneyBigDecimalUtil.div(new BigDecimal(order.getPromotionAmount()), new BigDecimal(100)));
commonOrder.setOrderNo(order.getOrderSn());
@@ -39,7 +46,7 @@
state = CommonOrder.STATE_FK;
} else if (1 == order.getOrderStatus()) {
state = CommonOrder.STATE_FK;
- } else if (2 == order.getOrderStatus()) {//纭鏀惰揣
+ } else if (2 == order.getOrderStatus()) {// 纭鏀惰揣
state = CommonOrder.STATE_JS;
} else if (3 == order.getOrderStatus()) {
state = CommonOrder.STATE_FK;
--
Gitblit v1.8.0