From 3ed7b4b2c8cd28435e7cc2c1d3c5b091fafbf077 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 17 Mar 2025 16:29:15 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/controller/protol/UserController.java         |   13 ++++++++++++-
 src/main/java/com/nq/controller/protol/UserWithdrawController.java |   13 +++++++++++++
 src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java     |    2 +-
 src/main/java/com/nq/service/impl/PayServiceImpl.java              |    4 ++--
 4 files changed, 28 insertions(+), 4 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..e34647d 100644
--- a/src/main/java/com/nq/controller/protol/UserController.java
+++ b/src/main/java/com/nq/controller/protol/UserController.java
@@ -422,6 +422,9 @@
             if (payCreated.get()) {
                 return ServerResponse.createByErrorMsg("当前充值人数过多,请稍后重试", request);
             }
+            if (!isIntegerGreaterThan100(tradeAmoun)) {
+                return ServerResponse.createByErrorMsg("请输入整数!",request);
+            }
             if(new BigDecimal(tradeAmoun).compareTo(new BigDecimal("1000")) < 0){
                 return ServerResponse.createByErrorMsg("请重新输入,最低充值金额:1000", request);
             }
@@ -435,7 +438,15 @@
             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;  // 如果转换失败,说明不是整数
+        }
+    }
 
     /**
      * 充值异步接收地址
diff --git a/src/main/java/com/nq/controller/protol/UserWithdrawController.java b/src/main/java/com/nq/controller/protol/UserWithdrawController.java
index 116d145..c089075 100644
--- a/src/main/java/com/nq/controller/protol/UserWithdrawController.java
+++ b/src/main/java/com/nq/controller/protol/UserWithdrawController.java
@@ -43,6 +43,9 @@
         ServerResponse serverResponse = null;
         User user = this.iUserService.getCurrentRefreshUser(request);
         try {
+            if (!isIntegerGreaterThan100(amt)) {
+                return ServerResponse.createByErrorMsg("请输入整数!",request);
+            }
             serverResponse = this.iUserWithdrawService.outMoney(amt, user.getWithPwd(), accsetType,bankId,request);
         } catch (Exception e) {
             log.error("出金异常 e = {}", e);
@@ -51,6 +54,16 @@
         return serverResponse;
     }
 
+    // 判断字符串是否是整数且大于100
+    public static boolean isIntegerGreaterThan100(String str) {
+        try {
+            int number = Integer.parseInt(str);  // 尝试将字符串转换为整数
+            return number > 100;  // 判断是否大于100
+        } catch (NumberFormatException e) {
+            return false;  // 如果转换失败,说明不是整数
+        }
+    }
+
     @RequestMapping({"cancel.do"})
     @ResponseBody
     public ServerResponse userCancel(Integer withId) {
diff --git a/src/main/java/com/nq/service/impl/PayServiceImpl.java b/src/main/java/com/nq/service/impl/PayServiceImpl.java
index b08150e..65ccdd0 100644
--- a/src/main/java/com/nq/service/impl/PayServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/PayServiceImpl.java
@@ -111,12 +111,12 @@
         // 订单时间  时间格式yyyy-MM-dd HH:mm:ss
         params.put("order_date", getOrderTime());
         //支付类型 请查阅商户后台通道编码
-        params.put("pay_type", "101");
+        params.put("pay_type", "151");
         //交易金额 以元为单位
         params.put("trade_amount", tradeAmount);
 
         //商户秘钥必填
-        String merchant_key = "8979d78b437948f18c14628ff1ad5f41";
+        String merchant_key = "6ef36aa4d88a47a9a177c33c7199fff6";
 
         String signInfo = SignUtil.sortData(params);
         // 签名   signInfo签名参数排序,  merchant_key商户私钥
diff --git a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
index f880d95..10debed 100644
--- a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
@@ -467,7 +467,7 @@
         reqMap.put("sign_type", "MD5");
 
         String reqUrl = "https://api.watchglbpay.com/pay/transfer";
-        String merchant_key = "ZGZY3REWQJLAWRCRTHWQVGWYPMD878KQ";
+        String merchant_key = "TKFMXNSNKDP0RUFEKV44SW411VUNDZLG";
 
         String sign = SignAPI.sign(signStr, merchant_key);
 

--
Gitblit v1.9.3