Commit 17a730ec authored by christ's avatar christ

ccw:master_dev

parent 02a41a12
...@@ -494,10 +494,14 @@ class ShopkeeperServiceModel extends \Business\AbstractModel ...@@ -494,10 +494,14 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
return $this->orderGoodsField . ',goods_commonid as goodsCommonid,goods_commonid as goodsCommonId,goods_spec as goodsSpec '; return $this->orderGoodsField . ',goods_commonid as goodsCommonid,goods_commonid as goodsCommonId,goods_spec as goodsSpec ';
} }
public function getDiliveryManByStoreId($memberId) public function getDiliveryManByStoreId($memberId,$isStoreId=false)
{ {
$memberDao = \DAO\MemberModel::getInstance(); $memberDao = \DAO\MemberModel::getInstance();
$storeId = $memberDao->getInfo($memberId, 'store_id'); if($isStoreId){
$storeId=$memberId;
}else{
$storeId = $memberDao->getInfo($memberId, 'store_id');
}
if (empty($storeId)) { if (empty($storeId)) {
ErrorModel::throwException(CodeConfigModel::emptyStoreId); ErrorModel::throwException(CodeConfigModel::emptyStoreId);
} }
......
...@@ -44,7 +44,7 @@ class DeliveryController extends \Our\Controller_AbstractClient { ...@@ -44,7 +44,7 @@ class DeliveryController extends \Our\Controller_AbstractClient {
* 获得配送员列表 * 获得配送员列表
*/ */
public function getDeliveriersAction(){ public function getDeliveriersAction(){
$result = $this->shopkeeperService->getDiliveryManByStoreId($this->memberId); $result = $this->shopkeeperService->getDiliveryManByStoreId($this->storeId,true);
$result=$result?$result:[]; $result=$result?$result:[];
if($result!==false){ if($result!==false){
$this->success($result,\Our\DescribeConst::successMessage,\Our\DescribeConst::successMessage); $this->success($result,\Our\DescribeConst::successMessage,\Our\DescribeConst::successMessage);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment