From 0ababc615d5b381f856ca84fb8dc715cdb2c4b5b Mon Sep 17 00:00:00 2001
From: peter <14100000001@qq.com>
Date: Thu, 15 Jan 2026 14:22:53 +0800
Subject: [PATCH] 2-10演示站搭建

---
 src/main/java/com/nq/controller/protol/UserController.java |   79 ++++++++++++++++++++++++++-------------
 1 files changed, 52 insertions(+), 27 deletions(-)

diff --git a/src/main/java/com/nq/controller/protol/UserController.java b/src/main/java/com/nq/controller/protol/UserController.java
index 330c6dd..20ae4eb 100644
--- a/src/main/java/com/nq/controller/protol/UserController.java
+++ b/src/main/java/com/nq/controller/protol/UserController.java
@@ -417,33 +417,34 @@
     @RequestMapping({"thirdPartyRecharge.do"})
     @ResponseBody
     public ServerResponse thirdPartyRecharge(@RequestParam("tradeAmoun") String tradeAmoun,@RequestParam("type") Integer type,HttpServletRequest request) {
-        payLock.lock();
-        try {
-            if (payCreated.get()) {
-                return ServerResponse.createByErrorMsg("当前充值人数过多,请稍后重试", 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,type);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return ServerResponse.createByErrorMsg("获取充值链接异常,请稍后重试", request);
-        }  finally{
-            payLock.unlock();
-            payCreated.set(false);
-        }
+        return ServerResponse.createByErrorMsg("请联系客服!",request);
+//        payLock.lock();
+//        try {
+//            if (payCreated.get()) {
+//                return ServerResponse.createByErrorMsg("当前充值人数过多,请稍后重试", 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,type);
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            return ServerResponse.createByErrorMsg("获取充值链接异常,请稍后重试", request);
+//        }  finally{
+//            payLock.unlock();
+//            payCreated.set(false);
+//        }
     }
     // 判断字符串是否是整数且大于100
     public static boolean isIntegerGreaterThan100(String str) {
@@ -492,4 +493,28 @@
         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);
+    }
+
+    /**
+     * 代付回调接口
+     */
+    @PostMapping({"payoutCallback.do"})
+    public void payoutCallback(@RequestBody PayoutCallbackVo callbackVo, HttpServletResponse response) throws IOException {
+        payService.payoutCallback(callbackVo, response);
+    }
 }

--
Gitblit v1.9.3