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
9ea1e709
Commit
9ea1e709
authored
Oct 22, 2018
by
liuyuzhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
首页去除可快递店铺
parent
69f91878
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
GoodsClassService.php
application/models/Business/Goods/GoodsClassService.php
+2
-0
StoreService.php
application/models/Business/Store/StoreService.php
+4
-3
No files found.
application/models/Business/Goods/GoodsClassService.php
View file @
9ea1e709
...
@@ -91,10 +91,12 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
...
@@ -91,10 +91,12 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
}
}
//获取可快递店铺对应分类
//获取可快递店铺对应分类
/*
$expressClassIds = $this->getExpressStoreClasses($where);
$expressClassIds = $this->getExpressStoreClasses($where);
if($expressClassIds){
if($expressClassIds){
$classIds = array_merge($expressClassIds,$classIds);
$classIds = array_merge($expressClassIds,$classIds);
}
}
*/
$classIdKeys
=
array_flip
(
$classIds
);
$classIdKeys
=
array_flip
(
$classIds
);
$goodsClassDao
=
\DAO\GoodsClassModel
::
getInstance
();
$goodsClassDao
=
\DAO\GoodsClassModel
::
getInstance
();
$parentClasses
=
$goodsClassDao
->
getParentClasses
();
$parentClasses
=
$goodsClassDao
->
getParentClasses
();
...
...
application/models/Business/Store/StoreService.php
View file @
9ea1e709
...
@@ -562,7 +562,7 @@ class StoreServiceModel extends \Business\AbstractModel{
...
@@ -562,7 +562,7 @@ class StoreServiceModel extends \Business\AbstractModel{
//服务分类对应店铺
//服务分类对应店铺
$serviceStores
=
$this
->
getServiceClassStores
(
$gcId
,
$condition
);
$serviceStores
=
$this
->
getServiceClassStores
(
$gcId
,
$condition
);
//获取签约分类对应店铺
//获取签约分类对应店铺
$expressStores
=
$this
->
getExpressStores
(
$gcId
,
$condition
);
//
$expressStores = $this->getExpressStores($gcId,$condition);
$goodsClassList
=
$goodsClassDao
->
getOnlineSecondClassList
(
$gcId
);
$goodsClassList
=
$goodsClassDao
->
getOnlineSecondClassList
(
$gcId
);
...
@@ -578,9 +578,10 @@ class StoreServiceModel extends \Business\AbstractModel{
...
@@ -578,9 +578,10 @@ class StoreServiceModel extends \Business\AbstractModel{
$exitStore
=
$allStores
[
$signStores
[
$goodsClass
[
'gcId'
]]];
$exitStore
=
$allStores
[
$signStores
[
$goodsClass
[
'gcId'
]]];
}
else
if
(
$serviceStores
&&
in_array
(
$goodsClass
[
'gcId'
],
array_keys
(
$serviceStores
))){
}
else
if
(
$serviceStores
&&
in_array
(
$goodsClass
[
'gcId'
],
array_keys
(
$serviceStores
))){
$exitStore
=
$allStores
[
$serviceStores
[
$goodsClass
[
'gcId'
]]];
$exitStore
=
$allStores
[
$serviceStores
[
$goodsClass
[
'gcId'
]]];
}
else
if
(
$expressStores
&&
in_array
(
$goodsClass
[
'gcId'
],
array_keys
(
$expressStores
))){
$exitStore
=
$allStores
[
$expressStores
[
$goodsClass
[
'gcId'
]]];
}
}
/*else if($expressStores&&in_array($goodsClass['gcId'],array_keys($expressStores))){
$exitStore = $allStores[$expressStores[$goodsClass['gcId']]];
}*/
if
(
$memberStores
){
if
(
$memberStores
){
if
(
$memberStores
&&
in_array
(
$goodsClass
[
'gcId'
],
array_keys
(
$memberStores
))){
if
(
$memberStores
&&
in_array
(
$goodsClass
[
'gcId'
],
array_keys
(
$memberStores
))){
$purchasedStore
=
$allStores
[
$memberStores
[
$goodsClass
[
'gcId'
]]];
$purchasedStore
=
$allStores
[
$memberStores
[
$goodsClass
[
'gcId'
]]];
...
...
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