ccw:master_dev

application/models/Business/Store/ShopkeeperService.php

@@ -237,9 +237,13 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
      * @param $orderId
      * @return bool
      */
-    public function orderReceive($memberId, $orderId)
+    public function orderReceive($memberId, $orderId,$isStore=false)
     {
+        if($isStore){
+            $storeId=$memberId;
+        }else{
             $storeId = $this->_getStoreByMemberId($memberId);
+        }
         $where['order_id'] = $orderId;
         $where['store_id'] = $storeId;
         $where['order_state'] = ApiConst::orderStateWaitConfirm;

application/modules/Client/controllers/Shopkeeper.php

@@ -111,7 +111,7 @@ class ShopkeeperController extends \Our\Controller_AbstractClient {
      */
     public function orderReceiveAction(){
         $orderId = $this->req['data']['orderId'];
-        $result = $this->shopkeeperService->orderReceive($this->memberId, $orderId);
+        $result = $this->shopkeeperService->orderReceive($this->storeId, $orderId,true);
         if ($result) {
             $this->success(array(), \Our\DescribeConst::successMessage, \Our\DescribeConst::successMessage);
         }else{