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
4b9b1a27
Commit
4b9b1a27
authored
Nov 13, 2019
by
周健威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改扩展明细
parent
2998c311
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
0 deletions
+4
-0
OrderCalculateBiz.java
.../com/xxfc/platform/order/biz/inner/OrderCalculateBiz.java
+4
-0
No files found.
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCalculateBiz.java
View file @
4b9b1a27
...
@@ -207,17 +207,21 @@ public class OrderCalculateBiz {
...
@@ -207,17 +207,21 @@ public class OrderCalculateBiz {
BigDecimal
residueAmount
=
BigDecimal
.
ZERO
;
BigDecimal
residueAmount
=
BigDecimal
.
ZERO
;
for
(
int
i
=
useDays
;
i
<
vehicleItemDTO
.
getTotalNum
();
i
++)
{
for
(
int
i
=
useDays
;
i
<
vehicleItemDTO
.
getTotalNum
();
i
++)
{
residueAmount
=
residueAmount
.
add
(
vmcpds
.
get
(
i
).
getPrice
());
residueAmount
=
residueAmount
.
add
(
vmcpds
.
get
(
i
).
getPrice
());
inProgressVO
.
getViolateAmountList
().
add
(
vmcpds
.
get
(
i
));
}
}
String
violateDesc
=
StrUtil
.
format
(
"{}元"
,
residueAmount
.
toString
());
String
violateDesc
=
StrUtil
.
format
(
"{}元"
,
residueAmount
.
toString
());
if
(
residueDays
>=
2
)
{
if
(
residueDays
>=
2
)
{
residueDays
=
2
;
residueDays
=
2
;
residueAmount
=
BigDecimal
.
ZERO
;
residueAmount
=
BigDecimal
.
ZERO
;
inProgressVO
.
setViolateAmountList
(
CollUtil
.
newArrayList
());
for
(
int
i
=
useDays
;
i
<
(
useDays
+
residueDays
);
i
++)
{
for
(
int
i
=
useDays
;
i
<
(
useDays
+
residueDays
);
i
++)
{
residueAmount
=
residueAmount
.
add
(
vmcpds
.
get
(
i
).
getPrice
());
residueAmount
=
residueAmount
.
add
(
vmcpds
.
get
(
i
).
getPrice
());
inProgressVO
.
getViolateAmountList
().
add
(
vmcpds
.
get
(
i
));
inProgressVO
.
getViolateAmountList
().
add
(
vmcpds
.
get
(
i
));
}
}
violateDesc
+=
StrUtil
.
format
(
"(封顶{}元)"
,
residueAmount
);
violateDesc
+=
StrUtil
.
format
(
"(封顶{}元)"
,
residueAmount
);
}
}
inProgressVO
.
setViolateAmount
(
residueAmount
);
inProgressVO
.
setViolateAmount
(
residueAmount
);
inProgressVO
.
setViolateDesc
(
" 提前还车违约金:"
+
violateDesc
);
inProgressVO
.
setViolateDesc
(
" 提前还车违约金:"
+
violateDesc
);
OrderAccountDeduction
violateDeduction
=
orderAccountBiz
.
initDeduction
(
inProgressVO
.
getViolateAmount
(),
violateDesc
,
DeductionTypeEnum
.
VIOLATE_ADVANCE
,
OrderAccountDeduction
.
ORIGIN_DEPOSIT
);
OrderAccountDeduction
violateDeduction
=
orderAccountBiz
.
initDeduction
(
inProgressVO
.
getViolateAmount
(),
violateDesc
,
DeductionTypeEnum
.
VIOLATE_ADVANCE
,
OrderAccountDeduction
.
ORIGIN_DEPOSIT
);
...
...
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