订单列表，优化时间筛选条件,增加支付状态筛选条件

app/common.php

@@ -237,12 +237,12 @@ if (!function_exists('getModelTime')) {
                     if (strlen($startTime) == 4) {
                         $model->whereBetweenTime($prefix, date('Y-m-d H:i:s', strtotime($startTime)), date('Y-m-d H:i:s', strtotime($startTime . ' +1day -1second')));
                     } else {
-                        if ($startTime == $endTime) {
-                            $model = $model->whereDay($prefix, $startTime);
-                        } else {
+                        // if ($startTime == $endTime) {
+                        //     $model = $model->whereDay($prefix, $startTime);
+                        // } else {
                             $model = $model->where($prefix, '>', date('Y-m-d H:i:s', strtotime($startTime)));
                             $model = $model->where($prefix, '<', date('Y-m-d H:i:s', strtotime($endTime)));
-                        }
+                        // }
                     }
                 }
                 break;

app/common/repositories/store/order/StoreOrderRepository.php

@@ -5015,6 +5015,13 @@ class StoreOrderRepository extends BaseRepository
                     return $query->field('uid,phone,nickname');
                 }
             ]);
+        $query1 = clone ($query);
+        $query2 = clone ($query);
+
+        $fzone_pay_price = $query1->where('test_order', 0)->sum('fzone_pay_price');
+        $fzone_pay_vr = $query2->where('test_order', 0)->sum('fzone_pay_vr');
+
+
         $count = $query->where('test_order', 0)->count();
         $list = $query->page($page, $limit)->order('order_id desc')->where('test_order', 0)->select();
 
@@ -5026,11 +5033,8 @@ class StoreOrderRepository extends BaseRepository
         $banclPay = $query->where($this->getOrderType($status))->where('test_order', 0)->where('paid', 1)->where('pay_type', 0)->field('sum(pay_price) as pay_price')->find();
         $wechatpay = $query->where($this->getOrderType($status))->where('test_order', 0)->where('paid', 1)->where('pay_type', '<>', 0)->field('sum(pay_price) as pay_price')->find();
 
-        $fzone_pay_price = 0.00;
-        $fzone_pay_vr = 0.00;
+
         foreach ($list as $key => $item) {
-            $fzone_pay_price = bcadd($fzone_pay_price, $item['fzone_pay_price'], 2);
-            $fzone_pay_vr = bcadd($fzone_pay_vr, $item['fzone_pay_vr'], 2);
             if ($item['fzone_paytype']) {
                 $list[$key]['fzone_paytype'] = json_decode($item['fzone_paytype'], true);
                 if (!count($list[$key]['fzone_paytype'])) {

app/controller/admin/order/Order.php

@@ -62,7 +62,7 @@ class Order extends BaseController
     public function getAllList()
     {
         [$page, $limit] = $this->getPage();
-        $where = $this->request->params(['type', 'date', 'mer_id','keywords','status','username','order_sn','order_ids']);
+        $where = $this->request->params(['type', 'date', 'mer_id','keywords','status','username','order_sn','order_ids','paid']);
 
         $pay_type=$this->request->param('pay_type');
         if($pay_type==1 || $pay_type==4){
@@ -101,7 +101,7 @@ class Order extends BaseController
      */
     public function chart()
     {
-        $where = $this->request->params(['type', 'date', 'mer_id','keywords','status','username','order_sn','order_ids']);
+        $where = $this->request->params(['type', 'date', 'mer_id','keywords','status','username','order_sn','order_ids','paid']);
         return app('json')->success($this->repository->adminOrderNumber(-1, $where));
     }