From ac3e4b43eb778a321f4fea1cdb278498813da1a0 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Tue, 13 Jun 2023 13:25:35 +0800
Subject: [PATCH] update

---
 .../com/jsowell/service/OrderService.java     | 63 ++++++++++---------
 1 file changed, 33 insertions(+), 30 deletions(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
index 8e9710af2..2bb5d74d7 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
@@ -877,39 +877,42 @@ public class OrderService {
 		// 支付流水
 		List<OrderPayRecord> orderPayRecordList = orderPayRecordService.getOrderPayRecordList(orderCode);
 		if (CollectionUtils.isNotEmpty(orderPayRecordList)) {
-			OrderPayRecord orderPayRecord = orderPayRecordList.get(0);
 			List<OrderDetailInfoVO.PayRecord> payRecordList = Lists.newArrayList();
-			OrderDetailInfoVO.PayRecord payInfo = new OrderDetailInfoVO.PayRecord();
-			// 余额支付如果是由本金和赠送一起支付的，合并为一个
-			BigDecimal bigDecimal = orderPayRecordList.stream()
-					.map(OrderPayRecord::getPayAmount)
-					.reduce(BigDecimal.ZERO, BigDecimal::add);
-			payInfo.setPayAmount(bigDecimal.toString());
-			payInfo.setPayStatus(orderBasicInfo.getPayStatus());
-			payInfo.setPayTime(DateUtils.formatDateTime(orderBasicInfo.getPayTime()));
-			payInfo.setRefundAmount(orderPayRecord.getRefundAmount().toString());
-			String payMode = orderPayRecord.getPayMode();
-			if (StringUtils.equals(payMode, OrderPayRecordEnum.PRINCIPAL_BALANCE_PAYMENT.getValue())
-					|| StringUtils.equals(payMode, OrderPayRecordEnum.GIFT_BALANCE_PAYMENT.getValue())) {
-				// 使用余额支付
-				payInfo.setPayMode(OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue());
-				payInfo.setPayModeDesc(OrderPayModeEnum.PAYMENT_OF_BALANCE.getLabel());
-			} else if (StringUtils.equals(payMode, OrderPayRecordEnum.WECHATPAY_PAYMENT.getValue())){
-				// 使用微信支付
-				payInfo.setPayMode(OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue());
-				payInfo.setPayModeDesc(OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getLabel());
-				// 查微信支付回调记录
-				WxpayCallbackRecord wxpayCallbackRecord = wxpayCallbackRecordService.selectByOrderCode(orderCode);
-				if (wxpayCallbackRecord != null) {
-					payInfo.setOutTradeNo(wxpayCallbackRecord.getOutTradeNo());
-					payInfo.setTransactionId(wxpayCallbackRecord.getTransactionId());
+			for (OrderPayRecord orderPayRecord : orderPayRecordList) {
+				OrderDetailInfoVO.PayRecord payInfo = new OrderDetailInfoVO.PayRecord();
+				// 余额支付如果是由本金和赠送一起支付的，合并为一个
+				BigDecimal bigDecimal = orderPayRecordList.stream()
+						.map(OrderPayRecord::getPayAmount)
+						.reduce(BigDecimal.ZERO, BigDecimal::add);
+				payInfo.setPayAmount(bigDecimal.toString());
+				payInfo.setPayStatus(orderBasicInfo.getPayStatus());
+				payInfo.setPayTime(DateUtils.formatDateTime(orderBasicInfo.getPayTime()));
+				if (orderPayRecord.getRefundAmount() != null) {
+					payInfo.setRefundAmount(orderPayRecord.getRefundAmount().toString());
 				}
-			} else if (StringUtils.equals(payMode, OrderPayRecordEnum.WHITELIST_PAYMENT.getValue())){
-				// 使用白名单支付
-				payInfo.setPayMode(OrderPayModeEnum.PAYMENT_OF_WHITELIST.getValue());
-				payInfo.setPayModeDesc(OrderPayModeEnum.PAYMENT_OF_WHITELIST.getLabel());
+				String payMode = orderPayRecord.getPayMode();
+				if (StringUtils.equals(payMode, OrderPayRecordEnum.PRINCIPAL_BALANCE_PAYMENT.getValue())
+						|| StringUtils.equals(payMode, OrderPayRecordEnum.GIFT_BALANCE_PAYMENT.getValue())) {
+					// 使用余额支付
+					payInfo.setPayMode(OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue());
+					payInfo.setPayModeDesc(OrderPayModeEnum.PAYMENT_OF_BALANCE.getLabel());
+				} else if (StringUtils.equals(payMode, OrderPayRecordEnum.WECHATPAY_PAYMENT.getValue())){
+					// 使用微信支付
+					payInfo.setPayMode(OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue());
+					payInfo.setPayModeDesc(OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getLabel());
+					// 查微信支付回调记录
+					WxpayCallbackRecord wxpayCallbackRecord = wxpayCallbackRecordService.selectByOrderCode(orderCode);
+					if (wxpayCallbackRecord != null) {
+						payInfo.setOutTradeNo(wxpayCallbackRecord.getOutTradeNo());
+						payInfo.setTransactionId(wxpayCallbackRecord.getTransactionId());
+					}
+				} else if (StringUtils.equals(payMode, OrderPayRecordEnum.WHITELIST_PAYMENT.getValue())){
+					// 使用白名单支付
+					payInfo.setPayMode(OrderPayModeEnum.PAYMENT_OF_WHITELIST.getValue());
+					payInfo.setPayModeDesc(OrderPayModeEnum.PAYMENT_OF_WHITELIST.getLabel());
+				}
+				payRecordList.add(payInfo);
 			}
-			payRecordList.add(payInfo);
 			vo.setPayRecordList(payRecordList);
 		}