From 784fd32f31704f38e7cae6818b583c47d1dcc807 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 18 五月 2020 13:59:27 +0800
Subject: [PATCH] 订单列表返回售后信息

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
index f237f58..3241e0f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
@@ -2033,6 +2033,14 @@
 					List<TaoBaoWeiQuanOrder> listWQ = taoBaoWeiQuanOrderMapper
 							.selectListByOrderIdAndState(order.getOrderNo(), "缁存潈鎴愬姛");
 					BigDecimal weiQuanMoney = getWeiQuanMoney(listWQ, sourceType, uid);
+					
+					if (settleTime != null) {
+						orderStateContent = "鍞悗鎴愬姛";
+						WeiQuanInfo weiQuanInfo = new WeiQuanInfo();
+						weiQuanInfo.setOldHongBao("楼" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());
+						weiQuanInfo.setWqHongBao("鍞悗锛�-楼" + weiQuanMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
+						order.setWeiQuanInfo(weiQuanInfo);
+					}
 					hongBao = MoneyBigDecimalUtil.sub(hongBao, weiQuanMoney);
 				}
 			}

--
Gitblit v1.8.0