From 9f2b31fa43f74dd6a04c2f3fa3af4d8fab6cd588 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@S0ZHK00LKCA6OYY>
Date: 星期三, 21 十一月 2018 17:11:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
index de2f463..5052e81 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
@@ -394,8 +394,13 @@
} else// 璁＄畻璁㈠崟鐨勬�婚噾棰�
{
BigDecimal money = new BigDecimal(0);
- for (TaoBaoOrder o : orderList)
- money = money.add(o.getPayment());
+ for (TaoBaoOrder o : orderList) {
+ if (o.getOrderState().equalsIgnoreCase("璁㈠崟缁撶畻"))
+ money = money.add(o.getSettlement());
+ else {
+ money = money.add(o.getPayment());
+ }
+ }
updateOrder.setMoney(money);
String thirdState = null;
for (TaoBaoOrder o : orderList)
--
Gitblit v1.8.0