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
a2028d29
Commit
a2028d29
authored
Sep 07, 2018
by
wwccw0591
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pc
parent
8b7ae5c9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
RefundService.php
application/models/Business/Order/RefundService.php
+3
-2
OrderGoods.php
application/models/DAO/Order/OrderGoods.php
+2
-2
No files found.
application/models/Business/Order/RefundService.php
View file @
a2028d29
...
...
@@ -397,6 +397,8 @@ class RefundServiceModel extends \Business\AbstractModel
$refundArray
[
'refund_shipping_type'
]
=
isset
(
$refund
[
'refundShippingType'
])
?
$refund
[
'refundShippingType'
]
:
ApiConst
::
zero
;
$refundArrayUnLine
=
Common
::
convertUnderline
(
$refundArray
);
$state
=
$refundReturnDao
->
addRefundReturn
(
$refundArray
,
$orderInfo
,
$orderGoods
);
$orderDao
->
deleteOrderCache
(
$memberId
,
$orderInfo
[
'orderId'
],
$orderInfo
[
'storeId'
],
true
);
$refundReturnDao
->
deleteRefundCache
(
$memberId
);
if
(
$state
)
{
$refundStateName
=
$refundReturnDao
->
getRefundTextStatus
(
$refundArrayUnLine
);
$orderGoodsDao
->
update
(
array
(
'rec_id'
=>
$orderGoods
[
'recId'
]),
array
(
'refund_state_name'
=>
$refundStateName
,
'refund_id'
=>
$state
));
...
...
@@ -404,8 +406,7 @@ class RefundServiceModel extends \Business\AbstractModel
if
(
$orderInfo
[
'orderState'
]
==
ApiConst
::
orderStateWaitRecieve
)
{
$orderDao
->
editOrderLock
(
$orderInfo
[
'orderId'
]);
}
$orderDao
->
deleteOrderCache
(
$memberId
,
$orderInfo
[
'orderId'
],
$orderInfo
[
'storeId'
],
true
);
$refundReturnDao
->
deleteRefundCache
(
$memberId
);
return
$state
;
}
else
{
...
...
application/models/DAO/Order/OrderGoods.php
View file @
a2028d29
...
...
@@ -112,10 +112,10 @@ class OrderGoodsModel extends \DAO\AbstractModel {
// return \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'getOrderGoodsByOrderIds'), array($memberId));
// }
if
(
$orderIds
){
return
\Our\RedisHelper
::
delCachedFunction
(
\Redis\Db5\OrderRedisModel
::
getInstance
(),
array
(
&
$this
,
'getOrderGoodsByOrderIds'
),
array
(
$orderIds
),
array
(
$orderIds
));
return
\Our\RedisHelper
::
delCachedFunction
(
\Redis\Db5\OrderRedisModel
::
getInstance
(),
array
(
&
$this
,
'getOrderGoodsByOrderIds'
),
array
(),
array
(
$orderIds
));
}
if
(
!
empty
(
$storeId
)){
return
\Our\RedisHelper
::
delCachedFunction
(
\Redis\Db5\OrderRedisModel
::
getInstance
(),
array
(
&
$this
,
'getOrderGoodsCountByStoreId'
),
array
(
$storeId
),
array
(
$storeId
));
return
\Our\RedisHelper
::
delCachedFunction
(
\Redis\Db5\OrderRedisModel
::
getInstance
(),
array
(
&
$this
,
'getOrderGoodsCountByStoreId'
),
array
(),
array
(
$storeId
));
}
}
public
function
getIsRefundMoney
(
$orderGoodses
,
$promotionsId
){
...
...
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