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
3461918f
Commit
3461918f
authored
Nov 23, 2018
by
christ
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
oss
parent
86ec7ca1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
ShopkeeperService.php
application/models/Business/Store/ShopkeeperService.php
+1
-1
No files found.
application/models/Business/Store/ShopkeeperService.php
View file @
3461918f
...
...
@@ -306,7 +306,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
//$orderGoods = $orderGoodsDao->getOrderGoodsByOrderIds($orderIds, $orderGoodsDao->orderGoodsField);
$orderCommons
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db6\StoreRedisModel
::
getInstance
(),
array
(
&
$orderCommonDao
,
'getAllByOrderIds'
),
array
(
$orderIds
,
$orderCommonDao
->
orderCommonField
),
\Our\ApiConst
::
oneDaySecond
,
array
(
$storeId
));
$qmDeliveryManLogWhere
[
'order_id'
]
=
array
(
'in'
,
$orderIds
);
$qmDeliveryManLogWhere
[
'type'
]
=
ApiConst
::
orderTypeBuy
;
$qmDeliveryManLogWhere
[
'
order_
type'
]
=
ApiConst
::
orderTypeBuy
;
$qmDeliveryManLogs
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db6\StoreRedisModel
::
getInstance
(),
array
(
&
$qmDeliveryManLogDao
,
'getList'
),
array
(
$qmDeliveryManLogWhere
,
$qmDeliveryManLogDao
->
fieldDetail
,
ApiConst
::
zero
,
$pageSize
),
\Our\ApiConst
::
oneDaySecond
,
array
(
$storeId
));
//$orderCommons = $orderCommonDao->getAllByOrderIds($orderIds, $orderCommonDao->orderCommonField);
$ordersOrderCommons
=
Common
::
intergrateOneToOne
(
$orders
,
$qmDeliveryManLogs
,
'orderId'
,
'orderId'
);
...
...
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