wes 多宝福袋

app/api/command/AutoSubmeter.php

@@ -1,5 +1,5 @@
 <?php
-declare (strict_types = 1);
+declare (strict_types=1);
 
 namespace app\api\command;
 
@@ -20,11 +20,11 @@ class AutoSubmeter extends Command
     protected $cacheTime = 86400; // 一天
     protected $tables = [
         // time 备份分表周期，save_time 数据保存时间天，time_field 时间字段
-        'money_log'=>['time'=>2, 'save_time'=> 14,'time_field'=>'create_at'],
-        'box_record'=>['time'=>2, 'save_time'=> 10,'time_field'=>'create_time'],
-        'box_mid_handle'=>['time'=>2, 'save_time'=> 10,'time_field'=>'create_time'],
-        'score_log'=>['time'=>2, 'save_time'=> 10,'time_field'=>'create_at'],
-        'box_handle'=>['time'=>1, 'save_time'=> 0,'time_field'=>'create_time'],
+        'money_log' => ['time' => 2, 'save_time' => 14, 'time_field' => 'create_at'],
+        'box_record' => ['time' => 2, 'save_time' => 10, 'time_field' => 'create_time'],
+        'box_mid_handle' => ['time' => 2, 'save_time' => 10, 'time_field' => 'create_time'],
+        'score_log' => ['time' => 2, 'save_time' => 10, 'time_field' => 'create_at'],
+//        'box_handle'=>['time'=>1, 'save_time'=> 0,'time_field'=>'create_time'],
     ];
 
     protected function configure()
