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
09ec18bc
Commit
09ec18bc
authored
Oct 31, 2019
by
周健威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改订单取消修改违约金
parent
cee0521f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
0 deletions
+5
-0
OrderRefundPriceVO.java
...xfc/platform/order/pojo/calculate/OrderRefundPriceVO.java
+1
-0
OrderCalculateBiz.java
.../com/xxfc/platform/order/biz/inner/OrderCalculateBiz.java
+4
-0
No files found.
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/calculate/OrderRefundPriceVO.java
View file @
09ec18bc
...
...
@@ -9,6 +9,7 @@ import java.math.BigDecimal;
BigDecimal
refundAmount
;
BigDecimal
realAmount
;
BigDecimal
cutAmount
;
BigDecimal
topAmount
;
String
refundDesc
;
public
void
setRefundAmount
(
BigDecimal
refundAmount
)
{
...
...
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCalculateBiz.java
View file @
09ec18bc
...
...
@@ -274,6 +274,7 @@ public class OrderCalculateBiz {
StringBuilder
refundDescBuilder
=
new
StringBuilder
(
""
);
String
refundDesc
=
""
;
InProgressVO
inProgressVO
=
new
InProgressVO
();
BigDecimal
topAmount
=
BigDecimal
.
ZERO
;
switch
(
orderTypeEnum
)
{
case
RENT_VEHICLE:
...
...
@@ -287,6 +288,7 @@ public class OrderCalculateBiz {
setType
(
ItemTypeEnum
.
VEHICLE_MODEL
.
getCode
());
setOrderId
(
orderPageVO
.
getId
());
}});
topAmount
=
vehicleItem
.
getUnitPrice
().
multiply
(
new
BigDecimal
(
2
+
""
));
if
(
timeLag
<
0
)
{
OrderAccountDetail
oad
=
new
OrderAccountDetail
();
...
...
@@ -330,6 +332,7 @@ public class OrderCalculateBiz {
BigDecimal
adultItemAmount
=
(
null
==
adultItem
)?
BigDecimal
.
ZERO
:
adultItem
.
getRealAmount
();
BigDecimal
childItemAmount
=
(
null
==
childItem
)?
BigDecimal
.
ZERO
:
childItem
.
getRealAmount
();
topAmount
=
adultItemAmount
.
add
(
childItemAmount
);
BigDecimal
deductionAmount
=
orderAccountBiz
.
calculateDeduction
(
adultItemAmount
.
add
(
childItemAmount
)
,
orderPageVO
.
getOrderTourDetail
().
getStartTime
()
-
System
.
currentTimeMillis
()
...
...
@@ -348,6 +351,7 @@ public class OrderCalculateBiz {
orpv
.
setRealAmount
(
orderPageVO
.
getRealAmount
());
orpv
.
setRefundAmount
(
totalRefundAmount
);
orpv
.
setCutAmount
(
totalDeductAmount
);
orpv
.
setTopAmount
(
topAmount
);
return
orpv
;
}
}
\ No newline at end of file
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