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
6a699c6d
Commit
6a699c6d
authored
Nov 29, 2018
by
christ
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pc
parent
b2af2dda
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
OrderService.php
application/models/Business/Order/OrderService.php
+1
-1
No files found.
application/models/Business/Order/OrderService.php
View file @
6a699c6d
...
@@ -1041,7 +1041,7 @@ class OrderServiceModel extends \Business\AbstractModel
...
@@ -1041,7 +1041,7 @@ class OrderServiceModel extends \Business\AbstractModel
$this
->
store
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db5\OrderRedisModel
::
getInstance
(),
array
(
&
$storeDao
,
'getInfoById'
),
array
(
$this
->
order
[
'storeId'
],
$storeDao
->
detailField
),
\Our\ApiConst
::
oneDaySecond
);
$this
->
store
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db5\OrderRedisModel
::
getInstance
(),
array
(
&
$storeDao
,
'getInfoById'
),
array
(
$this
->
order
[
'storeId'
],
$storeDao
->
detailField
),
\Our\ApiConst
::
oneDaySecond
);
$convertRefundReturn
=
Array
();
$convertRefundReturn
=
Array
();
$convertRefundReturn
[
$refundReturn
[
'orderGoodsId'
]]
=
$refundReturn
;
$convertRefundReturn
[
$refundReturn
[
'orderGoodsId'
]]
=
$refundReturn
;
if
(
$
qmDeliverymanLog
[
'orderType'
]
==
ApiConst
::
orderTypeRefund
){
if
(
$
delivery
[
'orderType'
]
==
ApiConst
::
orderTypeRefund
){
$orderGoods
=
$goodsDao
->
convert
(
$this
->
orderGoodsList
,
false
,
$convertRefundReturn
);
$orderGoods
=
$goodsDao
->
convert
(
$this
->
orderGoodsList
,
false
,
$convertRefundReturn
);
}
else
{
}
else
{
$orderGoods
=
$goodsDao
->
convert
(
$this
->
orderGoodsList
);
$orderGoods
=
$goodsDao
->
convert
(
$this
->
orderGoodsList
);
...
...
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