Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into lyz_version1

application/models/Business/Store/ShopkeeperService.php

@@ -293,15 +293,20 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
         }
     }
 
-    public function getStoreOrders($memberId, $pageIndex, $pageSize, $orderState, $keyword)
+    public function getStoreOrders($memberId, $pageIndex, $pageSize, $orderState, $keyword,$isStoreId=false)
     {
-        $storeId = $this->_getStoreByMemberId($memberId);
+        if($isStoreId){
+           $storeId=$memberId;
+        }else{
+            $storeId = $this->_getStoreByMemberId($memberId);
+        }
+
         $storeStatisticsDao = \DAO\StoreStatisticsModel::getInstance();
         //获取店铺数据统计
         $storeStats = $storeStatisticsDao->find(array('store_id' => $storeId));
         $data['orderTotal'] = $storeStats['order_total'];
         $data['orderCount'] = $storeStats['order_count'];
-        $result = $this->getOrders($memberId, $pageIndex, $pageSize, $orderState, $keyword);
+        $result = $this->getOrders($memberId, $pageIndex, $pageSize, $orderState, $keyword,$isStoreId);
         $data['orders'] = $result['orders'];
         return $data;
     }
@@ -414,12 +419,17 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
         return $where;
     }
 
-    public function getOrders($memberId, $pageIndex, $pageSize, $orderState, $keyword)
+    public function getOrders($memberId, $pageIndex, $pageSize, $orderState, $keyword,$isstoreId=false)
     {
 
         $order = array('gmt_update' => 'desc');
         $orderDao=\DAO\Order\OrderModel::getInstance();
-        $storeId = $this->_getStoreByMemberId($memberId);
+        if($isstoreId){
+            $storeId=$memberId;
+        }else{
+            $storeId = $this->_getStoreByMemberId($memberId);
+        }
+
         if (empty($storeId)) {
             ErrorModel::throwException(CodeConfigModel::paramsError);
         }

application/modules/Client/controllers/Shopkeeper.php

@@ -128,7 +128,7 @@ class ShopkeeperController extends \Our\Controller_AbstractClient {
         $pageSize=isset($this->req['data']['pageSize'])?$this->req['data']['pageSize']:10;
         $orderState = isset($this->req['data']['orderState'])?$this->req['data']['orderState']:'';
         $keyword = isset($this->req['data']['keyword'])?$this->req['data']['keyword']:'';
-        $result = $this->shopkeeperService->getStoreOrders($this->memberId,$pageIndex,$pageSize,$orderState,$keyword);
+        $result = $this->shopkeeperService->getStoreOrders($this->storeId,$pageIndex,$pageSize,$orderState,$keyword,true);
         $this->success($result);
         if($result){
             $this->success(array(),\Our\DescribeConst::successMessage,\Our\DescribeConst::successMessage);