wesmiler 3 éve
szülő
commit
47f3b3169e

+ 1 - 0
app/api/command/AutoUpdateData.php

@@ -37,6 +37,7 @@ class AutoUpdateData extends Command
         $cacheKey = "caches:clearData:".date('Ymd');
         if(RedisCache::get($cacheKey)){
             echo json_encode(['code'=>500,'msg'=>'已经运行过,请不要重复运行','date'=>date('Y-m-d H:i:s')], 256)."\n";
+            echo json_encode(['code'=>500,'msg'=>'今日已经运行过,请不要重复运行','date'=>date('Y-m-d H:i:s')], 256)."\n";
             return false;
         }
 

+ 1 - 4
app/api/command/AutoUpdateUserLevel.php

@@ -3,13 +3,10 @@ declare (strict_types = 1);
 
 namespace app\api\command;
 
-use app\common\model\SubmeterModel;
 use app\common\service\UserService;
 use think\console\Command;
 use think\console\Input;
 use think\console\Output;
-use think\facade\Db;
-use utils\RedisCache;
 
 /**
  * 用户自动升级 by wes 每间隔10分钟运行一次
@@ -38,7 +35,7 @@ class AutoUpdateUserLevel extends Command
         if(is_array($result)){
             echo json_encode($result, 256)."\n";
         }else{
-            echo json_encode(['code'=>500,'msg'=> $result?$result:'处理失败'], 256)."\n";
+            echo json_encode(['code'=>500,'msg'=> $result?$result:'处理失败',date('Y-m-d H:i:s')], 256)."\n";
         }
         return true;
     }

+ 1 - 1
app/api/controller/v1/Box.php

@@ -275,7 +275,7 @@ class Box
             return api_error_return('请不要频繁操作,稍后再尝试');
         }
 
-        RedisCache::setnx($cacheKey, ['uid' => $request->uid, 'data' => $request->post()], rand(5, 10));
+        RedisCache::setnx($cacheKey, ['uid' => $request->uid, 'data' => $request->post()], rand(3, 5));
         Db::startTrans();
         try {
             $res = BoxHandleService::make()->boxGoodsReBuy($request->uid, $request->post());

+ 6 - 5
app/api/controller/v1/Fragment.php

@@ -49,6 +49,8 @@ class Fragment
 
         $time = time();
         $webUrl = getWebUrl();
+        $withdrawFee = (int)SystemConfigService::make()->getConfigByName('withdraw_service_rate',1,'withdraw');
+        $withdrawMax = (int)SystemConfigService::make()->getConfigByName('withdraw_max_money',1,'withdraw');
         $data = [
             // 地址
             'privateInfo'=> $webUrl.'/api/privateInfo',
@@ -118,13 +120,12 @@ class Fragment
                 'scale'=>env('WITHDRAW.APP_WITHDRAW_SCALE'),
                 'begin'=>env('WITHDRAW.APP_WITHDRAW_BEGIN'),
                 'withdraw_is_open'=> (int)SystemConfigService::make()->getConfigByName('withdraw_is_open',1,'withdraw'),
-                'service_rate'=> (int)SystemConfigService::make()->getConfigByName('withdraw_service_rate',1,'withdraw'),
+                'service_rate'=> $withdrawFee,
                 'desc'=>[
-                    '本次提现将收取通证'.env('WITHDRAW.APP_WITHDRAW_SCALE').'%+'.env('WITHDRAW.APP_WITHDRAW_BEGIN').'元手续费',
-                    '提现到账时间T+1',
+                    '本次提现将收取'.$withdrawFee.'%手续费',
+                    '提现到账时间16:00前提现24:00前到账,16:00后提现次日到账',
                     '提现申请金额必须是10的整数倍',
-                    '提现金额单笔不能超过30000,提现大于5千只能使用银行卡',
-                    '个人原因导致的提现失败不退还通证',
+                    "提现金额单笔不能超过{$withdrawMax},提现大于5千只能使用银行卡"
                 ]
             ],
             'jh_excharge'=> [

+ 1 - 1
app/common/service/UserService.php

@@ -2,9 +2,9 @@
 
 namespace app\common\service;
 
-use app\common\model\MoneyLogModel;
 use app\common\model\UserModel;
 use app\common\model\UserUnmoneyModel;
+use think\facade\Db;
 use utils\RedisCache;
 
 /**

BIN
public/media/1650889443062760.mp4


BIN
public/media/1650889444834972.mp4


BIN
public/media/1650889444835125.mp4


BIN
public/media/1650889447215268.mp4


BIN
public/media/1650889447718882.mp4


+ 5 - 2
public/static/admin/js/box/open_box_action.js

@@ -135,9 +135,12 @@ define(["jquery", "easy-admin"], function ($, ea) {
                             id: ids
                         },
                     }, function (res) {
-                       ea.msg.alert(res.msg, function () {
+                        layer.confirm(msg, {title: '开奖结果', btn: ['确认'], time: 20000}, function () {
                             document.reload();
-                        },20000);
+                        })
+                       // ea.msg.confirm(res.msg, function () {
+                       //      document.reload();
+                       //  },20000);
                     });
                 });
                 return false;