From 9dc40f3aa7df3bdd489bd750d59fec8bac741a23 Mon Sep 17 00:00:00 2001
From: peter <14100000001@qq.com>
Date: Thu, 08 Jan 2026 17:48:09 +0800
Subject: [PATCH] 修改

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

diff --git a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
index 106b1c4..7b33ddf 100644
--- a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
@@ -131,7 +131,7 @@
 
 
             SiteSetting siteSetting = this.iSiteSettingService.getSiteSetting();
-
+            SiteProduct siteProduct = iSiteProductService.getProductSetting();
             if ((new BigDecimal(amt)).compareTo(new BigDecimal(siteSetting.getWithMinAmt().intValue())) == -1) {
 
                 return ServerResponse.createByErrorMsg("出金金额不得低于" + siteSetting.getWithMinAmt() + "元");
@@ -143,10 +143,10 @@
             Calendar c = Calendar.getInstance();
             c.setTime(today);
             int weekday = c.get(Calendar.DAY_OF_WEEK);
-            if (weekday == 1) {
+            if (weekday == 1 && siteProduct.getTranWithdrawDisplay()) {
                 return ServerResponse.createByErrorMsg("周末或节假日不能出金!");
             }
-            if (weekday == 7) {
+            if (weekday == 7 && siteProduct.getTranWithdrawDisplay()) {
                 return ServerResponse.createByErrorMsg("周末或节假日不能出金!");
             }
 
@@ -155,15 +155,15 @@
 
             int with_time_end = siteSetting.getWithTimeEnd().intValue();
 
-            SiteProduct siteProduct = iSiteProductService.getProductSetting();
-            if(!siteProduct.getTranWithdrawDisplay()){
-                return ServerResponse.createByErrorMsg("提款失败,当前不能出金!");
-            }
-            if(siteProduct.getHolidayDisplay()){
+//            if(!siteProduct.getTranWithdrawDisplay()){
+//                return ServerResponse.createByErrorMsg("提款失败,当前不能出金!");
+//            }
+
+            if(siteProduct.getHolidayDisplay() && siteProduct.getTranWithdrawDisplay()){
                 return ServerResponse.createByErrorMsg("周末或节假日不能出金!");
             }
 
-            if (!WithDrawUtils.checkIsWithTime(with_time_begin, with_time_end)) {
+            if (!WithDrawUtils.checkIsWithTime(with_time_begin, with_time_end) && siteProduct.getTranWithdrawDisplay()) {
 
                 return ServerResponse.createByErrorMsg("提款失败,提款时间" + with_time_begin + "点 - " + with_time_end + "点 之间");
 

--
Gitblit v1.9.3