From bef0ef19d792a16a31a59ec7beafc7b0885529fa Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 06 十一月 2019 15:36:31 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/util/factory/shop/BanLiShopOrderGoodsVOFactory.java | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/shop/BanLiShopOrderGoodsVOFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/shop/BanLiShopOrderGoodsVOFactory.java
index c3f7ee4..2d54dc5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/shop/BanLiShopOrderGoodsVOFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/shop/BanLiShopOrderGoodsVOFactory.java
@@ -36,21 +36,36 @@
vo.setOrderId(order.getOrderNo());
vo.setOrderTime(TimeUtil.getGernalTime(order.getCreateTime().getTime(), "yyyy-MM-dd HH:mm:ss"));
// 闇�瑕佺‘瀹氳鍗曠姸鎬佽緭鍑�
- if (order.getState() == BanLiShopOrder.STATE_INVALID) {
- vo.setState("璁㈠崟澶辨晥");
- vo.setStateColor("#E5005C");
- vo.setStateDesc("鏈垚鍔熸敮浠�");
+ if (order.getState() == BanLiShopOrder.STATE_INVALID || order.getState() == BanLiShopOrder.STATE_NO_PAY) {
+ vo.setState("鏈粯娆�");
+ vo.setStateColor("#e5005c");
+ } else if (order.getState() == BanLiShopOrder.STATE_PART_PAY) {
+ vo.setState("鏈疄浠�");
+ vo.setStateColor("#e5005c");
} else if (order.getState() == BanLiShopOrder.STATE_SUCCESS) {
vo.setState("鍏呭�兼垚鍔�");
vo.setStateColor("#2FB102");
- vo.setStateDesc("");
- } else {
- vo.setState("鍏呭�兼垚鍔�");
- vo.setStateColor("#2FB102");
- vo.setStateDesc("");
+ } else if (order.getState() == BanLiShopOrder.STATE_REJECT
+ || order.getState() == BanLiShopOrder.STATE_REJECT_REFUND_FAIL
+ || order.getState() == BanLiShopOrder.STATE_REJECT_REFUND_PART_SUCCESS
+ || order.getState() == BanLiShopOrder.STATE_REJECT_REFUND_SUCCESS) {// 鎷掔粷浜�
+ vo.setState("鍏呭�煎け璐�");
+ vo.setStateColor("#e5005c");
+ } else if (order.getState() == BanLiShopOrder.STATE_PAID) {
+ vo.setState("瀹℃牳涓�");
+ vo.setStateColor("#777777");
}
+ vo.setStateDesc("瀹炰粯娆� 楼" + getPaidMoney(order));
return vo;
}
+ private static String getPaidMoney(BanLiShopOrder order) {
+ if (order.getMoneyPaymentState() == null || order.getMoneyPaymentState() == BanLiShopOrder.PAY_STATE_NOPAY
+ || order.getMoneyPaymentState() == BanLiShopOrder.PAY_STATE_REFUND) {
+ return "0";
+ } else
+ return order.getMoneyPayment().toString();
+ }
+
}
--
Gitblit v1.8.0