Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
Overview
Overview
Details
Activity
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
order-group-application
order-group
Commits
1c9d4c57
Commit
1c9d4c57
authored
Jul 17, 2020
by
xiaoer.li@freemud.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixbug
parent
c7104f76
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
+2
-2
No files found.
order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
View file @
1c9d4c57
...
@@ -238,14 +238,14 @@ public class CheckOrder {
...
@@ -238,14 +238,14 @@ public class CheckOrder {
if
(!
Arrays
.
asList
(
1
,
2
).
contains
(
storeDeliveryInfoDto
.
getDeliveryCondition
()))
{
if
(!
Arrays
.
asList
(
1
,
2
).
contains
(
storeDeliveryInfoDto
.
getDeliveryCondition
()))
{
throw
new
ServiceException
(
ResponseResult
.
STORE_DISCONTENT_DELIVERY_CONDITION
);
throw
new
ServiceException
(
ResponseResult
.
STORE_DISCONTENT_DELIVERY_CONDITION
);
}
}
if
(
"1"
.
equals
(
storeDeliveryInfoDto
))
{
if
(
1
==
storeDeliveryInfoDto
.
getDeliveryCondition
(
))
{
int
sum
=
shoppingCartGoodsDto
.
getProducts
().
stream
().
mapToInt
(
ShoppingCartGoodsDto
.
CartGoodsDetailDto
::
getQty
).
sum
();
int
sum
=
shoppingCartGoodsDto
.
getProducts
().
stream
().
mapToInt
(
ShoppingCartGoodsDto
.
CartGoodsDetailDto
::
getQty
).
sum
();
if
(
sum
<
storeDeliveryInfoDto
.
getFreeDeliveryCup
())
{
if
(
sum
<
storeDeliveryInfoDto
.
getFreeDeliveryCup
())
{
throw
new
ServiceException
(
ResponseResult
.
STORE_DISCONTENT_DELIVERY_CUP
);
throw
new
ServiceException
(
ResponseResult
.
STORE_DISCONTENT_DELIVERY_CUP
);
}
}
}
}
//订单金额小于起送费提示
//订单金额小于起送费提示
else
if
(
"2"
.
equals
(
storeDeliveryInfoDto
)
&&
storeDeliveryInfoDto
.
getDeliveryLimitAmount
()
>
shoppingCartGoodsDto
.
getTotalAmount
())
{
else
if
(
2
==
storeDeliveryInfoDto
.
getDeliveryCondition
(
)
&&
storeDeliveryInfoDto
.
getDeliveryLimitAmount
()
>
shoppingCartGoodsDto
.
getTotalAmount
())
{
throw
new
ServiceException
(
ResponseResult
.
STORE_DISCONTENT_DELIVERY_FEE
);
throw
new
ServiceException
(
ResponseResult
.
STORE_DISCONTENT_DELIVERY_FEE
);
}
}
...
...
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