shoperOrderSearch

application/models/Business/Store/ShopkeeperService.php

@@ -321,9 +321,12 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
         }
         return $return;
     }
-    public function getOrderIndexWhere($storeId, $keyword, $pageIndex, $pageSize)
+    public function getOrderIndexWhere($storeId, $keyword, $pageIndex, $pageSize,$orderState=false)
     {
         $query1[] = array('match' => array('storeId' => $storeId));
+        if($orderState!=false){
+            $query1[] = array('match' => array('orderState' => $orderState));
+        }
         $res1['must'][0] = $query1;
         $query2[] = array('match' => array('goodsName' => $keyword));
         $query2[] = array('wildcard' => array('orderSn' => "*{$keyword}*"));
@@ -350,7 +353,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
         $allQuery = array();
         $allQuery['bool'] = array();
         if (!empty($keyword)) {
-            $where= $this->getOrderIndexWhere($storeId,$keyword,$pageIndex,$pageSize);
+            $where= $this->getOrderIndexWhere($storeId,$keyword,$pageIndex,$pageSize,$orderState);
         } else {
             $where = 'han_order.store_id=' . $storeId;
             if (!empty($orderState)) {