@@ -41,13 +41,14 @@ class AutoSubmeter extends Command
      */
     protected function execute(Input $input, Output $output)
     {
-        if(date('H:i') > '08:00'){
-            echo json_encode(['code'=>500,'msg'=>'不在运行时间段内，请于早上0点～8点执行','date'=>date('Y-m-d H:i:s')], 256)."\n";
+        set_time_limit(0);
+        if (date('H:i') > '12:00') {
+            echo json_encode(['code' => 500, 'msg' => '不在运行时间段内，请于早上0点～8点执行', 'date' => date('Y-m-d H:i:s')], 256) . "\n";
             return false;
         }
 
-        if(RedisCache::get("caches:submeter:lock")){
-            echo json_encode(['code'=>500,'msg'=>'请不要频繁执行，稍后再试～','date'=>date('Y-m-d H:i:s')], 256)."\n";
+        if (RedisCache::get("caches:submeter:lock")) {
+            echo json_encode(['code' => 500, 'msg' => '请不要频繁执行，稍后再试～', 'date' => date('Y-m-d H:i:s')], 256) . "\n";
             return false;
         }
 
@@ -65,122 +66,84 @@ class AutoSubmeter extends Command
 
                 // 验证是否备份
                 $dateTime = strtotime(date('Y-m-d')) - 86400;
-                if($tableName == 'box_handle'){
-                    $index = 'all';
-                    $newTableName = $tableName . '_' . $index;
-                    $date = date('Y-m-d H:i:s', $dateTime);
-
-                    if ($this->checkCatchByTime($tableName, $index, $time)) {
-                        $hasCount++;
-                        RedisCache::set($cacheKey . "{$newTableName}_error", ['data' => $item,'name'=>$newTableName, 'error' => '未到备份时间间隔'], $this->cacheTime);
-                        continue;
-                    }
-
-                    // 复制数据
-                    $prefix = env('database.prefix','db_');
-                    $count1 = Db::name($tableName)->where('is_delete', 2)->whereNotIn('id',Db::name($newTableName)->column('id'))->count();
-                    if(!$count1){
-                        $hasCount++;
-                        RedisCache::set($cacheKey . "{$newTableName}_error", ['sql'=>Db::name($tableName)->getLastSql(),'count'=>$count1,'data' => $item,'name'=>$newTableName, 'error' => '没有数据处理'], $this->cacheTime);
-                        continue;
-                    }
-
-                    $count2 = Db::name($newTableName)->count();
-                    $sql = "insert into `{$prefix}{$newTableName}` (select * from `{$prefix}{$tableName}` where `id` not in (select `id` from `{$prefix}{$newTableName}`) and `is_delete` = 2 and `create_time` < '".date('Y-m-d')."')";
-                    $res = Db::query($sql);
-                    $count3 = Db::name($newTableName)->count();
-                    if (($count3 - $count2) < $count1) {
-                        RedisCache::set($cacheKey."{$newTableName}_error", ['count'=>$count,'sql1'=>$sql,'msg'=> '复制分表数据错误','data'=> $item,'date'=>date('Y-m-d H:i:s')], $this->cacheTime);
-                        sr_throw("复制[{$newTableName}]分表数据错误");
-                    }
-
-                    // 清理原表多余数据
-                    Db::name($tableName)->where(['is_delete'=>1])->where('update_time','<',$date)->delete();
-                    $res = Db::name($tableName)->whereIn('id',Db::name($newTableName)->column('id'))->update(['is_delete'=>1,'update_time'=>date('Y-m-d H:i:s')]);
-                    if(!$res){
-                        RedisCache::set($cacheKey."{$newTableName}_error", ['count'=>$count,'sql'=>$sql,'sql1'=>Db::name($tableName)->getLastSql(),'msg'=> '清理备份分表数据错误','data'=> $item,'date'=>date('Y-m-d H:i:s')], $this->cacheTime);
-                        sr_throw("清理[{$tableName}]表旧数据错误");
-                    }
-                }else{
-                    $index = date('Ymd', $dateTime);
-                    $newTableName = $tableName . '_' . $index;
-                    if ($this->checkCatchByTime($tableName, $index, $time)) {
-                        $hasCount++;
-                        RedisCache::set($cacheKey . "{$newTableName}_error", ['data' => $item,'name'=>$newTableName, 'error' => '未到备份时间间隔'], $this->cacheTime);
-                        continue;
-                    }
-
-                    if ($this->checkCatch($tableName, $index)) {
-                        $hasCount++;
-                        RedisCache::set($cacheKey . "{$newTableName}_error", ['data' => $item,'name'=>$newTableName, 'error' => '已经处理过'], $this->cacheTime);
-                        continue;
-                    }
-
-                    // 备份处理（1：复制表，2-清除日期间隔数据）
-                    $prefix = env('database.prefix','db_');
-                    $date = date('Y-m-d H:i:s', $dateTime);
-
-                    // 复制表结构
-                    $sql = "create table IF not exists `{$prefix}{$newTableName}` like `{$prefix}{$tableName}`";
-                    Db::query($sql);
-
-                    // 复制数据
-                    $count1 = Db::name($tableName)->count();
-                    $sql1 = "insert ignore `{$prefix}{$newTableName}` select * from `{$prefix}{$tableName}`";
-                    Db::query($sql1);
-                    if ($count1 != Db::name($newTableName)->count()) {
-                        RedisCache::set($cacheKey."{$newTableName}_error", ['sql'=>$sql,'sql1'=>$sql1,'msg'=> '复制分表数据错误','data'=> $item,'date'=>date('Y-m-d H:i:s')], $this->cacheTime);
-                        sr_throw("复制备份[{$newTableName}]分表数据错误");
-                    }
-
-                    // 清理原表多余数据
-                    $expiredRow = Db::name($tableName)
-                        ->where($timeField,'<', $date)
-                        ->where(function ($query) use($tableName){
-                            if($tableName == 'money_log'){
-                                $query->whereNotIn('type', [8]);
-                            }
-                        })
-                        ->count();
-
-                    $isDelete = Db::name($tableName)
-                        ->where($timeField,'<', $date)
-                        ->where(function ($query) use($tableName){
-                            if($tableName == 'money_log'){
-                                $query->whereNotIn('type', [8]);
-                            }
-                        })
-                        ->delete();
-                    if($expiredRow && !$isDelete){
-                        RedisCache::set($cacheKey."{$newTableName}_error", ['sql'=>$sql,'msg'=> '清理备份分表数据错误','data'=> $item,'date'=>date('Y-m-d H:i:s')], $this->cacheTime);
-                        sr_throw("清理[{$tableName}]表旧数据错误");
-                    }
+
+                $index = date('Ymd', $dateTime);
+                $newTableName = $tableName . '_' . $index;
+                if ($this->checkCatchByTime($tableName, $index, $time)) {
+                    $hasCount++;
+                    RedisCache::set($cacheKey . "{$newTableName}_error", ['data' => $item, 'name' => $newTableName, 'error' => '未到备份时间间隔'], $this->cacheTime);
+                    continue;
+                }
+
+                if ($this->checkCatch($tableName, $index)) {
+                    $hasCount++;
+                    RedisCache::set($cacheKey . "{$newTableName}_error", ['data' => $item, 'name' => $newTableName, 'error' => '已经处理过'], $this->cacheTime);
+                    continue;
                 }
 
+                // 备份处理（1：复制表，2-清除日期间隔数据）
+                $prefix = env('database.prefix', 'db_');
+                $date = date('Y-m-d H:i:s', $dateTime);
+
+                // 复制表结构
+                $sql = "create table IF not exists `{$prefix}{$newTableName}` like `{$prefix}{$tableName}`";
+                Db::query($sql);
+
+                // 复制数据
+                $count1 = Db::name($tableName)->count();
+                $sql1 = "insert ignore `{$prefix}{$newTableName}` select * from `{$prefix}{$tableName}`";
+                Db::query($sql1);
+                if ($count1 != Db::name($newTableName)->count()) {
+                    RedisCache::set($cacheKey . "{$newTableName}_error", ['sql' => $sql, 'sql1' => $sql1, 'count1' => $count1, 'msg' => '复制分表数据错误', 'data' => $item, 'date' => date('Y-m-d H:i:s')], $this->cacheTime);
+                    sr_throw("复制备份[{$newTableName}]分表数据错误");
+                }
+
+                // 清理原表多余数据
+                $expiredRow = Db::name($tableName)
+                    ->where($timeField, '<', $date)
+                    ->where(function ($query) use ($tableName) {
+                        if ($tableName == 'money_log') {
+                            $query->whereNotIn('type', [8]);
+                        }
+                    })
+                    ->count();
+
+                $isDelete = Db::name($tableName)
+                    ->where($timeField, '<', $date)
+                    ->where(function ($query) use ($tableName) {
+                        if ($tableName == 'money_log') {
+                            $query->whereNotIn('type', [8]);
+                        }
+                    })
+                    ->delete();
+                if ($expiredRow && !$isDelete) {
+                    RedisCache::set($cacheKey . "{$newTableName}_error", ['sql' => $sql, 'msg' => '清理备份分表数据错误', 'count' => $expiredRow, 'data' => $item, 'date' => date('Y-m-d H:i:s')], $this->cacheTime);
+                    sr_throw("清理[{$tableName}]表旧数据错误");
+                }
 
                 $data = [
-                    'table_name'=> $tableName,
-                    'table_index'=> $index,
-                    'update_time'=> date('Y-m-d H:i:s'),
-                    'expired_at'=> $saveTime?date('Y-m-d H:i:s', time() + $saveTime * 24 * 3600):'',
-                    'status'=>1
+                    'table_name' => $tableName,
+                    'table_index' => $index,
+                    'update_time' => date('Y-m-d H:i:s'),
+                    'expired_at' => $saveTime ? date('Y-m-d H:i:s', time() + $saveTime * 24 * 3600) : '',
+                    'status' => 1
                 ];
-                if(!SubmeterModel::insertGetId($data)){
-                    RedisCache::set($cacheKey."{$newTableName}_error", ['sql'=>$sql,'msg'=> '处理分表记录错误','log'=>$data,'data'=> $item,'date'=>date('Y-m-d H:i:s')], $this->cacheTime);
+                if (!SubmeterModel::insertGetId($data)) {
+                    RedisCache::set($cacheKey . "{$newTableName}_error", ['sql' => $sql, 'msg' => '处理分表记录错误', 'log' => $data, 'data' => $item, 'date' => date('Y-m-d H:i:s')], $this->cacheTime);
                     sr_throw("处理[{$newTableName}]分表记录错误");
                 }
 
-                RedisCache::set($cacheKey."{$newTableName}_success", ['sql'=>$sql,'msg'=> '处理分表备份成功','log'=>$data,'data'=> $item,'date'=>date('Y-m-d H:i:s')], $this->cacheTime);
+                RedisCache::set($cacheKey . "{$newTableName}_success", ['sql' => $sql, 'msg' => '处理分表备份成功', 'log' => $data, 'data' => $item, 'date' => date('Y-m-d H:i:s')], $this->cacheTime);
                 $count++;
             }
 
             Db::commit();
-            echo json_encode(['code'=>200,'msg'=>"运行成功:共处理{$count}个表备份，{$hasCount}个已备份过",'date'=>date('Y-m-d H:i:s')],256)."\n";
-        }catch (\Exception $exception){
+            echo json_encode(['code' => 200, 'msg' => "运行成功:共处理{$count}个表备份，{$hasCount}个已备份过", 'date' => date('Y-m-d H:i:s')], 256) . "\n";
+        } catch (\Exception $exception) {
             Db::rollback();
             RedisCache::clear("caches:submeter:lock");
-            RedisCache::set("caches:submeter:error", ['msg'=> '运行错误：'.$exception->getMessage(),'trace'=>$exception->getTrace(),'date'=>date('Y-m-d H:i:s')], $this->cacheTime);
-            echo json_encode(['code'=>500,'msg'=>'运行错误：'.$exception->getMessage(),'date'=>date('Y-m-d H:i:s')], 256)."\n";
+            RedisCache::set("caches:submeter:error", ['msg' => '运行错误：' . $exception->getMessage(), 'trace' => $exception->getTrace(), 'date' => date('Y-m-d H:i:s')], $this->cacheTime);
+            echo json_encode(['code' => 500, 'msg' => '运行错误：' . $exception->getMessage(), 'date' => date('Y-m-d H:i:s')], 256) . "\n";
         }
 
         return true;
@@ -194,12 +157,12 @@ class AutoSubmeter extends Command
     protected function checkCatch($tableName, $index)
     {
         $cacheKey = "caches:submeter:check:{$tableName}_{$index}";
-        if(RedisCache::get($cacheKey)){
+        if (RedisCache::get($cacheKey)) {
             return true;
         }
 
-        $data = SubmeterModel::where(['table_name'=> $tableName,'table_index'=>$index,'status'=>1])->value('id');
-        if($data){
+        $data = SubmeterModel::where(['table_name' => $tableName, 'table_index' => $index, 'status' => 1])->value('id');
+        if ($data) {
             RedisCache::set($cacheKey, $data, rand(10, 20));
         }
 
@@ -214,16 +177,16 @@ class AutoSubmeter extends Command
     protected function checkCatchByTime($tableName, $index, $day)
     {
         $cacheKey = "caches:submeter:check:time_{$tableName}_{$index}_{$day}";
-        if(RedisCache::get($cacheKey)){
-//            return true;
+        if (RedisCache::get($cacheKey)) {
+            return true;
         }
 
-        $date = $day == 1? date('Y-m-d') : date('Y-m-d H:i:s', time() - $day * 24 * 3600);
-        $data = SubmeterModel::where(['table_name'=> $tableName,'status'=>1])
-            ->where('update_time','>=', $date)
+        $date = $day == 1 ? date('Y-m-d') : date('Y-m-d H:i:s', time() - $day * 24 * 3600);
+        $data = SubmeterModel::where(['table_name' => $tableName, 'status' => 1])
+            ->where('update_time', '>=', $date)
             ->value('id');
-var_dump(SubmeterModel::getLastSql());
-        if($data){
+        //var_dump(SubmeterModel::getLastSql());
+        if ($data) {
             RedisCache::set($cacheKey, $data, rand(10, 20));
         }
 

app/api/command/AutoSubmeterBack.php

@@ -0,0 +1,233 @@
+<?php
+declare (strict_types = 1);
+
+namespace app\api\command;
+
+use app\common\model\SubmeterModel;
+use think\console\Command;
+use think\console\Input;
+use think\console\Output;
+use think\facade\Db;
+use utils\RedisCache;
+
+/**
+ * 自动分表备份 by wes 每天凌晨 0点后运行，运行两次间隔10分钟
+ * Class AutoSubmeter
+ * @package app\api\command
+ */
+class AutoSubmeter extends Command
+{
+    protected $cacheTime = 86400; // 一天
+    protected $tables = [
+        // time 备份分表周期，save_time 数据保存时间天，time_field 时间字段
+        'money_log'=>['time'=>2, 'save_time'=> 14,'time_field'=>'create_at'],
+        'box_record'=>['time'=>2, 'save_time'=> 10,'time_field'=>'create_time'],
+        'box_mid_handle'=>['time'=>2, 'save_time'=> 10,'time_field'=>'create_time'],
+        'score_log'=>['time'=>2, 'save_time'=> 10,'time_field'=>'create_at'],
+//        'box_handle'=>['time'=>1, 'save_time'=> 0,'time_field'=>'create_time'],
+    ];
+
+    protected function configure()
+    {
+        $this->setName('auto_backup_submeter')
+            ->setDescription('the auto_backup_submeter command');
+    }
+
+    /**
+     * 处理分表
+     * @param Input $input
+     * @param Output $output
+     * @return int
+     */
+    protected function execute(Input $input, Output $output)
+    {
+        set_time_limit(0);
+        if(date('H:i') > '12:00'){
+            echo json_encode(['code'=>500,'msg'=>'不在运行时间段内，请于早上0点～8点执行','date'=>date('Y-m-d H:i:s')], 256)."\n";
+            return false;
+        }
+
+        if(RedisCache::get("caches:submeter:lock")){
+            echo json_encode(['code'=>500,'msg'=>'请不要频繁执行，稍后再试～','date'=>date('Y-m-d H:i:s')], 256)."\n";
+            return false;
+        }
+
+        RedisCache::setnx("caches:submeter:lock", date('Y-m-d H:i:s'), rand(10, 20));
+        Db::startTrans();
+        try {
+            $count = 0;
+            $hasCount = 0;
+            $cacheKey = "caches:submeter:backup:";
+            foreach ($this->tables as $tableName => $item) {
+                $time = isset($item['time']) ? $item['time'] : 0; // 备份周期
+                $saveTime = isset($item['save_time']) ? $item['save_time'] : 0; // 保存时间
+                $timeField = isset($item['time_field']) ? $item['time_field'] : 0; // 时间字段
+                $time = $time ? $time : 2;
+
+                // 验证是否备份
+                $dateTime = strtotime(date('Y-m-d')) - 86400;
+                if($tableName == 'box_handle'){
+                    $index = 'all';
+                    $newTableName = $tableName . '_' . $index;
+                    $date = date('Y-m-d H:i:s', $dateTime);
+
+                    if ($this->checkCatchByTime($tableName, $index, $time)) {
+                        $hasCount++;
+                        RedisCache::set($cacheKey . "{$newTableName}_error", ['data' => $item,'name'=>$newTableName, 'error' => '未到备份时间间隔'], $this->cacheTime);
+                        continue;
+                    }
+
+                    // 复制数据
+                    $prefix = env('database.prefix','db_');
+                    $count1 = Db::name($tableName)->where('is_delete', 2)->whereNotIn('id',Db::name($newTableName)->column('id'))->count();
+                    if(!$count1){
+                        $hasCount++;
+                        RedisCache::set($cacheKey . "{$newTableName}_error", ['count1'=>$count1,'sql'=>Db::name($tableName)->getLastSql(),'count'=>$count1,'data' => $item,'name'=>$newTableName, 'error' => '没有数据处理'], $this->cacheTime);
+                        continue;
+                    }
+
+                    $count2 = Db::name($newTableName)->count();
+                    $sql = "insert into `{$prefix}{$newTableName}` (select * from `{$prefix}{$tableName}` where `id` not in (select `id` from `{$prefix}{$newTableName}`) and `is_delete` = 2 and `create_time` < '".date('Y-m-d')."')";
+                    $res = Db::query($sql);
+                    $count3 = Db::name($newTableName)->count();
+                    if (($count3 - $count2) < $count1) {
+                        RedisCache::set($cacheKey."{$newTableName}_error", ['count2'=>$count2,'count3'=>$count3,'sql1'=>$sql,'msg'=> '复制分表数据错误','data'=> $item,'date'=>date('Y-m-d H:i:s')], $this->cacheTime);
+                        sr_throw("复制[{$newTableName}]分表数据错误");
+                    }
+
+                    // 清理原表多余数据
+                    Db::name($tableName)->where(['is_delete'=>1])->where('update_time','<',$date)->delete();
+                    $res = Db::name($tableName)->whereIn('id',Db::name($newTableName)->column('id'))->update(['is_delete'=>1,'update_time'=>date('Y-m-d H:i:s')]);
+                    if(!$res){
+                        RedisCache::set($cacheKey."{$newTableName}_error", ['count'=>$count,'sql'=>$sql,'sql1'=>Db::name($tableName)->getLastSql(),'msg'=> '清理备份分表数据错误','data'=> $item,'date'=>date('Y-m-d H:i:s')], $this->cacheTime);
+                        sr_throw("清理[{$tableName}]表旧数据错误");
+                    }
+                }else{
+                    $index = date('Ymd', $dateTime);
+                    $newTableName = $tableName . '_' . $index;
+                    if ($this->checkCatchByTime($tableName, $index, $time)) {
+                        $hasCount++;
+                        RedisCache::set($cacheKey . "{$newTableName}_error", ['data' => $item,'name'=>$newTableName, 'error' => '未到备份时间间隔'], $this->cacheTime);
+                        continue;
+                    }
+
+                    if ($this->checkCatch($tableName, $index)) {
+                        $hasCount++;
+                        RedisCache::set($cacheKey . "{$newTableName}_error", ['data' => $item,'name'=>$newTableName, 'error' => '已经处理过'], $this->cacheTime);
+                        continue;
+                    }
+
+                    // 备份处理（1：复制表，2-清除日期间隔数据）
+                    $prefix = env('database.prefix','db_');
+                    $date = date('Y-m-d H:i:s', $dateTime);
+
+                    // 复制表结构
+                    $sql = "create table IF not exists `{$prefix}{$newTableName}` like `{$prefix}{$tableName}`";
+                    Db::query($sql);
+
+                    // 复制数据
+                    $count1 = Db::name($tableName)->count();
+                    $sql1 = "insert ignore `{$prefix}{$newTableName}` select * from `{$prefix}{$tableName}`";
+                    Db::query($sql1);
+                    if ($count1 != Db::name($newTableName)->count()) {
+                        RedisCache::set($cacheKey."{$newTableName}_error", ['sql'=>$sql,'sql1'=>$sql1,'count1'=>$count1,'msg'=> '复制分表数据错误','data'=> $item,'date'=>date('Y-m-d H:i:s')], $this->cacheTime);
+                        sr_throw("复制备份[{$newTableName}]分表数据错误");
+                    }
+
+                    // 清理原表多余数据
+                    $expiredRow = Db::name($tableName)
+                        ->where($timeField,'<', $date)
+                        ->where(function ($query) use($tableName){
+                            if($tableName == 'money_log'){
+                                $query->whereNotIn('type', [8]);
+                            }
+                        })
+                        ->count();
+
+                    $isDelete = Db::name($tableName)
+                        ->where($timeField,'<', $date)
+                        ->where(function ($query) use($tableName){
+                            if($tableName == 'money_log'){
+                                $query->whereNotIn('type', [8]);
+                            }
+                        })
+                        ->delete();
+                    if($expiredRow && !$isDelete){
+                        RedisCache::set($cacheKey."{$newTableName}_error", ['sql'=>$sql,'msg'=> '清理备份分表数据错误','count'=>$expiredRow,'data'=> $item,'date'=>date('Y-m-d H:i:s')], $this->cacheTime);
+                        sr_throw("清理[{$tableName}]表旧数据错误");
+                    }
+                }
+
+
+                $data = [
+                    'table_name'=> $tableName,
+                    'table_index'=> $index,
+                    'update_time'=> date('Y-m-d H:i:s'),
+                    'expired_at'=> $saveTime?date('Y-m-d H:i:s', time() + $saveTime * 24 * 3600):'',
+                    'status'=>1
+                ];
+                if(!SubmeterModel::insertGetId($data)){
+                    RedisCache::set($cacheKey."{$newTableName}_error", ['sql'=>$sql,'msg'=> '处理分表记录错误','log'=>$data,'data'=> $item,'date'=>date('Y-m-d H:i:s')], $this->cacheTime);
+                    sr_throw("处理[{$newTableName}]分表记录错误");
+                }
+
+                RedisCache::set($cacheKey."{$newTableName}_success", ['sql'=>$sql,'msg'=> '处理分表备份成功','log'=>$data,'data'=> $item,'date'=>date('Y-m-d H:i:s')], $this->cacheTime);
+                $count++;
+            }
+
+            Db::commit();
+            echo json_encode(['code'=>200,'msg'=>"运行成功:共处理{$count}个表备份，{$hasCount}个已备份过",'date'=>date('Y-m-d H:i:s')],256)."\n";
+        }catch (\Exception $exception){
+            Db::rollback();
+            RedisCache::clear("caches:submeter:lock");
+            RedisCache::set("caches:submeter:error", ['msg'=> '运行错误：'.$exception->getMessage(),'trace'=>$exception->getTrace(),'date'=>date('Y-m-d H:i:s')], $this->cacheTime);
+            echo json_encode(['code'=>500,'msg'=>'运行错误：'.$exception->getMessage(),'date'=>date('Y-m-d H:i:s')], 256)."\n";
+        }
+
+        return true;
+    }
+
+    /**
+     * 验证是否备份分表过
+     * @param $tableName 表名
+     * @return bool|mixed
+     */
+    protected function checkCatch($tableName, $index)
+    {
+        $cacheKey = "caches:submeter:check:{$tableName}_{$index}";
+        if(RedisCache::get($cacheKey)){
+            return true;
+        }
+
+        $data = SubmeterModel::where(['table_name'=> $tableName,'table_index'=>$index,'status'=>1])->value('id');
+        if($data){
+            RedisCache::set($cacheKey, $data, rand(10, 20));
+        }
+
+        return $data;
+    }
+
+    /**
+     * 验证是否备份分表过
+     * @param $tableName 表名
+     * @return bool|mixed
+     */
+    protected function checkCatchByTime($tableName, $index, $day)
+    {
+        $cacheKey = "caches:submeter:check:time_{$tableName}_{$index}_{$day}";
+        if(RedisCache::get($cacheKey)){
+            return true;
+        }
+
+        $date = $day == 1? date('Y-m-d') : date('Y-m-d H:i:s', time() - $day * 24 * 3600);
+        $data = SubmeterModel::where(['table_name'=> $tableName,'status'=>1])
+            ->where('update_time','>=', $date)
+            ->value('id');
+        //var_dump(SubmeterModel::getLastSql());
+        if($data){
+            RedisCache::set($cacheKey, $data, rand(10, 20));
+        }
+
+        return $data;
+    }
+}

app/api/command/SettleBoxReturn.php

@@ -43,6 +43,11 @@ class SettleBoxReturn extends Command
             return false;
         }
 
+        if(date('H:i') <= '08:00' || (date('H:i')>'14:00' && date('H:i')<'15:00')||(date('H:i')>'19:00' && date('H:i') < '20:00')){
+            echo json_encode(['code'=>'error','msg'=>'不在结算时间段9:00~14:00/15:00~19:00/20:00~24:00内～','date'=>date('Y-m-d H:i:s')])."\n";
+            return false;
+        }
+
         RedisCache::setnx($cacheKey.'_lock', date('Y-m-d H:i:s'), rand(5, 10));
         Db::startTrans();
         try {
@@ -80,7 +85,7 @@ class SettleBoxReturn extends Command
             ->select();
         $boxList = $boxList? $boxList->toArray() : [];
         if(empty($boxList)){
-            return ['code'=>500,'msg'=>'暂无数据处理','date'=>$date];
+            return ['code'=>500,'msg'=>'暂无数据处理','sql'=>BoxMidHandleModel::getLastSql(),'date'=>$date];
         }
 
         $scoreCount = $moneyCount = 0;

app/api/controller/v1/Box.php

@@ -161,7 +161,8 @@ class Box
     {
         $boxType = $request->post('box_type',0);
         $pageSize = $request->post('limit',10);
-        return api_succ_return(['msg' => '成功', 'data' => ShopGoodsService::make()->getBoxGoodsListByType($boxType,$pageSize)]);
+        $result = ShopGoodsService::make()->getBoxGoodsListByType($boxType,$pageSize);
+        return api_succ_return(['msg' => '成功', 'data' => isset($result['data'])? $result['data'] : []]);
     }
 
     /**
@@ -174,7 +175,8 @@ class Box
     {
         $boxType = [30,40];
         $pageSize = $request->post('limit',10);
-        return api_succ_return(['msg' => '成功', 'data' => ShopGoodsService::make()->getBoxGoodsListByType($boxType,$pageSize)]);
+        $result = ShopGoodsService::make()->getBoxGoodsListByType($boxType,$pageSize);
+        return api_succ_return(['msg' => '成功', 'data' => isset($result['data'])? $result['data'] : []]);
 
     }
 
@@ -207,10 +209,15 @@ class Box
         try{
             $dateType = $request->post('date_type', 1);
             $pageSize = $request->post('limit',10);
+            $post = $request->post();
             if($dateType==1){
-                return api_succ_return(['msg' => '获取今日数据成功', 'data' => BoxHandleService::make()->getBoxListByUser($request->uid,$request->post(),$pageSize)]);
+                $post['time'] = date('Y-m-d');
+                return api_succ_return(['msg' => '获取今日数据成功', 'data' => BoxHandleService::make()->getBoxListByUser($request->uid, $post,$pageSize)]);
             }else{
-                return api_succ_return(['msg' => '获取历史数据成功', 'data' => BoxHandleService::make()->getHistoryBoxList($request->uid,$request->post(),$pageSize)]);
+                $post['time1'] = date('Y-m-d');
+                $list = BoxHandleService::make()->getBoxListByUser($request->uid,$post,$pageSize);
+//                $list = BoxHandleService::make()->getHistoryBoxList($request->uid,$post,$pageSize);
+                return api_succ_return(['msg' => '获取历史数据成功1', 'data' => $list]);
             }
         } catch (\Exception $exception){
             return api_error_return('获取失败：'.$exception->getMessage());
@@ -271,7 +278,7 @@ class Box
     {
         $action = $request->post('action');
         $cacheKey = "caches:box:rebuy:user_{$request->uid}_{$action}";
-        if (RedisCache::get($cacheKey)) {
+        if (RedisCache::get($cacheKey) && $action != 'apply') {
             return api_error_return('请不要频繁操作,稍后再尝试');
         }
 

app/api/controller/v1/User.php

@@ -116,7 +116,6 @@ class User
 
     }
 
-
     /**
      * 退出登录
      * @param Request $request
@@ -252,7 +251,7 @@ class User
      * @param MoneyLogModel $model
      * @return \think\Response
      */
-    public function moneyLog (Request $request, MoneyLogModel $model)
+    public function moneyLog(Request $request, MoneyLogModel $model)
     {
         try {
             return api_succ_return(['msg'=>'成功', 'data'=>$model->getLog($request)]);
@@ -262,6 +261,23 @@ class User
     }
 
     /**
+     * 利润结算记录
+     * @param Request $request
+     * @return \think\Response
+     */
+    public function incomeMoneyLog(Request $request,MoneyLogModel $model){
+        try {
+            $pageSize = $request->post('limit', 10);
+            $post = $request->post();
+            $post['uid'] = $request->uid;
+//            return api_succ_return(['msg'=>'成功', 'data'=>$model->getLog($request, 8)]);
+            return api_succ_return(['msg'=>'成功', 'data'=>UserUnmoneyService::make()->getList($post, $pageSize)]);
+        } catch (\Exception $e) {
+            return api_error_return('失败'.$e->getMessage());
+        }
+    }
+
+    /**
      * 积分记录
      * @param Request $request
      * @param ScoreLogModel $model
@@ -846,21 +862,6 @@ class User
         }
     }
 
-    /**
-     * 利润结算记录
-     * @param Request $request
-     * @return \think\Response
-     */
-    public function incomeMoneyLog(Request $request){
-        try {
-            $pageSize = $request->post('limit', 10);
-            $post = $request->post();
-            $post['uid'] = $request->uid;
-            return api_succ_return(['msg'=>'成功', 'data'=>UserUnmoneyService::make()->getList($post, $pageSize)]);
-        } catch (\Exception $e) {
-            return api_error_return('失败'.$e->getMessage());
-        }
-    }
 
     /**
      * 利润结算到余额

app/common/service/BoxHandleService.php

@@ -75,6 +75,7 @@ class BoxHandleService
             unset($where['r.box_type']);
         }
 
+//        var_dump($where);
         $list = $this->model->alias('r')
                 ->where($where)
                 ->where(function($query) use($params){
@@ -83,8 +84,18 @@ class BoxHandleService
                         $query->where('r.h_sn','like',"%{$keyword}%");
                     }
                 })
-                ->where('r.open_time','<=',date('Y-m-d H:i:s'))
-                ->where('r.create_time','>=',date('Y-m-d'))
+                ->where(function($query){
+                    $query->where('r.open_time','<=',date('Y-m-d H:i:s'))->whereOr('r.open_time','null');
+                })
+                ->where(function($query) use($params){
+                    $time = isset($params['time'])? $params['time'] : '';
+                    $time1 = isset($params['time1'])? $params['time1'] : '';
+                    if($time){
+                        $query->where('r.create_time','>=', $time);
+                    }else if($time1){
+                        $query->where('r.create_time','<', $time1);
+                    }
+                })
                 ->field('r.*')
                 ->order('r.create_time desc,r.id desc')
                 ->paginate($pageSize)
@@ -139,6 +150,7 @@ class BoxHandleService
             unset($where['r.box_type']);
         }
 
+
         $list = BoxHandleAllModel::alias('r')
             ->where($where)
             ->where(function($query) use($params){
@@ -147,7 +159,9 @@ class BoxHandleService
                     $query->where('r.h_sn','like',"%{$keyword}%");
                 }
             })
-            ->where('r.open_time','<=',date('Y-m-d H:i:s'))
+            ->where(function($query){
+                $query->where('r.open_time','<=',date('Y-m-d H:i:s'))->whereOr('r.open_time','null');
+            })
             ->where('r.create_time','<',date('Y-m-d'))
             ->field('r.*')
             ->order('r.create_time desc,r.id desc')
@@ -182,9 +196,12 @@ class BoxHandleService
     public function getBoxCount($uid,$status,$dateType=1)
     {
         $counts = ['10'=>0,'20'=>0,'30'=>0,'40'=>0];
-        $model = $dateType == 1? new BoxHandleModel() : new BoxHandleAllModel();
+        $model = new BoxHandleModel();
+//        $model = $dateType == 1? new BoxHandleModel() : new BoxHandleAllModel();
         $datas = $model->where(['uid'=>$uid,'status'=>$status,'is_delete'=>2])
-            ->where('open_time','<=',date('Y-m-d H:i:s'))
+            ->where(function($query){
+                $query->where('open_time','<=',date('Y-m-d H:i:s'))->whereOr('open_time','null');
+            })
             ->where(function($query) use($dateType){
                 if($dateType == 1){
                     $query->where('create_time','>=',date('Y-m-d'));
@@ -230,7 +247,8 @@ class BoxHandleService
         if (!in_array($catchType, [1,2])){
             sr_throw('处理参数错误');
         }
-        $model = $catchType==1? new BoxHandleModel() : new BoxHandleAllModel();
+        $model = new BoxHandleModel();
+//        $model = $catchType==1? new BoxHandleModel() : new BoxHandleAllModel();
         $boxList = $model->whereIn('id', $ids)
             ->where(['uid'=>$uid,'status'=>1,'is_delete'=>2])
             ->field('id,h_sn,status,uid,rid,handle_type,goods_id,box_type,goods_price')
@@ -278,6 +296,7 @@ class BoxHandleService
                 'status'=>1,
                 'num'=>1,
                 'order_type'=>5,
+                'order_remark'=> '福袋:'.$val['h_sn'],
                 'order_source'=> '福袋单号:'.$val['h_sn'],
                 'supplier_name'=>$goodsInfo['supplier_name'],
                 'total_price'=>0,
@@ -372,7 +391,8 @@ class BoxHandleService
             sr_throw('处理参数错误');
         }
         $num = count($ids);
-        $model = $catchType==1? new BoxHandleModel() : new BoxHandleAllModel();
+        $model = new BoxHandleModel();
+//        $model = $catchType==1? new BoxHandleModel() : new BoxHandleAllModel();
         $boxList = $model->whereIn('id', $ids)
             ->where(['uid'=>$uid,'status'=>1,'is_delete'=>2])
             ->field('id,h_sn,status,uid,rid,handle_type,goods_id,box_type,goods_price')

app/common/service/BoxRecordService.php

@@ -3,6 +3,7 @@
 namespace app\common\service;
 
 use app\admin\model\dao\BoxMidHandle;
+use app\common\model\BoxHandleAllModel;
 use app\common\model\BoxHandleModel;
 use app\common\model\BoxMidHandleModel;
 use app\common\model\BoxModel;
@@ -99,10 +100,11 @@ class BoxRecordService
             ->leftJoin('user u', 'u.id = r.uid')
             ->field(Db::raw('r.*,u.mobile,u.total_null_box,sum(r.num) as num,u.total_free,u.total_appoint_count,u.total_income,u.yesterday_money,u.box10 as ubox10,u.box20 as ubox20,u.box30 as ubox30,u.box40 as ubox40,u.path'))
             ->group('group_key')
+            ->order('r.create_time desc')
             ->order('r.qi_count desc')
             ->order('r.lun_count desc')
             ->order('r.num desc')
-            ->order('r.create_time desc')
+
             ->paginate($pageSize)
             ->each(function($item, $k){
                 $path = isset($item['path'])? $item['path'] : '';
@@ -655,13 +657,20 @@ class BoxRecordService
                 return "开袋失败：写入福袋处理数据错误";
             }
 
-            // 插入中奖盒子数据
+            // 插入备份中奖盒子数据
             if ($boxOpenArr && !BoxHandleModel::insertAll($boxOpenArr)) {
                 Db::rollback();
                 RedisCache::set($cacheKey . "error", ['ids' => $ids, 'count' => count($boxMidList),'scoreNum'=>$tempScorePayNum, 'award' => count($boxOpenArr), 'date' => $date, 'msg' => "开袋失败：写入福袋中奖数据错误"], $cacheTime);
                 return "开袋失败：写入福袋中奖数据错误";
             }
 
+            // 插入中奖盒子数据
+            if ($boxOpenArr && !BoxHandleAllModel::insertAll($boxOpenArr)) {
+                Db::rollback();
+                RedisCache::set($cacheKey . "errora", ['ids' => $ids, 'count' => count($boxMidList),'scoreNum'=>$tempScorePayNum, 'award' => count($boxOpenArr), 'date' => $date, 'msg' => "开袋失败：写入备份福袋中奖数据错误"], $cacheTime);
+                return "开袋失败：写入福袋中奖数据错误";
+            }
+
             Db::commit();
 
             RedisCache::clear($cacheKey . 'lock');

public/static/admin/js/box/open_box_action.js

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