From 9486766c806fe1d9e082b2fd02ea1cc558f1b443 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 08 五月 2025 09:21:57 +0800
Subject: [PATCH] bug修改
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminCallBack.java | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 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..53b162a 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;
@@ -38,12 +39,12 @@
import java.util.stream.Collectors;
/**
- * 惠民卡回调
+ * 玩湃惠民卡回调
* @author zhibing.pu
* @date 2023/6/24 11:27
*/
@RestController
-@RequestMapping("/huimin/callBack")
+@RequestMapping("/base/huimin/callBack")
public class HuiminCallBack {
@Autowired
@@ -74,15 +75,16 @@
/**
- * 惠民卡支付宝支付回调接口
+ * 玩湃惠民卡支付宝支付回调接口
*/
@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){
@@ -90,11 +92,20 @@
out.write("success");
out.flush();
out.close();
- }else{
+ }else if (one.getStatus()==1){
one.setOrderNumber(transaction_id);
one.setStatus(2);
one.setPaymentTime(new Date());
payHuiminService.updateById(one);
+ PrintWriter out = response.getWriter();
+ out.write("success");
+ out.flush();
+ out.close();
+ }else{
+ PrintWriter out = response.getWriter();
+ out.write("success");
+ out.flush();
+ out.close();
}
}
}
@@ -103,11 +114,12 @@
}
}
/**
- * 惠民卡微信支付回调接口
+ * 玩湃惠民卡微信支付回调接口
*/
@PostMapping("/weixinPayHuiminCallback")
public void weixinPayHuiminCallback(HttpServletRequest request, HttpServletResponse response) {
try {
+ System.err.println("微信回调");
Map<String, String> map = payMoneyUtil.weixinpayCallback(request);
if (null != map) {
String out_trade_no = map.get("out_trade_no");
@@ -120,11 +132,20 @@
out.write(result);
out.flush();
out.close();
- }else{
+ }else if (one.getStatus()==1){
one.setOrderNumber(transaction_id);
one.setStatus(2);
one.setPaymentTime(new Date());
payHuiminService.updateById(one);
+ PrintWriter out = response.getWriter();
+ out.write(result);
+ out.flush();
+ out.close();
+ }else{
+ PrintWriter out = response.getWriter();
+ out.write(result);
+ out.flush();
+ out.close();
}
}
}
@@ -133,7 +154,7 @@
}
}
/**
- * 惠民卡微信退款回调
+ * 玩湃惠民卡微信退款回调
* @param request
* @param response
*/
--
Gitblit v1.7.1