From 60bd19f889fa317a54163d7f2e297dba3f573af3 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 05 Dec 2025 16:52:31 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/controller/protol/UserController.java | 47 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 38 insertions(+), 9 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..330c6dd 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,18 @@
if (!isIntegerGreaterThan100(tradeAmoun)) {
return ServerResponse.createByErrorMsg("请输入整数！",request);
}
- if(new BigDecimal(tradeAmoun).compareTo(new BigDecimal("1000")) < 0){
- return ServerResponse.createByErrorMsg("请重新输入，最低充值金额：1000", request);
+ if(null == type){
+ return ServerResponse.createByErrorMsg("请选择支付通道！",request);
}
+ if(new BigDecimal(tradeAmoun).compareTo(new BigDecimal("5000")) < 0){
+ return ServerResponse.createByErrorMsg("请重新输入，最低充值金额：5000", request);
+ }
+ if(type == 0 && new BigDecimal(tradeAmoun).compareTo(new BigDecimal("40000")) > 0){
+ return ServerResponse.createByErrorMsg("请重新输入，最大充值金额：40000", 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 +456,15 @@
}
/**
- * 充值异步接收地址
+ * 默认充值异步接收地址
+ */
+ @PostMapping({"rechargeCallbackZero.do"})
+ public void rechargeCallbackZero(@RequestBody PaymentNotifyResponse vo, HttpServletResponse response) throws IOException {
+ payService.rechargeCallbackZero(vo,response);
+ }
+
+ /**
+ * 充值1异步接收地址
*/
@PostMapping({"rechargeCallback.do"})
public void rechargeCallback(PaymentResponse vo, HttpServletResponse response) throws IOException {
@@ -457,10 +472,24 @@
}
/**
- * 代付回调通知
+ * 充值2异步接收地址
*/
- @PostMapping({"noticePayment.do"})
- public void noticePayment(TradeResultVO vo,HttpServletResponse response) throws IOException {
- iUserWithdrawService.noticePayment(vo,response);
+ @PostMapping({"rechargeCallbackTwo.do"})
+ public void rechargeCallbackTwo(@RequestParam("status") String status,
+ @RequestParam("merchantid") String merchantid,
+ @RequestParam("out_trade_no") String outTradeNo,
+ @RequestParam("total_fee") String totalFee,
+ @RequestParam("poundage") String poundage,
+ @RequestParam("account_fee") String accountFee,
+ @RequestParam("sign") String sign, HttpServletResponse response) throws IOException {
+ TransactionStatusVo vo = new TransactionStatusVo();
+ vo.setStatus(status);
+ vo.setMerchantid(merchantid);
+ vo.setOut_trade_no(outTradeNo);
+ vo.setTotal_fee(totalFee);
+ vo.setPoundage(poundage);
+ vo.setAccount_fee(accountFee);
+ vo.setSign(sign);
+ payService.rechargeCallbackTwo(vo,response);
}
}
--
Gitblit v1.9.3