Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
rs-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
周健威
rs-cloud-platform
Commits
8de33ae4
Commit
8de33ae4
authored
Dec 29, 2020
by
unset
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加通知信息
parent
c91c9518
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
3 deletions
+1
-3
OrderInfoBiz.java
...java/com/upyuns/platform/rs/website/biz/OrderInfoBiz.java
+1
-3
No files found.
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/OrderInfoBiz.java
View file @
8de33ae4
...
@@ -383,6 +383,7 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
...
@@ -383,6 +383,7 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
orderInfo
.
setRemark
(
orderInfoDto
.
getRemark
());
orderInfo
.
setRemark
(
orderInfoDto
.
getRemark
());
orderInfo
.
setAmount
(
new
BigDecimal
(
amount
.
get
()));
orderInfo
.
setAmount
(
new
BigDecimal
(
amount
.
get
()));
orderInfo
.
setNumber
(
number
.
get
());
orderInfo
.
setNumber
(
number
.
get
());
orderInfo
.
setTotalAmount
(
orderInfo
.
getAmount
());
//订单发票信息
//订单发票信息
if
(
orderInfoDto
.
getUserInvoiceId
()
!=
null
)
{
if
(
orderInfoDto
.
getUserInvoiceId
()
!=
null
)
{
UserInvoice
userInvoice
=
userInvoiceBiz
.
selectById
(
orderInfoDto
.
getUserInvoiceId
());
UserInvoice
userInvoice
=
userInvoiceBiz
.
selectById
(
orderInfoDto
.
getUserInvoiceId
());
...
@@ -408,11 +409,8 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
...
@@ -408,11 +409,8 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
if
(
dictionary
!=
null
&&
StringUtils
.
isNotBlank
(
dictionary
.
getDetail
()))
{
if
(
dictionary
!=
null
&&
StringUtils
.
isNotBlank
(
dictionary
.
getDetail
()))
{
orderInfo
.
setFee
(
new
BigDecimal
(
dictionary
.
getDetail
()));
orderInfo
.
setFee
(
new
BigDecimal
(
dictionary
.
getDetail
()));
}
}
if
(
orderInfo
.
getFee
()
!=
null
)
{
if
(
orderInfo
.
getFee
()
!=
null
)
{
orderInfo
.
setTotalAmount
(
orderInfo
.
getAmount
().
add
(
orderInfo
.
getFee
()));
orderInfo
.
setTotalAmount
(
orderInfo
.
getAmount
().
add
(
orderInfo
.
getFee
()));
}
else
{
orderInfo
.
setTotalAmount
(
orderInfo
.
getAmount
());
}
}
}
}
}
}
...
...
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