From 5315af1be935e78ee617b5591dc5b93fa4f600ea Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Wed, 25 Aug 2021 17:05:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=93=E7=AE=97=E5=90=8E?=
 =?UTF-8?q?=E7=A7=BB=E4=B8=80=E4=B8=AA=E6=9C=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StatementWarningController.class.php      |  6 ++--
 .../StatementWarningSetController.class.php   | 31 ++-----------------
 2 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/Application/Admin/Controller/StatementWarningController.class.php b/Application/Admin/Controller/StatementWarningController.class.php
index 042bf3b7b..dd607556b 100644
--- a/Application/Admin/Controller/StatementWarningController.class.php
+++ b/Application/Admin/Controller/StatementWarningController.class.php
@@ -105,11 +105,11 @@ class StatementWarningController extends AdminController
             } 
         }
         //毛利
-        $data[3]['list']['费用'][12] = array_sum($data[3]['list']['费用']);
-        $data[3]['list']['其他收入'][12] = array_sum($data[3]['list']['其他收入']);
+        $data[3]['list']['cost'][12] = array_sum($data[3]['list']['cost']);
+        $data[3]['list']['other_income'][12] = array_sum($data[3]['list']['other_income']);
         for ($i=0; $i < 13; $i++) { 
             $data[3]['count'][$i] = $data[1]['count'][$i]-$data[2]['count'][$i];
-            $data[4]['count'][$i] = ($data[3]['count'][$i]-$data[3]['list']['费用'][$i]+$data[3]['list']['其他收入'][$i]);
+            $data[4]['count'][$i] = ($data[3]['count'][$i]-$data[3]['list']['cost'][$i]+$data[3]['list']['other_income'][$i]);
 
             if($data[1]['count'][$i] != 0){
                 $data[3]['list']['margin_ratio'][$i] = round( $data[3]['count'][$i]/$data[1]['count'][$i],4);
diff --git a/Application/Admin/Controller/StatementWarningSetController.class.php b/Application/Admin/Controller/StatementWarningSetController.class.php
index 31e6d9d7a..e2e3b9c53 100644
--- a/Application/Admin/Controller/StatementWarningSetController.class.php
+++ b/Application/Admin/Controller/StatementWarningSetController.class.php
@@ -207,21 +207,8 @@ class StatementWarningSetController extends Controller {
             $company = $this->getCpCompanyInfo(array_keys($gamedata));
             $cpStatementAmount =  $this->addCpStatementWarningInfo($company,$gamedata);
         }
-        $savedata = [
-            'type'=>2,
-            'name'=>'up_statement',
-            'count_month'=>$this->month,
-            'count_year'=>$this->year
-        ];
-        $hasDb =  $this->statementWarningModel->where($savedata)->find();
-        $savedata = array_merge(['money'=>$cpStatementAmount,'create_time'=>time()],$savedata);
-        if($hasDb){
-            $savedata['id'] = $hasDb['id'];
-            $this->statementWarningModel->save($savedata);
-        }else{
-            $this->statementWarningModel->add($savedata);
-        }
 
+        $this->addStatementWarning(2,'up_statement',$cpStatementAmount);
     }
     /**
      * 获取月份游戏结算额
@@ -292,20 +279,8 @@ class StatementWarningSetController extends Controller {
 
         $company = $this->getPromoteCompanyGameSpend($company,0);
         $pcStatementAmount =  $this->addStatementWarningInfo($company,0);
-        $savedata = [
-            'type'=>2,
-            'name'=>'pc_statement',
-            'count_month'=>$this->month,
-            'count_year'=>$this->year
-        ];
-        $hasDb =  $this->statementWarningModel->where($savedata)->find();
-        $savedata = array_merge(['money'=>$pcStatementAmount,'create_time'=>time()],$savedata);
-        if($hasDb){
-            $savedata['id'] = $hasDb['id'];
-            $this->statementWarningModel->save($savedata);
-        }else{
-            $this->statementWarningModel->add($savedata);
-        }
+        
+        $this->addStatementWarning(2,'pc_statement',$pcStatementAmount);
     }
     private function getPromoteCompanyGameSpend($company,$companyBelong)
     {