From 3b3ed208e2b23f8a11f63d8581fdd50ca1091e08 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 30 Jul 2020 14:06:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E6=B1=87=E6=80=BB=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=B5=8B=E8=AF=95=E8=AE=A2=E5=8D=95=E6=94=B6=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/FinancialSummarySetController.class.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Application/Admin/Controller/FinancialSummarySetController.class.php b/Application/Admin/Controller/FinancialSummarySetController.class.php index 4cf8c1f8e..9992ada28 100644 --- a/Application/Admin/Controller/FinancialSummarySetController.class.php +++ b/Application/Admin/Controller/FinancialSummarySetController.class.php @@ -206,7 +206,14 @@ class FinancialSummarySetController extends \Think\Controller ); if($testlist) $map1['user_id']=array("in",$testlist); $deposit = $this->DepositModel->field("IFNULL(sum(pay_amount),0) pay_amount")->where($map1)->find()['pay_amount']; - $temparr['sum_money'] = number_format(($cash_spend*100+$deposit*100)/100, 2, '.', ''); + //测试订单录入 + $map2 = array( + "pay_time"=> array('BETWEEN',array($this->beginThismonth, $this->endThismonth)) + ); + $test_pay_amount = M("TestOrder")->where($map2)->field("IFNULL(sum(pay_amount),0) pay_amount")->find()['pay_amount']; + + $temparr['sum_money'] = number_format(($cash_spend*100 + $deposit*100 + $test_pay_amount*100 )/100, 2, '.', ''); + $this->adddata[]=$temparr; } //奖罚收入