Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
my-yaf-project
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chenchuanwen
my-yaf-project
Commits
17a730ec
Commit
17a730ec
authored
Dec 18, 2018
by
christ
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ccw:master_dev
parent
02a41a12
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
ShopkeeperService.php
application/models/Business/Store/ShopkeeperService.php
+6
-2
Delivery.php
application/modules/Client/controllers/Delivery.php
+1
-1
No files found.
application/models/Business/Store/ShopkeeperService.php
View file @
17a730ec
...
...
@@ -494,10 +494,14 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
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
();
$storeId
=
$memberDao
->
getInfo
(
$memberId
,
'store_id'
);
if
(
$isStoreId
){
$storeId
=
$memberId
;
}
else
{
$storeId
=
$memberDao
->
getInfo
(
$memberId
,
'store_id'
);
}
if
(
empty
(
$storeId
))
{
ErrorModel
::
throwException
(
CodeConfigModel
::
emptyStoreId
);
}
...
...
application/modules/Client/controllers/Delivery.php
View file @
17a730ec
...
...
@@ -44,7 +44,7 @@ class DeliveryController extends \Our\Controller_AbstractClient {
* 获得配送员列表
*/
public
function
getDeliveriersAction
(){
$result
=
$this
->
shopkeeperService
->
getDiliveryManByStoreId
(
$this
->
memberId
);
$result
=
$this
->
shopkeeperService
->
getDiliveryManByStoreId
(
$this
->
storeId
,
true
);
$result
=
$result
?
$result
:
[];
if
(
$result
!==
false
){
$this
->
success
(
$result
,
\Our\DescribeConst
::
successMessage
,
\Our\DescribeConst
::
successMessage
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment