From 562ccac1d78a2dc3e5936ef2c6dd77d22ebbfb0e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 01 四月 2025 18:10:18 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-account/src/main/java/com/dsh/account/controller/PaymentCallbackController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/PaymentCallbackController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/PaymentCallbackController.java
index be9c41e..513f351 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/PaymentCallbackController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/PaymentCallbackController.java
@@ -15,6 +15,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.Map;
/**
@@ -23,7 +25,7 @@
@RestController
-@RequestMapping("/payment/callback")
+@RequestMapping("")
public class PaymentCallbackController {
@@ -150,7 +152,7 @@
String out_trade_no = map.get("out_trade_no");
String transaction_id = map.get("transaction_id");
String result = map.get("result");
- ResultUtil resultUtil = tappService.exchangeAddPaymentCallback(out_trade_no, transaction_id, 1);
+ ResultUtil resultUtil = tappService.exchangeAddPaymentCallback(out_trade_no, transaction_id);
if (resultUtil.getCode() == 200) {
PrintWriter out = response.getWriter();
out.write(result);
@@ -172,13 +174,13 @@
*/
@ResponseBody
@PostMapping("/base/pointMer/exchangeGoodPaymentAliCallback")
- public void addVipPaymentAliCallback(HttpServletRequest request, HttpServletResponse response) {
+ public void exchangeGoodPaymentAliCallback(HttpServletRequest request, HttpServletResponse response) {
try {
Map<String, String> map = payMoneyUtil.alipayCallback(request);
if (null != map) {
String out_trade_no = map.get("out_trade_no");
String trade_no = map.get("trade_no");
- ResultUtil resultUtil = tappService.exchangeAddPaymentCallback(out_trade_no, trade_no, 2);
+ ResultUtil resultUtil = tappService.exchangeAddPaymentCallback(out_trade_no, trade_no);
if (resultUtil.getCode() == 200) {
PrintWriter out = response.getWriter();
out.write("success");
--
Gitblit v1.7.1