From 6efa26ecfda42cbd67d41368fd2423665c193bcd Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Mon, 2 Nov 2020 16:54:39 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=A4=96=E5=9B=A2=E7=89=B9=E6=AE=8A?= =?UTF-8?q?=E6=AF=94=E4=BE=8B=E8=87=AA=E5=8A=A8=E5=AE=A1=E6=A0=B8=E9=80=9A?= =?UTF-8?q?=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/CompanyGameRatioController.class.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Application/Admin/Controller/CompanyGameRatioController.class.php b/Application/Admin/Controller/CompanyGameRatioController.class.php index 17fc868d0..04ddd89c5 100644 --- a/Application/Admin/Controller/CompanyGameRatioController.class.php +++ b/Application/Admin/Controller/CompanyGameRatioController.class.php @@ -602,6 +602,17 @@ class CompanyGameRatioController extends AdminController $save['verify_log']=json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y-m-d H:i:s")]); //获取旧比例 $this->getOldRatio($save); + + $promote_data = M("promote_company","tab_")->where(['id'=>$save['company_id']])->find(); + + if ($promote_data['company_belong'] == '0') { + $save['verify_log'] = json_decode($save['verify_log'],true); + $save['verify_log']['market_user']="AUTO"; + $save['verify_log']['market_time']=date("Y-m-d H:i:s"); + $save['verify_log'] = json_encode($save['verify_log']); + $save['status']=1; + } + //判断已有未审核 $where = [ "relation_game_id"=>$save['relation_game_id'], From cf21a4f3240c36da1842e1d26939a49b663b9ff5 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Mon, 2 Nov 2020 16:58:17 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=A4=96=E5=9B=A2=E7=89=B9=E6=AE=8A?= =?UTF-8?q?=E6=AF=94=E4=BE=8B=E8=87=AA=E5=8A=A8=E5=AE=A1=E6=A0=B8=E9=80=9A?= =?UTF-8?q?=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/CompanyGameRatioController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/Controller/CompanyGameRatioController.class.php b/Application/Admin/Controller/CompanyGameRatioController.class.php index 04ddd89c5..3a208c56e 100644 --- a/Application/Admin/Controller/CompanyGameRatioController.class.php +++ b/Application/Admin/Controller/CompanyGameRatioController.class.php @@ -605,7 +605,7 @@ class CompanyGameRatioController extends AdminController $promote_data = M("promote_company","tab_")->where(['id'=>$save['company_id']])->find(); - if ($promote_data['company_belong'] == '0') { + if ($promote_data['company_belong'] != '1' && $promote_data['company_belong'] != '2' ) { $save['verify_log'] = json_decode($save['verify_log'],true); $save['verify_log']['market_user']="AUTO"; $save['verify_log']['market_time']=date("Y-m-d H:i:s"); From 24f3cbc99efc12950a0eeec35e629805a0824936 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Mon, 2 Nov 2020 17:26:39 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=A4=96=E5=9B=A2=E7=89=B9=E6=AE=8A?= =?UTF-8?q?=E6=AF=94=E4=BE=8B=E5=8A=9F=E8=83=BD=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/CompanyGameRatioController.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/CompanyGameRatioController.class.php b/Application/Admin/Controller/CompanyGameRatioController.class.php index 3a208c56e..a4f46e168 100644 --- a/Application/Admin/Controller/CompanyGameRatioController.class.php +++ b/Application/Admin/Controller/CompanyGameRatioController.class.php @@ -605,7 +605,7 @@ class CompanyGameRatioController extends AdminController $promote_data = M("promote_company","tab_")->where(['id'=>$save['company_id']])->find(); - if ($promote_data['company_belong'] != '1' && $promote_data['company_belong'] != '2' ) { + if ($promote_data['company_belong'] != '1' && $promote_data['company_belong'] != '2') { $save['verify_log'] = json_decode($save['verify_log'],true); $save['verify_log']['market_user']="AUTO"; $save['verify_log']['market_time']=date("Y-m-d H:i:s"); @@ -668,7 +668,7 @@ class CompanyGameRatioController extends AdminController $save['end_time'] = $params['end_time'] ? strtotime($params['end_time'])+86399 : 0; $save['remark'] = $params['remark'] ?? ''; $save['turnover_type'] = $params['turnover_type'] ?? 1; - $save['status'] = 0; +// $save['status'] = 0; $save['verify_log']=json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y-m-d H:i:s")]); if($y['ratio'] != $save['ratio'] || $y['turnover_ratio'] != $save['turnover_ratio'] || $y['begin_time'] != $save['begin_time'] || $y['end_time'] != $save['end_time']){ From 324deba9c28381779f3995b0738e177c7f50c3d7 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Mon, 2 Nov 2020 17:34:35 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=A4=96=E5=9B=A2=E7=89=B9=E6=AE=8A?= =?UTF-8?q?=E6=AF=94=E4=BE=8B=E5=8A=9F=E8=83=BD=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/CompanyGameRatioController.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Application/Admin/Controller/CompanyGameRatioController.class.php b/Application/Admin/Controller/CompanyGameRatioController.class.php index a4f46e168..dadd208a1 100644 --- a/Application/Admin/Controller/CompanyGameRatioController.class.php +++ b/Application/Admin/Controller/CompanyGameRatioController.class.php @@ -668,7 +668,7 @@ class CompanyGameRatioController extends AdminController $save['end_time'] = $params['end_time'] ? strtotime($params['end_time'])+86399 : 0; $save['remark'] = $params['remark'] ?? ''; $save['turnover_type'] = $params['turnover_type'] ?? 1; -// $save['status'] = 0; + $save['status'] = 0; $save['verify_log']=json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y-m-d H:i:s")]); if($y['ratio'] != $save['ratio'] || $y['turnover_ratio'] != $save['turnover_ratio'] || $y['begin_time'] != $save['begin_time'] || $y['end_time'] != $save['end_time']){ @@ -728,8 +728,8 @@ class CompanyGameRatioController extends AdminController $save['remark'] = $params['remark'] ?? ''; $save['turnover_type'] = $params['turnover_type'] ?? 1; if($y['ratio'] != $save['ratio'] || $y['turnover_ratio'] != $save['turnover_ratio'] || $y['begin_time'] != $save['begin_time'] || $y['end_time'] != $save['end_time']){ - $save['status'] = 0; - $save['verify_log'] = json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y-m-d H:i:s")]); +// $save['status'] = 0; +// $save['verify_log'] = json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y-m-d H:i:s")]); } M("company_game_ratio_log","tab_")->save($save); addOperationLog(['op_type'=>1,'key'=>$save['id'],'op_name'=>'修改','url'=>U('lists')]); From 02635cc6e96aa3ca47aa33a0864c0e7f50a3a4e2 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Mon, 2 Nov 2020 17:40:07 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=A4=96=E5=9B=A2=E7=89=B9=E6=AE=8A?= =?UTF-8?q?=E6=AF=94=E4=BE=8B=E8=87=AA=E5=8A=A8=E5=AE=A1=E6=A0=B8=E9=80=9A?= =?UTF-8?q?=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyGameRatioController.class.php | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/CompanyGameRatioController.class.php b/Application/Admin/Controller/CompanyGameRatioController.class.php index dadd208a1..30404542b 100644 --- a/Application/Admin/Controller/CompanyGameRatioController.class.php +++ b/Application/Admin/Controller/CompanyGameRatioController.class.php @@ -728,8 +728,19 @@ class CompanyGameRatioController extends AdminController $save['remark'] = $params['remark'] ?? ''; $save['turnover_type'] = $params['turnover_type'] ?? 1; if($y['ratio'] != $save['ratio'] || $y['turnover_ratio'] != $save['turnover_ratio'] || $y['begin_time'] != $save['begin_time'] || $y['end_time'] != $save['end_time']){ -// $save['status'] = 0; -// $save['verify_log'] = json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y-m-d H:i:s")]); + $save['status'] = 0; + $save['verify_log'] = json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y-m-d H:i:s")]); + + $promote_data = M("promote_company","tab_")->where(['id'=>$y['company_id']])->find(); + + if ($promote_data['company_belong'] != '1' && $promote_data['company_belong'] != '2') { + $save['verify_log'] = json_decode($save['verify_log'],true); + $save['verify_log']['market_user']="AUTO"; + $save['verify_log']['market_time']=date("Y-m-d H:i:s"); + $save['verify_log'] = json_encode($save['verify_log']); + $save['status']=1; + } + } M("company_game_ratio_log","tab_")->save($save); addOperationLog(['op_type'=>1,'key'=>$save['id'],'op_name'=>'修改','url'=>U('lists')]); From 48f4fef494cc007fa0d87bc0131944771923ad19 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Mon, 2 Nov 2020 17:44:03 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=A4=96=E5=9B=A2=E7=89=B9=E6=AE=8A?= =?UTF-8?q?=E6=AF=94=E4=BE=8B=E8=87=AA=E5=8A=A8=E5=AE=A1=E6=A0=B8=E9=80=9A?= =?UTF-8?q?=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/CompanyGameRatioController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/Controller/CompanyGameRatioController.class.php b/Application/Admin/Controller/CompanyGameRatioController.class.php index 30404542b..93ecebbc5 100644 --- a/Application/Admin/Controller/CompanyGameRatioController.class.php +++ b/Application/Admin/Controller/CompanyGameRatioController.class.php @@ -727,7 +727,7 @@ class CompanyGameRatioController extends AdminController $save['end_time'] = $params['end_time'] ? strtotime($params['end_time'])+86399 : 0; $save['remark'] = $params['remark'] ?? ''; $save['turnover_type'] = $params['turnover_type'] ?? 1; - if($y['ratio'] != $save['ratio'] || $y['turnover_ratio'] != $save['turnover_ratio'] || $y['begin_time'] != $save['begin_time'] || $y['end_time'] != $save['end_time']){ + if($y['ratio'] != $save['ratio'] || $y['turnover_ratio'] != $save['turnover_ratio'] || $y['begin_time'] != $save['begin_time'] || $y['end_time'] != $save['end_time'] || $y['turnover_type'] != $save['turnover_type']){ $save['status'] = 0; $save['verify_log'] = json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y-m-d H:i:s")]);