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
e05cbfa5
Commit
e05cbfa5
authored
Sep 07, 2018
by
liuyuzhen
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into lyz
parents
53b138d8
d321e892
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
GroupSaleService.php
application/models/Business/Goods/GroupSaleService.php
+1
-1
No files found.
application/models/Business/Goods/GroupSaleService.php
View file @
e05cbfa5
...
...
@@ -255,7 +255,7 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
public
function
getStorePBundlingList
(
$storeId
,
$dbName
=
\Our\DbNameConst
::
salveDBConnectName
,
$withKeyFlag
=
false
,
$limit
=
''
){
$pbundlingInstance
=
\DAO\PBundlingModel
::
getInstance
(
$dbName
);
$limit
==
''
?
$limit
=
array
(
\Our\ApiConst
::
zero
,
\Our\ApiConst
::
five
)
:
$limit
=
$limit
;
$groupList
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db4\PBundlingRedisModel
::
getInstance
(),
array
(
&
$pbundlingInstance
,
'getList'
),
array
(
$this
->
pBundingField
,
array
(
'store_id'
=>
$storeId
),
$limit
),
\Our\ApiConst
::
oneDaySecond
);
$groupList
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db4\PBundlingRedisModel
::
getInstance
(),
array
(
&
$pbundlingInstance
,
'getList'
),
array
(
$this
->
pBundingField
,
array
(
'store_id'
=>
$storeId
),
$limit
),
\Our\ApiConst
::
oneDaySecond
,
array
(
$storeId
)
);
$newGroupList
=
$this
->
getPBundlingList
(
$groupList
,
$dbName
,
$withKeyFlag
);
return
$newGroupList
;
}
...
...
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