From 25d0c608099fc0992f1b4cab2d617527a975ff81 Mon Sep 17 00:00:00 2001
From: lhb <495598773@qq.com>
Date: Wed, 30 Apr 2025 16:36:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=80=80?=
 =?UTF-8?q?=E6=AC=BE=E5=8F=8A=E5=85=AC=E4=BC=97=E5=8F=B7=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF+=E9=85=8D=E7=BD=AE=E5=9B=9E=E8=B0=83?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/order/TradeController.java     | 20 +++++++++++++++++++
 .../service/impl/WechatPayServiceImpl.java    |  4 ++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/controller/order/TradeController.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/controller/order/TradeController.java
index 76ea8f2..260ee90 100644
--- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/controller/order/TradeController.java
+++ b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/controller/order/TradeController.java
@@ -2,6 +2,7 @@ package com.evotech.hd.cloud.controller.order;
 
 import java.util.List;
 
+import com.evotech.hd.common.core.entity.cloud.request.PrePayRequest;
 import org.springdoc.core.annotations.ParameterObject;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -71,4 +72,23 @@ public class TradeController {
 	    return tradeService.wechatPayNotifyHandle(tradeDetail);
 	}
 
+	@Operation(summary = "退款查询")
+	@GetMapping("/tradeList")
+	@ApiOperationSupport(order = 6)
+	public List<TradeDetail> tradeList(@ParameterObject PrePayRequest preltr) {
+		PageListTradeRequest pltr2 = new PageListTradeRequest();
+		pltr2.setWuid(preltr.getWuid());
+		pltr2.setPayType(preltr.getPayType());
+		pltr2.setTradeType(preltr.getTradeType());
+		return tradeService.tradeList(pltr2);
+	}
+
+	@Operation(summary = "微信退款余额回调业务处理")
+	@PostMapping({"/wechatpay/backnotify"})
+	@ApiOperationSupport(order = 7)
+	@Hidden
+	public Result<String> wechatBackNotifyHandle(@ParameterObject TradeDetail tradeDetail) {
+		return tradeService.wechatBackNotifyHandle(tradeDetail);
+	}
+
 }
diff --git a/wechat-server/src/main/java/com/evotech/hd/wechat/service/impl/WechatPayServiceImpl.java b/wechat-server/src/main/java/com/evotech/hd/wechat/service/impl/WechatPayServiceImpl.java
index 560d341..7376860 100644
--- a/wechat-server/src/main/java/com/evotech/hd/wechat/service/impl/WechatPayServiceImpl.java
+++ b/wechat-server/src/main/java/com/evotech/hd/wechat/service/impl/WechatPayServiceImpl.java
@@ -218,8 +218,8 @@ public class WechatPayServiceImpl implements WechatPayService {
 		request.setTransactionId(transactionId);
 		request.setReason(reason);
 		request.setOutRefundNo("HD1001REFUND" + DateUtil.format(new Date(), DatePattern.PURE_DATETIME_FORMATTER) + RandomUtil.randomInt(1000, 10000));
-//		request.setNotifyUrl(xcxProperties.getRefundNotifyUrl());
-		request.setNotifyUrl("https://www.famhub.cn/gateway/wechat/wechatpay/refundsback/msg");
+		request.setNotifyUrl(xcxProperties.getRefundNotifyUrl());
+//		request.setNotifyUrl("https://www.famhub.cn/gateway/wechat/wechatpay/refundsback/msg");
 		AmountReq amount = new AmountReq();
 		amount.setRefund(Long.valueOf(money));
 		amount.setCurrency("CNY");