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
384e2116
Commit
384e2116
authored
Dec 04, 2020
by
hezhen
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature_chw_zjw' into dev-chw
parents
fa966a7e
36172dce
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
OrderAccountBiz.java
...ain/java/com/xxfc/platform/order/biz/OrderAccountBiz.java
+2
-2
No files found.
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderAccountBiz.java
View file @
384e2116
...
...
@@ -140,9 +140,9 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
BigDecimal
orderDeductAmount
=
calculateDeduction
(
orderDeductSource
,
timeLag
,
dicParentKey
,
orderRefundDescBuilder
);
Integer
dayLag
=
Long
.
valueOf
(
timeLag
/(
1000L
*
60L
*
60L
*
24L
)).
intValue
();
if
(
dayLag
<=
0
&&
baseOrder
.
getInsureAmount
().
compareTo
(
BigDecimal
.
ZERO
)
>
0
)
{
if
(
dayLag
<=
0
&&
baseOrder
.
get
Person
InsureAmount
().
compareTo
(
BigDecimal
.
ZERO
)
>
0
)
{
//扣钱
orderDeductAmount
=
orderDeductAmount
.
add
(
baseOrder
.
getInsureAmount
());
orderDeductAmount
=
orderDeductAmount
.
add
(
baseOrder
.
get
Person
InsureAmount
());
orderRefundDescBuilder
=
orderRefundDescBuilder
.
insert
(
0
,
"小于24小时扣除保险费"
);
}
...
...
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