From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 一月 2020 12:06:27 +0800
Subject: [PATCH] 用户注册信息
---
fanli/src/main/java/com/yeshi/fanli/util/factory/goods/CommonOrderFactory.java | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 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..c6e20fa 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,12 +46,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()) {
@@ -79,6 +89,26 @@
int state = 0;
if (order.getValidCode() < 16) {
state = CommonOrder.STATE_SX;
+ String stateDesc = null;
+ if (order.getValidCode() == 4)
+ stateDesc = "浜笢甯富璁㈠崟";
+ else if (order.getValidCode() == 5)
+ stateDesc = "璐﹀彿寮傚父";
+ else if (order.getValidCode() == 6)
+ stateDesc = "璧犲搧绫荤洰";
+ else if (order.getValidCode() == 7)
+ stateDesc = "鏍″洯璁㈠崟";
+ else if (order.getValidCode() == 8)
+ stateDesc = "浼佷笟璁㈠崟";
+ else if (order.getValidCode() == 9)
+ stateDesc = "鍥㈣喘璁㈠崟";
+ else if (order.getValidCode() == 10)
+ stateDesc = "涓撶敤鍙戠エ";
+ else if (order.getValidCode() == 11)
+ stateDesc = "涔℃潙鎺ㄥ箍鍛�";
+ else if (order.getValidCode() == 13)
+ stateDesc = "杩濊璁㈠崟";
+ commonOrder.setStateDesc(stateDesc);
} else if (order.getValidCode() == 16) {
state = CommonOrder.STATE_FK;
} else if (order.getValidCode() == 17) {
--
Gitblit v1.8.0