From 0d0e4ad058dc96a70dea06fcb2120ca79e8a57b5 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 17 Apr 2025 14:56:36 +0800
Subject: [PATCH] 删除代付
---
src/main/java/com/nq/controller/protol/UserController.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/nq/controller/protol/UserController.java b/src/main/java/com/nq/controller/protol/UserController.java
index e34647d..bfa4713 100644
--- a/src/main/java/com/nq/controller/protol/UserController.java
+++ b/src/main/java/com/nq/controller/protol/UserController.java
@@ -416,7 +416,7 @@
*/
@RequestMapping({"thirdPartyRecharge.do"})
@ResponseBody
- public ServerResponse thirdPartyRecharge(@RequestParam("tradeAmoun") String tradeAmoun,HttpServletRequest request) {
+ public ServerResponse thirdPartyRecharge(@RequestParam("tradeAmoun") String tradeAmoun,@RequestParam("type") Integer type,HttpServletRequest request) {
payLock.lock();
try {
if (payCreated.get()) {
@@ -425,11 +425,15 @@
if (!isIntegerGreaterThan100(tradeAmoun)) {
return ServerResponse.createByErrorMsg("请输入整数！",request);
}
+ if(null == type){
+ return ServerResponse.createByErrorMsg("请选择支付通道！",request);
+ }
if(new BigDecimal(tradeAmoun).compareTo(new BigDecimal("1000")) < 0){
return ServerResponse.createByErrorMsg("请重新输入，最低充值金额：1000", request);
}
+
payCreated.set(true);
- return payService.thirdPartyRecharge(request,tradeAmoun);
+ return payService.thirdPartyRecharge(request,tradeAmoun,type);
} catch (Exception e) {
e.printStackTrace();
return ServerResponse.createByErrorMsg("获取充值链接异常，请稍后重试", request);
@@ -449,7 +453,7 @@
}
/**
- * 充值异步接收地址
+ * 充值1异步接收地址
*/
@PostMapping({"rechargeCallback.do"})
public void rechargeCallback(PaymentResponse vo, HttpServletResponse response) throws IOException {
@@ -457,10 +461,10 @@
}
/**
- * 代付回调通知
+ * 充值2异步接收地址
*/
- @PostMapping({"noticePayment.do"})
- public void noticePayment(TradeResultVO vo,HttpServletResponse response) throws IOException {
- iUserWithdrawService.noticePayment(vo,response);
+ @PostMapping({"rechargeCallbackTwo.do"})
+ public void rechargeCallbackTwo(TransactionStatusVo vo, HttpServletResponse response) throws IOException {
+ payService.rechargeCallbackTwo(vo,response);
}
}
--
Gitblit v1.9.3