From e3270879094fd1fb003c7fb7942f79dfa383e88b Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Sat, 05 Oct 2024 18:52:59 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java |   26 +++++++++++++++++++++-----
 1 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
index 9a72659..2132ef0 100644
--- a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
@@ -1,6 +1,7 @@
 package com.nq.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.gson.Gson;
 import com.nq.dao.*;
 import com.nq.enums.EConfigKey;
@@ -20,12 +21,14 @@
 
 import java.math.BigDecimal;
 
+import java.time.LocalDate;
 import java.util.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 import com.nq.utils.timeutil.DateTimeUtil;
+import com.nq.utils.timeutil.TimeUtil;
 import org.apache.commons.collections.map.HashedMap;
 import org.apache.commons.lang3.StringUtils;
 
@@ -91,6 +94,9 @@
     @Autowired
     UserAssetsMapper userAssetsMapper;
 
+    @Resource
+    StockTimeSettingMapper stockTimeSettingMapper;
+
     @Transactional
     public ServerResponse outMoney(String amt, String with_Pwd,String accsetType,String bankId,HttpServletRequest request) throws Exception {
         if (StringUtils.isBlank(amt)) {
@@ -123,12 +129,11 @@
                 return ServerResponse.createByErrorMsg("Analog users cannot withdraw funds" + siteSetting.getWithMinAmt(),request);
             }
 
-
-            String time = iStockConfigServices.queryByKey(EConfigKey.WITHDRAW_TIME_SETTING.getCode()).getCValue();
-
-            if (!WithDrawUtils.checkIsWithTime( Integer.parseInt(time.split("-")[0]), Integer.parseInt(time.split("-")[1]))) {
-                return ServerResponse.createByErrorMsg("提现失败。提现时间为" + time.split("-")[0] + " - " + time.split("-")[1],request);
+            boolean b = getServerResponse();
+            if (!b) {
+                return ServerResponse.createByErrorMsg("提现失败,当前时间已停止提现", request);
             }
+
             BigDecimal useAmt =  iUserAssetsServices.getAvailableBalance(accsetType,user.getId());
             BigDecimal tAmt = new BigDecimal(amt);
             if(useAmt.compareTo(tAmt)<0){
@@ -162,6 +167,17 @@
 
     }
 
+    private boolean getServerResponse() {
+        StockTimeSetting stockTimeSetting = stockTimeSettingMapper.selectOne(new QueryWrapper<StockTimeSetting>().eq("accets_type","IN"));
+        if(stockTimeSetting == null){
+            return false;
+        }
+        if(!stockTimeSetting.getWeekDay().contains(String.valueOf(LocalDate.now().getDayOfWeek().getValue()))){
+            return false;
+        }
+        return TimeUtil.isTradingHour(stockTimeSetting.getAmStartTime(), stockTimeSetting.getAmEndTime(), stockTimeSetting.getPmStartTime(), stockTimeSetting.getPmEndTime());
+    }
+
     public ServerResponse<PageInfo> findUserWithList(String withStatus, HttpServletRequest request, int pageNum, int pageSize) {
 
         PageHelper.startPage(pageNum, pageSize);

--
Gitblit v1.9.3