From 923c9cec3403ae2abcc523ea73918f243977e546 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 23 八月 2022 11:28:56 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/pay/PayCallBackController.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/pay/PayCallBackController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/pay/PayCallBackController.java
index df7aae1..051befe 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/pay/PayCallBackController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/pay/PayCallBackController.java
@@ -9,13 +9,13 @@
import com.sandu.ximon.dao.domain.AliConfigEntity;
import com.sandu.ximon.dao.domain.C3mOrder;
import lombok.AllArgsConstructor;
-import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
@@ -25,22 +25,22 @@
@AllArgsConstructor
@RequestMapping("/callback/pay")
@Slf4j
-public class PayCallBackController {
+public class PayCallBackController {//http://112.74.63.130:20017/callback/pay/wechatCallback
private final C3mOrderService userOrderService;
private final UsrAlipayConfigService alipayConfigService;
- // private final UserPayRecordService userPayRecordService;
/**
* 寰俊鏀粯鍥炶皟
- *
- * @param xmlData
+ * @param request
+ * @param httpResponse
* @return
*/
+ @AnonymousAccess
@RequestMapping("wechatCallback")
- public Object wechatNotify(@RequestBody String xmlData) {
- return userOrderService.payWechatNotify(xmlData);
+ public Object wechatNotify(HttpServletRequest request, HttpServletResponse httpResponse) {
+ return userOrderService.payOrderInstoreNotify(request,httpResponse);
}
/**
@@ -48,6 +48,7 @@
*
* @return
*/
+ @AnonymousAccess
@RequestMapping("alipayCallback")
public Object alipayCallback(HttpServletRequest request) {
log.info("杩欓噷鏄敮浠樺疂鍥炶皟");
--
Gitblit v1.9.3