From a9edc2f62628007e2c5e86d416d484780238f13f Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期五, 11 四月 2025 14:19:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/PayHuiminController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PayHuiminController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PayHuiminController.java
index 5b0759b..2d64453 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PayHuiminController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PayHuiminController.java
@@ -5,6 +5,7 @@
import com.dsh.activity.entity.HuiminPayQuery;
import com.dsh.activity.model.response.SalesDetailVO;
import com.dsh.activity.service.PayHuiminService;
+import com.dsh.activity.util.ResultUtil;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -50,9 +51,9 @@
* @param id
*/
@PostMapping("/base/tPayHuimin/refund")
- public void refund(Integer id){
+ public ResultUtil<?> refund(@RequestBody Integer id){
try {
- payHuiminService.refund(id);
+ return payHuiminService.refund(id);
} catch (AlipayApiException e) {
throw new RuntimeException(e);
}
--
Gitblit v1.7.1