diff --git a/Application/Admin/Controller/StatementWarningSetController.class.php b/Application/Admin/Controller/StatementWarningSetController.class.php index e2e3b9c53..50944c8c3 100644 --- a/Application/Admin/Controller/StatementWarningSetController.class.php +++ b/Application/Admin/Controller/StatementWarningSetController.class.php @@ -180,13 +180,16 @@ class StatementWarningSetController extends Controller { */ private function getAllWmAmount() { + //获取官方渠道 + $merchantIds = M("payment_merchant","tab_")->group('main_id')->where("main_id = 1")->getField("GROUP_CONCAT(id) ids"); $where = [ - 'partner_type'=>['in',[0,1]], + 'merchant_way'=>['in',$merchantIds], 'pay_status'=>1, 'payed_time'=>['between',[$this->beginThismonth,$this->endThismonth]], ]; - $amout = $this->spendModel->where($where)->getField("sum(pay_amount) amount"); - $this->addStatementWarning(1,'wm_platm',$amout); + $amout = $this->spendModel->where($where)->where(['pay_way'=>['GT',0],])->getField("sum(pay_amount) amount"); + $despost = M("deposit","tab_")->where($where)->getField("sum(pay_amount) amount"); + $this->addStatementWarning(1,'wm_platm',$amout-0+$despost); } /** * 添加默认信息 @@ -279,7 +282,7 @@ class StatementWarningSetController extends Controller { $company = $this->getPromoteCompanyGameSpend($company,0); $pcStatementAmount = $this->addStatementWarningInfo($company,0); - + $this->addStatementWarning(2,'pc_statement',$pcStatementAmount); } private function getPromoteCompanyGameSpend($company,$companyBelong)