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
c2a31271
Commit
c2a31271
authored
Nov 15, 2018
by
christ
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pc
parent
32a130fb
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
ShopkeeperService.php
application/models/Business/Store/ShopkeeperService.php
+2
-1
No files found.
application/models/Business/Store/ShopkeeperService.php
View file @
c2a31271
...
...
@@ -288,7 +288,8 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
if
(
!
empty
(
$orderIds
))
{
$orderGoods
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db5\OrderRedisModel
::
getInstance
(),
array
(
&
$orderGoodsDao
,
'getOrderGoodsByOrderIds'
),
array
(
$orderIds
,
$orderGoodsDao
->
orderGoodsField
),
\Our\ApiConst
::
oneDaySecond
,
array
(
$storeId
));
//$orderGoods = $orderGoodsDao->getOrderGoodsByOrderIds($orderIds, $orderGoodsDao->orderGoodsField);
$orderCommons
=
$orderCommonDao
->
getAllByOrderIds
(
$orderIds
,
$orderCommonDao
->
orderCommonField
);
$orderCommons
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db5\OrderRedisModel
::
getInstance
(),
array
(
&
$orderCommonDao
,
'getAllByOrderIds'
),
array
(
$orderIds
,
$orderCommonDao
->
orderCommonField
),
\Our\ApiConst
::
oneDaySecond
,
array
(
$storeId
));
//$orderCommons = $orderCommonDao->getAllByOrderIds($orderIds, $orderCommonDao->orderCommonField);
$ordersOrderCommons
=
Common
::
intergrateOneToOne
(
$orders
,
$orderCommons
,
'orderId'
,
'orderId'
);
$orderMerge
=
\Our\Common
::
intergrateOneToMany
(
$ordersOrderCommons
,
$orderGoods
,
'orderId'
,
'orderId'
,
'orderGoods'
);
foreach
(
$orderMerge
as
&
$value
)
{
...
...
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