From 95930f77d4bba42e33965450dafb09071070f7f3 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Sun, 10 May 2026 16:21:20 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java |   27 +++++++++++++++++++--------
 1 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java b/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
index cd8100a..7797b14 100644
--- a/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
@@ -67,17 +67,17 @@
     }
 
 
-    public ServerResponse inMoney(String amt, String payType, HttpServletRequest request) {
-        if (StringUtils.isBlank(amt) || StringUtils.isBlank(payType)) {
+    public ServerResponse inMoney(String amt, String img, HttpServletRequest request) {
+        if (StringUtils.isBlank(amt) || StringUtils.isBlank(img)) {
             return ServerResponse.createByErrorMsg("The parameter cannot be null");
         }
 
-        SiteSetting siteSetting = this.iSiteSettingService.getSiteSetting();
-        if (siteSetting == null) {
+        SitePay payChnnel = sitePayMapper.selectById(1);
+        if (payChnnel == null) {
             return ServerResponse.createByErrorMsg("set is not initialized");
         }
-        if ((new BigDecimal(siteSetting.getChargeMinAmt() + "")).compareTo(new BigDecimal(amt)) == 1) {
-            return ServerResponse.createByErrorMsg("The top-up amount shall not be less than" + siteSetting.getChargeMinAmt());
+        if ((new BigDecimal(payChnnel.getChannelMinLimit() + "")).compareTo(new BigDecimal(amt)) == 1) {
+            return ServerResponse.createByErrorMsg("The top-up amount shall not be less than" + payChnnel.getChannelMinLimit());
         }
 
 
@@ -114,10 +114,14 @@
         String ordersn = KeyUtils.getRechargeOrderSn();
         userRecharge.setOrderSn(ordersn);
 
-        userRecharge.setPayChannel(payType);
+        userRecharge.setPayChannel("1");
         userRecharge.setPayAmt(new BigDecimal(amt));
         userRecharge.setOrderStatus(Integer.valueOf(0));
         userRecharge.setAddTime(new Date());
+        userRecharge.setAssetsType(EStockType.US.getCode());
+        userRecharge.setImg(img);
+        userRecharge.setPayId(1);
+        userRecharge.setPayTime(new Date());
 
         int insertCount = this.userRechargeMapper.insert(userRecharge);
         if (insertCount > 0) {
@@ -131,7 +135,7 @@
             /*SendHTMLMail.send(user, userRecharge, email_token, siteInfo
                     .getSiteHost(), siteInfo.getSiteEmailTo());
             log.info("用户充值,发送审核邮件成功");*/
-            return ServerResponse.createBySuccessMsg("Creating a payment order succeeded!");
+            return ServerResponse.createBySuccessMsg("Creating a payment order succeeded");
         }
         return ServerResponse.createByErrorMsg("Failed to create a payment order");
     }
@@ -404,4 +408,11 @@
 
         return userRecharges;
     }
+
+    @Override
+    public int countPendingRecharge() {
+        com.baomidou.mybatisplus.core.conditions.query.QueryWrapper<UserRecharge> queryWrapper = new com.baomidou.mybatisplus.core.conditions.query.QueryWrapper<>();
+        queryWrapper.eq("order_status", 0);
+        return this.userRechargeMapper.selectCount(queryWrapper).intValue();
+    }
 }

--
Gitblit v1.9.3