From f88cfa02e36752e4acad7adc4b045155e8e50f21 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 08 十二月 2023 09:16:29 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

---
 cloud-server-account/src/main/java/com/dsh/account/controller/PaymentCallbackController.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 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..24963ef 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 {
 
 
@@ -172,7 +174,7 @@
      */
     @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) {

--
Gitblit v1.7.1