财务汇总新增测试订单收入

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;
     }
     //奖罚收入