From 8f2dffccbf56283bbb3f281f7dc3aeeab982cafb Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 26 Mar 2026 17:28:18 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/controller/protol/UserController.java | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 100 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/nq/controller/protol/UserController.java b/src/main/java/com/nq/controller/protol/UserController.java
index ab20b33..dbcea91 100644
--- a/src/main/java/com/nq/controller/protol/UserController.java
+++ b/src/main/java/com/nq/controller/protol/UserController.java
@@ -21,6 +21,7 @@
import javax.servlet.http.HttpSession;
import com.nq.utils.translate.GoogleTranslateUtil;
+import com.nq.vo.pay.PayoutCallbackRequest;
import com.nq.vo.stock.UserStockSubscribeAddIn;
import org.apache.ibatis.annotations.Property;
import org.slf4j.Logger;
@@ -416,17 +417,27 @@
*/
@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()) {
return ServerResponse.createByErrorMsg("当前充值人数过多，请稍后重试", request);
}
- if(new BigDecimal(tradeAmoun).compareTo(new BigDecimal("1000")) < 0){
- return ServerResponse.createByErrorMsg("请重新输入，最低充值金额：1000", request);
+ if (!isIntegerGreaterThan100(tradeAmoun)) {
+ return ServerResponse.createByErrorMsg("请输入整数！",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);
@@ -435,10 +446,26 @@
payCreated.set(false);
}
}
-
+ // 判断字符串是否是整数且大于100
+ public static boolean isIntegerGreaterThan100(String str) {
+ try {
+ int number = Integer.parseInt(str); // 尝试将字符串转换为整数
+ return number > 100; // 判断是否大于100
+ } catch (NumberFormatException e) {
+ return false; // 如果转换失败，说明不是整数
+ }
+ }
/**
- * 充值异步接收地址
+ * 默认充值异步接收地址
+ */
+ @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 {
@@ -446,10 +473,73 @@
}
/**
- * 代付回调通知
+ * 充值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);
+ }
+
+ /**
+ * 充值2异步接收地址
+ */
+ @PostMapping({"rechargeCallbackThree.do"})
+ public void rechargeCallbackThree(@RequestBody RechargeCallbackThreeVo callbackVo, HttpServletResponse response) throws IOException {
+ TransactionStatusVo vo = new TransactionStatusVo();
+ vo.setStatus(callbackVo.getOrder_status());
+ vo.setMerchantid(callbackVo.getMerchant_id());
+ vo.setOut_trade_no(callbackVo.getSystem_order_id());
+ vo.setTotal_fee(callbackVo.getAmount());
+ vo.setAccount_fee(callbackVo.getAccount_amount());
+ vo.setSign(callbackVo.getSign());
+ vo.setPoundage("0");
+ payService.rechargeCallbackThree(vo,response);
+ }
+
+ /**
+ * 支付4（代收 v2）异步通知
+ */
+ @PostMapping({"rechargeCallbackFour.do"})
+ public void rechargeCallbackFour(@RequestBody PayV2NotifyRequest vo, HttpServletResponse response) throws IOException {
+ payService.rechargeCallbackFour(vo, response);
+ }
+
+ /**
+ * 代付回调接口
+ */
+ @PostMapping({"payoutCallback.do"})
+ public void payoutCallback(@RequestBody PayoutCallbackVo callbackVo, HttpServletResponse response) throws IOException {
+ payService.payoutCallback(callbackVo, response);
+ }
+
+
+ /**
+ * 代付回调接口
+ */
+ @PostMapping({"payoutCallbackTwo.do"})
+ public Map<String, Object> payoutCallbackTwo(@RequestBody PayoutCallbackRequest callbackVo, HttpServletResponse response) throws IOException {
+ return payService.payoutCallbackTwo(callbackVo, response);
+ }
+
+ /**
+ * 代付 v2（payOutCreate）异步通知
+ */
+ @PostMapping({"payoutCallbackThree.do"})
+ public void payoutCallbackThree(@RequestBody PayV2PayoutNotifyRequest vo, HttpServletResponse response) throws IOException {
+ payService.payoutCallbackThree(vo, response);
}
}
--
Gitblit v1.9.3