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
a5858dae
Commit
a5858dae
authored
Dec 30, 2020
by
unset
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加通知信息
parent
aa07254d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
OrderInfoBiz.java
...java/com/upyuns/platform/rs/website/biz/OrderInfoBiz.java
+1
-1
ConfirmOrderService.java
...yuns/platform/rs/website/service/ConfirmOrderService.java
+2
-3
No files found.
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/OrderInfoBiz.java
View file @
a5858dae
...
...
@@ -364,7 +364,7 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
amount
.
updateAndGet
(
v
->
new
Double
((
double
)
(
v
+
totalAmount
.
doubleValue
())));
//下单后删除购物车
shoppingCartInfo
.
setIsDel
(
1
);
shoppingCartInfoBiz
.
updateSelectiveByIdR
e
(
shoppingCartInfo
);
shoppingCartInfoBiz
.
delet
e
(
shoppingCartInfo
);
}
break
;
default
:
...
...
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/service/ConfirmOrderService.java
View file @
a5858dae
...
...
@@ -130,7 +130,6 @@ public class ConfirmOrderService {
}
}
}
if
(
itemInfoDto
.
getType
().
equals
(
OrderTypeEnum
.
SHOPPING_CART_INFO
.
getType
()))
{
ShoppingCartInfo
shoppingCartInfo
=
shoppingCartInfoBiz
.
selectById
(
itemInfoDto
.
getId
());
if
(
shoppingCartInfo
!=
null
)
{
...
...
@@ -149,7 +148,7 @@ public class ConfirmOrderService {
}
}
});
confirmOrderInfoVo
.
setTotalAmount
(
new
BigDecimal
(
amount
.
get
()));
confirmOrderInfoVo
.
setTotalAmount
(
new
BigDecimal
(
amount
.
get
())
.
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
)
);
confirmOrderInfoVo
.
setNumber
(
number
.
get
());
confirmOrderInfoVo
.
setItemInfoVoList
(
itemInfoVoList
);
}
...
...
@@ -160,7 +159,7 @@ public class ConfirmOrderService {
confirmOrderInfoVo
.
setFee
(
new
BigDecimal
(
dictionary
.
getDetail
()));
}
if
(
confirmOrderInfoVo
.
getFee
()
!=
null
)
{
confirmOrderInfoVo
.
setActAmount
(
confirmOrderInfoVo
.
getTotalAmount
().
add
(
confirmOrderInfoVo
.
getFee
()));
confirmOrderInfoVo
.
setActAmount
(
confirmOrderInfoVo
.
getTotalAmount
().
add
(
confirmOrderInfoVo
.
getFee
())
.
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
)
);
}
return
ObjectRestResponse
.
succ
(
confirmOrderInfoVo
);
}
...
...
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