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
44d1902a
Commit
44d1902a
authored
Nov 30, 2018
by
christ
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
退款退货
parent
caa44875
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
RefundService.php
application/models/Business/Order/RefundService.php
+1
-1
OrderGoods.php
application/models/DAO/Order/OrderGoods.php
+4
-2
No files found.
application/models/Business/Order/RefundService.php
View file @
44d1902a
...
@@ -956,7 +956,7 @@ class RefundServiceModel extends \Business\AbstractModel
...
@@ -956,7 +956,7 @@ class RefundServiceModel extends \Business\AbstractModel
}
}
}
}
}
else
{
}
else
{
$refundAmount
=
$orderGoods
[
'goodsPrice'
];
$refundAmount
=
$orderGoods
[
'goodsPrice'
]
*
$orderGoods
[
'goodsNum'
]
;
}
}
$returnData
[
'refundAmount'
]
=
$refundAmount
-
$orderInfo
[
'refundAmount'
]
-
$returnData
[
'needShippingFee'
]
+
$shippingFee
;
$returnData
[
'refundAmount'
]
=
$refundAmount
-
$orderInfo
[
'refundAmount'
]
-
$returnData
[
'needShippingFee'
]
+
$shippingFee
;
// if($orderGoods['goodsType']==ApiConst::goodsTypeFour){
// if($orderGoods['goodsType']==ApiConst::goodsTypeFour){
...
...
application/models/DAO/Order/OrderGoods.php
View file @
44d1902a
...
@@ -156,13 +156,15 @@ class OrderGoodsModel extends \DAO\AbstractModel {
...
@@ -156,13 +156,15 @@ class OrderGoodsModel extends \DAO\AbstractModel {
}
}
//获得已经退款退货的商品id
//获得已经退款退货的商品id
public
function
getRefundOrderGoodsIds
(
$orderGoods
){
public
function
getRefundOrderGoodsIds
(
$orderGoods
){
$newOrderGoods
=
array
();
$orderGoods
=
array_values
(
$orderGoods
);
$orderGoods
=
array_values
(
$orderGoods
);
for
(
$i
=
ApiConst
::
zero
;
$i
<
count
(
$orderGoods
);
$i
++
){
for
(
$i
=
ApiConst
::
zero
;
$i
<
count
(
$orderGoods
);
$i
++
){
if
(
$orderGoods
[
$i
][
'refundId'
]
!=
ApiConst
::
zero
){
if
(
$orderGoods
[
$i
][
'refundId'
]
!=
ApiConst
::
zero
){
unset
(
$orderGoods
[
$i
]);
array_push
(
$newOrderGoods
,
$orderGoods
);
// unset($orderGoods[$i]);
}
}
}
}
return
array_column
(
$
o
rderGoods
,
'goodsId'
);
return
array_column
(
$
newO
rderGoods
,
'goodsId'
);
}
}
/**
/**
* 根据订单id 获得订单商品记录
* 根据订单id 获得订单商品记录
...
...
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