ccw:master_dev

application/models/Business/Store/ShopkeeperService.php

@@ -513,9 +513,9 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
         return $diliveryMans;
     }
 
-    public function confirmReceivePayment($memberId,$orderId){
+    public function confirmReceivePayment($memberId,$storeId,$orderId){
         $memberDao = \DAO\MemberModel::getInstance();
-        $storeId = $memberDao->getInfo($memberId, 'store_id');
+       // $storeId = $memberDao->getInfo($memberId, 'store_id');
         $orderDao=\DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
         $where['order_id']=$orderId;
         $where['store_id']=$storeId;

application/modules/Client/controllers/Shopkeeper.php

@@ -193,7 +193,7 @@ class ShopkeeperController extends \Our\Controller_AbstractClient {
 
     public function receivePaymentAction(){
         $shopkeeperService=\Business\Store\ShopkeeperServiceModel::getInstance();
-        $res=$shopkeeperService->confirmReceivePayment($this->memberId,$this->req['data']['orderId']);
+        $res=$shopkeeperService->confirmReceivePayment($this->memberId,$this->storeId,$this->req['data']['orderId']);
         if($res){
             $this->success(array(),\Our\DescribeConst::successMessage);
         }else{