From 31d6bd3dd8163a5d6c182110dcf21e94b4770dac Mon Sep 17 00:00:00 2001 From: Administrator <Administrator@S0ZHK00LKCA6OYY> Date: 星期一, 26 十一月 2018 14:17:02 +0800 Subject: [PATCH] 收藏信息更新 --- 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