From 8afc5bfc1e5df1e2f0a8872a344da3b3fd5d63b9 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 11 四月 2025 20:24:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminCallBack.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminCallBack.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminCallBack.java
index ec8d2a3..dc5c192 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminCallBack.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminCallBack.java
@@ -12,6 +12,7 @@
import com.dsh.activity.model.response.HuiminAgreementVO;
import com.dsh.activity.model.response.HuiminCardVO;
import com.dsh.activity.service.*;
+
import com.dsh.activity.util.PayMoneyUtil;
import com.dsh.activity.util.ResultUtil;
import com.dsh.activity.util.TokenUtil;
@@ -43,7 +44,7 @@
* @date 2023/6/24 11:27
*/
@RestController
-@RequestMapping("/huimin/callBack")
+@RequestMapping("/base/huimin/callBack")
public class HuiminCallBack {
@Autowired
@@ -79,10 +80,11 @@
@PostMapping("/aliPayHuiminCallback")
public void aliPayHuiminCallback(HttpServletRequest request, HttpServletResponse response) {
try {
+ System.err.println("==========回调");
Map<String, String> map = payMoneyUtil.alipayCallback(request);
if (null != map) {
String out_trade_no = map.get("out_trade_no");
- String transaction_id = map.get("transaction_id");
+ String transaction_id = map.get("trade_no");
TPayHuimin one = payHuiminService.getOne(new LambdaQueryWrapper<TPayHuimin>().eq(TPayHuimin::getCode, out_trade_no));
if (one!=null){
if (one.getStatus()==2){
--
Gitblit v1.7.1