From 7cb8a6506062d0489dcd601a375f9dc89cbf6b4a Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 四月 2025 09:02:53 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TShoppingOrderController.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TShoppingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TShoppingOrderController.java
index 9f1b596..2081255 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TShoppingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TShoppingOrderController.java
@@ -234,9 +234,15 @@
 				refundAmount.setCurrency("CNY");
 				refundAmount.setRefund(i);
 				wxPaymentRefundModel.setAmount(refundAmount);
-				R<String> stringR = wxPaymentClient.refundOrderR(wxPaymentRefundModel);
+				R<Map<String, Object>> stringR = wxPaymentClient.refundOrderR(wxPaymentRefundModel);
 				if(200 == stringR.getCode()){
 					shoppingOrderRefundService.save(tShoppingOrderRefund);
+					//手续费
+					Map<String, Object> amount1 = (Map<String, Object>) stringR.getData().get("amount");
+					Object refund_fee1 = amount1.get("refund_fee");
+					BigDecimal refund_fee = new BigDecimal(null == refund_fee1 ? "0" : refund_fee1.toString()).divide(new BigDecimal(100));
+					tShoppingOrderRefund.setRefundFee(refund_fee);
+					shoppingOrderRefundService.updateById(tShoppingOrderRefund);
 				}
 				break;
 			case 2:

--
Gitblit v1.7.1