ccw:master_dev

application/models/Business/Store/ShopkeeperService.php

@@ -1092,10 +1092,10 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
 
     }
 
-    public function getSellerCount($memberId)
+    public function getSellerCount($storeId)
     {
         $memberDao = \DAO\MemberModel::getInstance();
-        $storeId = $memberDao->getInfo($memberId, 'store_id');
+       // $storeId = $memberDao->getInfo($memberId, 'store_id');
         $orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::salveDBConnectName);
         $waitReceiveCount = $orderDao->getCountByOrderState($storeId, ApiConst::orderStateWaitConfirm);
         $waitDeliveryCount = $orderDao->getCountByShippingTypeAndOrderState($storeId);
@@ -1103,10 +1103,10 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
         $orderCount=$waitReceiveCount+$waitDeliveryCount+$waitGetCount;
         return array('waitReceiveCount' => $waitReceiveCount, 'waitDeliveryCount' => $waitDeliveryCount, 'waitGetCount' => $waitGetCount,'orderCount'=>$orderCount);
     }
-    public function getSellerRefundCount($memberId)
+    public function getSellerRefundCount($storeId)
     {
         $memberDao = \DAO\MemberModel::getInstance();
-        $storeId = $memberDao->getInfo($memberId, 'store_id');
+      //  $storeId = $memberDao->getInfo($memberId, 'store_id');
         $refundReturnDao = \DAO\Order\RefundReturnModel::getInstance(DbNameConst::salveDBConnectName);
         //待处理
         $waitRefundProccessCount = $refundReturnDao->getCountByRefundState($storeId);
@@ -1114,10 +1114,10 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
         $refundCount=$waitRefundProccessCount+$waitRefundReceiveCount;
         return array('waitRefundProccessCount' => $waitRefundProccessCount, 'waitRefundReceiveCount' => $waitRefundReceiveCount, 'refundCount' =>$refundCount);
     }
-    public function getStorageAlarmCount($memberId)
+    public function getStorageAlarmCount($storeId)
     {
         $memberDao = \DAO\MemberModel::getInstance();
-        $storeId = $memberDao->getInfo($memberId, 'store_id');
+      //  $storeId = $memberDao->getInfo($memberId, 'store_id');
         $goodsDao=\DAO\GoodsModel::getInstance();
         $alertCount=$goodsDao->getAlertCountByStoreId($storeId);
         return array('alertCount'=>$alertCount);

application/modules/Client/controllers/Shopkeeper.php

@@ -183,7 +183,7 @@ class ShopkeeperController extends \Our\Controller_AbstractClient {
      * 获得订单数量
      */
     public function countAction(){
-        $result = $this->shopkeeperService->getCount($this->memberId);
+        $result = $this->shopkeeperService->getCount($this->storeId);
         if(!empty($result)){
             $this->success($result);
         }