From 39c683421f75449c7a85280fa499bae3a2f5241b Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 26 八月 2019 09:27:49 +0800
Subject: [PATCH] 金币领取
---
fanli/src/main/java/com/yeshi/fanli/util/factory/goods/CommonOrderFactory.java | 7 ++++---
1 files changed, 4 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 5849ec9..b3fcdd2 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,7 +15,7 @@
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(
@@ -31,6 +31,7 @@
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());
@@ -44,8 +45,8 @@
} else if (0 == order.getOrderStatus()) {
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;
--
Gitblit v1.8.0