From 4adb656ffd2c3660e07d224dd483e7479d48b46e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 30 四月 2025 17:58:57 +0800
Subject: [PATCH] bug修改
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminCallBack.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 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..401316c 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){
@@ -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();
}
}
}
@@ -108,6 +119,7 @@
@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();
}
}
}
--
Gitblit v1.7.1