From 382f2527a0c3d6e5cffb700a382f54c40922fbae Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Wed, 30 Dec 2020 15:39:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=B0=E5=A2=9E=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Application/Admin/Controller/TimingController.class.php b/Application/Admin/Controller/TimingController.class.php
index 29fed092b..71999a4a2 100644
--- a/Application/Admin/Controller/TimingController.class.php
+++ b/Application/Admin/Controller/TimingController.class.php
@@ -834,7 +834,7 @@ class TimingController extends AdminController {
                         $amount_time['tab_spend.pay_status'] = 1;
                         $amount_time['pay_way'] = ['egt',0];
                         $amount_time['_string'] = "payed_time between {$statement_begin_time} and {$statement_end_time} and relation_game_id={$v['relation_game_id']}";
-
+                        D("Spend")->addSubsiteWhere($amount_time);
                         $dataAmount = M("spend","tab_")
                             ->field("pay_amount,relation_game_id,relation_game_name,payed_time,game_type_name,substring_index(substring_index(promote.`chain`,'/',2),'/',-1) promote_id,chain,admin_id")
                             ->join("left join tab_promote promote on tab_spend.promote_id=promote.id")
@@ -974,7 +974,7 @@ class TimingController extends AdminController {
     public function getSpendData($begintime = 0,$endtime = 0,$company_id=0,$relation_game_id=0,$admin_id=0,$promote_id=0) {
         $map['tab_spend.pay_status'] = 1;
         $map['pay_way'] = ['egt',0];
-
+        D("Spend")->addSubsiteWhere($map,"tab_spend");
         $spend = M("spend","tab_")
             ->field("sum(pay_amount) pay_amount,
             CASE WHEN substring_index(substring_index(`chain`,'/',2),'/',-1) !='' THEN substring_index(substring_index(`chain`,'/',2),'/',-1) ELSE promote_id END promote_id,game.relation_game_id,company_id")
@@ -1030,7 +1030,7 @@ class TimingController extends AdminController {
         }
 
         if ($map['pay_time']) {
-            M("settleup_marketorder","tab_")
+            SM("settleup_marketorder","tab_")
                 ->where(['pay_time'=>['in',$month_time]])
                 ->delete();
         }
@@ -1086,7 +1086,7 @@ class TimingController extends AdminController {
         if (!$spend_map['_string']) {
             $spend_map['_string'] = "relation_game_id = 0";
         }
-
+        D("Spend")->addSubsiteWhere($spend_map,"tab_spend");
         $spend = M("spend","tab_")
             ->field("sum(pay_amount) as pay_amount,FROM_UNIXTIME(pay_time,'%Y-%m') pay_time,
             substring_index(substring_index(tab_spend.game_name,'(',1),'(',-1) game_name,game_id,relation_game_id,tab_spend.sdk_version,
@@ -1108,7 +1108,7 @@ class TimingController extends AdminController {
             ->select(false);
 
         $unsettlement['_string'] = "tab_spend.id not in($not_in_spend)";
-
+        D("Spend")->addSubsiteWhere($unsettlement,"tab_spend");
         $unsettlement_spend = M("spend","tab_")
             ->field("sum(pay_amount) as pay_amount,FROM_UNIXTIME(pay_time,'%Y-%m') pay_time,
             substring_index(substring_index(tab_spend.game_name,'(',1),'(',-1) game_name,game_id,relation_game_id,tab_spend.sdk_version,