From 2e9f0c10501ca6a8cb9633272b2636058ba72bf3 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 27 九月 2024 13:31:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TShoppingOrderController.java |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 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 1d39329..21e8165 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
@@ -274,14 +274,14 @@
 	 */
 	@PostMapping("/cancelShoppingOrderWxRefund")
 	public void cancelShoppingOrderWxRefund(HttpServletRequest request) {
-		WxRefundNotifyResp data = wxPaymentClient.refundNotify(request).getData();
-		if (null != data) {
-			String out_refund_no = data.getOut_refund_no();
-			String refund_id = data.getRefund_id();
-			String tradeState = data.getTradeState();
-			String success_time = data.getSuccess_time();
-			shoppingOrderService.cancelShoppingOrderWxRefund(out_refund_no, refund_id, tradeState, success_time);
-		}
+//		WxRefundNotifyResp data = wxPaymentClient.refundNotify(request).getData();
+//		if (null != data) {
+//			String out_refund_no = data.getOut_refund_no();
+//			String refund_id = data.getRefund_id();
+//			String tradeState = data.getTradeState();
+//			String success_time = data.getSuccess_time();
+//			shoppingOrderService.cancelShoppingOrderWxRefund(out_refund_no, refund_id, tradeState, success_time);
+//		}
 	}
 	
 	

--
Gitblit v1.7.1