Merge branch 'feature/promote_statistics' of wmtx/platform into release

推广员充值换榜定时器优化

Application/Admin/Controller/TimingController.class.php

@@ -609,19 +609,27 @@ class TimingController extends AdminController {
 
     public function shiftPromoteStatistics() {
 
-        $data = M("shift_task")->where(['status'=>0,'type'=>2])->select();
+        $data = M("shift_task")->where(['change_status'=>0,'type'=>2])->select();
 
         $promote_data = [];
 
+        $change_id = [];
+
         foreach ($data as $key => $value) {
 
             $promote_data[] = $value['from_promote_id'];
             $promote_data[] = $value['to_promote_id'];
+            $change_id[] = $value['id'];
 
         }
         $promote_data=array_unique($promote_data);
         sort($promote_data);
 
+        if(!$promote_data) {
+            echo "没有数据";
+            die();
+        }
+
         $chain_data = M("promote","tab_")
             ->field("id")
             ->where(['chain'=>'/','id'=>['in',$promote_data]])
@@ -650,6 +658,8 @@ class TimingController extends AdminController {
 
 
         $this->PromoteStatistics($data);
+
+        M("shift_task")->where(['id'=>['in',$change_id]])->save(['change_status'=>1]);
 //        dump($data);
 //        dump(array_unique($chain_data_secord));
 

Data/update.sql

@@ -2071,3 +2071,6 @@ INSERT INTO `tab_service_agreement` (`id`, `name`, `content`, `status`, `creator
 ALTER TABLE `tab_company_info`
 ADD COLUMN `ali_account`  varchar(128) NULL COMMENT '支付宝账号' AFTER `last_up_time`,
 ADD COLUMN `fax_ratio`  varchar(20) NULL COMMENT '开票税率' AFTER `ali_account`;
+
+ALTER TABLE `sys_shift_task`
+ADD COLUMN `change_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '推广员充值换榜执行状态 0 未处理 1 已处理' AFTER `status`;