Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
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
youjj
cloud-platform
Commits
b648c373
Commit
b648c373
authored
Nov 12, 2020
by
周健威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改退款问题
parent
1455e501
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
OrderAccountBiz.java
...ain/java/com/xxfc/platform/order/biz/OrderAccountBiz.java
+4
-1
No files found.
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderAccountBiz.java
View file @
b648c373
...
@@ -650,17 +650,20 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
...
@@ -650,17 +650,20 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
).
map
(
OrderAccountDeduction:
:
getAmount
).
reduce
(
BigDecimal
.
ZERO
,
BigDecimal:
:
add
);
).
map
(
OrderAccountDeduction:
:
getAmount
).
reduce
(
BigDecimal
.
ZERO
,
BigDecimal:
:
add
);
BigDecimal
toExtendDeduction
=
oad
.
getOriginOrderAmount
().
subtract
(
toOdDeduction
);
BigDecimal
toExtendDeduction
=
oad
.
getOriginOrderAmount
().
subtract
(
toOdDeduction
);
BigDecimal
residueOrderAmount
=
oad
.
getOriginOrderAmount
().
subtract
(
toOdDeduction
);
//如果订单原款 - 扣费 小于零,则押金有额外扣费
//如果订单原款 - 扣费 小于零,则押金有额外扣费
if
(
toExtendDeduction
.
compareTo
(
BigDecimal
.
ZERO
)
<
0
)
{
if
(
toExtendDeduction
.
compareTo
(
BigDecimal
.
ZERO
)
<
0
)
{
//置反
//置反
去用押金抵扣
toExtendDeduction
=
BigDecimal
.
ZERO
.
subtract
(
toExtendDeduction
);
toExtendDeduction
=
BigDecimal
.
ZERO
.
subtract
(
toExtendDeduction
);
residueOrderAmount
=
BigDecimal
.
ZERO
;
}
else
{
}
else
{
//否则 则置为零
//否则 则置为零
toExtendDeduction
=
BigDecimal
.
ZERO
;
toExtendDeduction
=
BigDecimal
.
ZERO
;
}
}
oad
.
setDepositAmount
(
oad
.
getOriginDepositAmount
().
subtract
(
toDeduction
).
subtract
(
toExtendDeduction
));
oad
.
setDepositAmount
(
oad
.
getOriginDepositAmount
().
subtract
(
toDeduction
).
subtract
(
toExtendDeduction
));
oad
.
setOrderAmount
(
residueOrderAmount
);
}
}
private
void
handleViolateDetail
(
DeductionTypeEnum
dte
,
OrderAccountDetail
oad
,
DedDetailDTO
vio
,
CancelStartedVO
csv
)
{
private
void
handleViolateDetail
(
DeductionTypeEnum
dte
,
OrderAccountDetail
oad
,
DedDetailDTO
vio
,
CancelStartedVO
csv
)
{
...
...
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