From 3be328ff3f0194cab50f361a9abd3db856a76821 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 13 Aug 2025 14:07:40 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/controller/protol/UserController.java |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/nq/controller/protol/UserController.java b/src/main/java/com/nq/controller/protol/UserController.java
index bfa4713..b766346 100644
--- a/src/main/java/com/nq/controller/protol/UserController.java
+++ b/src/main/java/com/nq/controller/protol/UserController.java
@@ -428,8 +428,8 @@
             if(null == type){
                 return ServerResponse.createByErrorMsg("请选择支付通道!",request);
             }
-            if(new BigDecimal(tradeAmoun).compareTo(new BigDecimal("1000")) < 0){
-                return ServerResponse.createByErrorMsg("请重新输入,最低充值金额:1000", request);
+            if(new BigDecimal(tradeAmoun).compareTo(new BigDecimal("5000")) < 0){
+                return ServerResponse.createByErrorMsg("请重新输入,最低充值金额:5000", request);
             }
 
             payCreated.set(true);
@@ -464,7 +464,21 @@
      * 充值2异步接收地址
      */
     @PostMapping({"rechargeCallbackTwo.do"})
-    public void rechargeCallbackTwo(TransactionStatusVo vo, HttpServletResponse response) throws IOException {
+    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