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
c7eefff6
Commit
c7eefff6
authored
Aug 05, 2019
by
周健威
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/base-modify' into base-modify
parents
52724e58
ff53a8c9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
OrderDepositRefundRecordBiz.java
.../xxfc/platform/order/biz/OrderDepositRefundRecordBiz.java
+1
-1
No files found.
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderDepositRefundRecordBiz.java
View file @
c7eefff6
...
@@ -147,7 +147,7 @@ public class OrderDepositRefundRecordBiz extends BaseBiz<DepositRefundRecordMapp
...
@@ -147,7 +147,7 @@ public class OrderDepositRefundRecordBiz extends BaseBiz<DepositRefundRecordMapp
BeanUtil
.
copyProperties
(
depositRefundRecord
,
newValue
,
CopyOptions
.
create
().
setIgnoreNullValue
(
true
).
setIgnoreError
(
true
));
BeanUtil
.
copyProperties
(
depositRefundRecord
,
newValue
,
CopyOptions
.
create
().
setIgnoreNullValue
(
true
).
setIgnoreError
(
true
));
newValue
.
setAmount
(
orderViolation
.
getPrice
());
newValue
.
setAmount
(
orderViolation
.
getPrice
());
newValue
.
setRestAmount
(
depositRefundRecord
.
getTotalAmount
().
subtract
(
orderViolation
.
getPrice
()));
//减去违章金之后的押金
newValue
.
setRestAmount
(
depositRefundRecord
.
getTotalAmount
().
subtract
(
orderViolation
.
getPrice
()));
//减去违章金之后的押金
newValue
.
setIscomplete
(
tru
e
);
newValue
.
setIscomplete
(
fals
e
);
newValue
.
setId
(
null
);
newValue
.
setId
(
null
);
insertSelectiveRe
(
newValue
);
insertSelectiveRe
(
newValue
);
depositRefundRecord
.
setIsshow
(
false
);
depositRefundRecord
.
setIsshow
(
false
);
...
...
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