From 108db9fca7fa706b3055bf7ad06fedb2d075ba6c Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Tue, 24 Aug 2021 10:10:05 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A2=84=E8=AD=A6?=
 =?UTF-8?q?=E8=AF=B4=E6=98=8E=E8=A1=A8=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/StatementWarning/infoLists.html | 2 +-
 Application/Admin/View/StatementWarning/lists.html     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Application/Admin/View/StatementWarning/infoLists.html b/Application/Admin/View/StatementWarning/infoLists.html
index 95e54e1c0..e961e52c2 100644
--- a/Application/Admin/View/StatementWarning/infoLists.html
+++ b/Application/Admin/View/StatementWarning/infoLists.html
@@ -85,7 +85,7 @@
     <div class="data_list">
         <div style="display: flex;line-height: 3;justify-content:space-between;">
             <div style="color: red;">
-                结算时间：{$last_update}
+                更新时间：{$last_update}
             </div>
             <div style="color: red;">
                 单位:万元
diff --git a/Application/Admin/View/StatementWarning/lists.html b/Application/Admin/View/StatementWarning/lists.html
index cc969dfde..32565a3e6 100644
--- a/Application/Admin/View/StatementWarning/lists.html
+++ b/Application/Admin/View/StatementWarning/lists.html
@@ -53,7 +53,7 @@
     <div class="cf main-place top_nav_list navtab_list">
 
         <h3 class="page_title">财务预警表</h3>
-        <p class="description_text"></p>
+        <p class="description_text">每日凌晨五点自动更新，如需获取时时数据，请手动进行【月份重算】</p>
     </div>
     <style>
 
@@ -94,7 +94,7 @@
     <div class="data_list">
         <div style="display: flex;line-height: 3;justify-content:space-between;">
             <div style="color: red;">
-                结算时间：{$last_update}
+                更新时间：{$last_update}
             </div>
             <div style="color: red;">
                 单位:万元

From 6031a5aecaad2ef8185a2d2e31678f38b4abbbb1 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Tue, 24 Aug 2021 14:01:56 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=AF=94=E4=BE=8B?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/StatementWarningSetController.class.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Application/Admin/Controller/StatementWarningSetController.class.php b/Application/Admin/Controller/StatementWarningSetController.class.php
index 14f373059..943e02f3f 100644
--- a/Application/Admin/Controller/StatementWarningSetController.class.php
+++ b/Application/Admin/Controller/StatementWarningSetController.class.php
@@ -104,7 +104,7 @@ class StatementWarningSetController extends Controller {
         $this->setCompanyIsWm();
 
         $this->getAllWmAmount();
-        $this->cpStatement();
+        // $this->cpStatement();
         $this->pcStatement();
         $this->puStatement();
         
@@ -317,7 +317,7 @@ class StatementWarningSetController extends Controller {
             'company_belong'=>0
         ])->getField("id company_id,company_name,develop_type",true);
 
-        $company = $this->getPromoteCompanyGameSpend($company);
+        $company = $this->getPromoteCompanyGameSpend($company,0);
         $pcStatementAmount =  $this->addStatementWarningInfo($company,0);
         $savedata = [
             'type'=>2,
@@ -334,7 +334,7 @@ class StatementWarningSetController extends Controller {
             $this->statementWarningModel->add($savedata);
         }
     }
-    private function getPromoteCompanyGameSpend($company)
+    private function getPromoteCompanyGameSpend($company,$companyBelong)
     {
         $where = [
             'tab_spend.is_check'=>1,
@@ -356,7 +356,7 @@ class StatementWarningSetController extends Controller {
 
         foreach ($items as $key => $val) {
             $relationGameId = $games[$val['relation_game_name']];
-            $radio = end($CompanyGameRatio->getGameRadio($val['company_id'],$relationGameId,0,$this->beginThismonth,$this->endThismonth));
+            $radio = end($CompanyGameRatio->getGameRadio($val['company_id'],$relationGameId,$companyBelong,$this->beginThismonth,$this->endThismonth));
             $radio = $CompanyGameRatio->getTurnoverRatio($val['amount'],$radio['ratio'],$radio['turnover_ratio']);
             $statementMoney =round($val['amount']*$radio/100,2);
             if(isset($company[$val['company_id']]['statement_money'])){
@@ -379,7 +379,7 @@ class StatementWarningSetController extends Controller {
 
         $puStatementAmount = 0;
         if($company) {
-            $company = $this->getPuSpecialStatement( $this->getPromoteCompanyGameSpend($company) );
+            $company = $this->getPuSpecialStatement( $this->getPromoteCompanyGameSpend($company,1) );
             foreach ($company as $key => $value) {
                 if(!array_key_exists('statement_money',$value) ) {
                     unset($company[$key]);

From 0e6709a047b4434b0ac9794dcd19eed1c81aebb9 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Tue, 24 Aug 2021 14:28:51 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8A=E6=B8=B8cp?=
 =?UTF-8?q?=E7=BB=93=E7=AE=97=E6=96=B9=E5=BC=8F=EF=BC=8C=E9=9C=80=E8=80=83?=
 =?UTF-8?q?=E8=99=91=E6=B8=A0=E9=81=93=E8=B4=B9=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/StatementWarningSetController.class.php    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/Controller/StatementWarningSetController.class.php b/Application/Admin/Controller/StatementWarningSetController.class.php
index 943e02f3f..491043fb9 100644
--- a/Application/Admin/Controller/StatementWarningSetController.class.php
+++ b/Application/Admin/Controller/StatementWarningSetController.class.php
@@ -104,7 +104,7 @@ class StatementWarningSetController extends Controller {
         $this->setCompanyIsWm();
 
         $this->getAllWmAmount();
-        // $this->cpStatement();
+        $this->cpStatement();
         $this->pcStatement();
         $this->puStatement();
         
@@ -285,7 +285,7 @@ class StatementWarningSetController extends Controller {
                 ->join("tab_partner as p on g.partner_id = p.id")
                 ->where(['g.id'=>['in',$game_ids]])
                 ->group("g.partner_id")
-                ->getField('p.id company_id,GROUP_CONCAT(g.id) game_ids,p.partner company_name',true);
+                ->getField('p.id company_id,GROUP_CONCAT(g.id) game_ids,p.partner company_name,channel_rate,taxation_rate',true);
     }
 
     /**
@@ -300,6 +300,10 @@ class StatementWarningSetController extends Controller {
             foreach ($gameids as $gameid) {
                 $statementMoney += ($gamedata[$gameid]-0);
             }
+            //上游需要计算祱费及渠道费用
+            if($value['channel_rate'] > 0 || $value['taxation_rate'] > 0){
+                $statementMoney=round($statementMoney*(100-$value['channel_rate'])*(100-$value['taxation_rate'])/(100*100), 2);//结算金额=平台总额*（1-渠道费）*分成比例*(1-税费费率)
+            }
             $company[$key]['statement_money'] = $statementMoney;
             unset($company[$key]['game_ids']);
        }