From efd4e4fadb4f711a8b0573edc808d6f0045f366c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期日, 08 十月 2023 17:03:15 +0800
Subject: [PATCH] 更新接口

---
 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/WithdrawalServiceImpl.java |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/WithdrawalServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/WithdrawalServiceImpl.java
index 3cb4c39..da6acf4 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/WithdrawalServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/WithdrawalServiceImpl.java
@@ -47,7 +47,6 @@
 
 
 
-
     /**
      * 提现操作
      * @param money
@@ -55,7 +54,7 @@
      * @throws Exception
      */
     @Override
-    public ResultUtil withdrawal(Double money, Integer uid, Integer type, Integer language) throws Exception {
+    public ResultUtil withdrawal(Double money, Integer uid, Integer type, String remark, Integer language) throws Exception {
         if(money.compareTo(0D) <= 0){
             return ResultUtil.error(language == 1 ? "提现金额必须大于0" : language == 2 ? "The withdrawal amount must be greater than 0" : "Le montant du retrait doit être supérieur à 0");
         }
@@ -64,14 +63,9 @@
         if(withdrawalRule==null){
             return ResultUtil.error(language == 1 ? "暂未设置提现时间,请联系平台" : language == 2 ? "No withdrawal time has been set, please contact the platform" : "Aucune heure de retrait n’a été définie pour le moment. Veuillez contacter la plateforme");
         }
-        String week =withdrawalRule==1?"星期一":
-                withdrawalRule==2?"星期二":
-                        withdrawalRule==3?"星期三":
-                                withdrawalRule==4?"星期四":
-                                    withdrawalRule==5?"星期五":
-                                            withdrawalRule==6?"星期六":"星期日";
-        String weeks = DateUtil.getAfterDayWeek("0");
-        if(!weeks.equals(week)){
+        int weeks = DateUtil.getNowWeekDay();
+
+        if(weeks != withdrawalRule){
             return ResultUtil.error((language == 1 ? "每周" : language == 2 ? "Every" : "Chaque") +(withdrawalRule==1? (language == 1 ? "一" : language == 2 ? "Monday" : "lundi") :
                     withdrawalRule==2?(language == 1 ? "二" : language == 2 ? "Tuesday" : "mardi"):
                             withdrawalRule==3?(language == 1 ? "三" : language == 2 ? "Wednesday" : "mercredi"):
@@ -116,6 +110,7 @@
         withdrawal.setUserId(uid);
         withdrawal.setUserType(2);
         withdrawal.setType(type);
+        withdrawal.setRemark(remark);
         this.insert(withdrawal);
 
         if(type == 1){

--
Gitblit v1.7.1