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
f03c3ee7
Commit
f03c3ee7
authored
Nov 24, 2020
by
xiaoer.li@freemud.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
b303a1a8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
0 deletions
+16
-0
shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
+1
-0
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
+7
-0
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingDiscountService.java
+8
-0
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
View file @
f03c3ee7
...
@@ -95,6 +95,7 @@ public enum ResponseResult {
...
@@ -95,6 +95,7 @@ public enum ResponseResult {
SHOPPING_CART_HG_COUPON_NOT_EXIST
(
"44027"
,
"换购券不存在"
),
SHOPPING_CART_HG_COUPON_NOT_EXIST
(
"44027"
,
"换购券不存在"
),
SHOPPING_CART_LIMIT_ADD
(
"44025"
,
"加购数量超过限制"
),
SHOPPING_CART_LIMIT_ADD
(
"44025"
,
"加购数量超过限制"
),
SHOPPING_CART_GOODS_CHECK_ERROR
(
"44028"
,
"当前餐盘中没有可用券的饮品"
),
SHOPPING_CART_GOODS_CHECK_ERROR
(
"44028"
,
"当前餐盘中没有可用券的饮品"
),
SHOPPING_CART_NO_MEAL
(
"44029"
,
"无固定搭配套餐请至少选择一个可选商品"
),
/**
/**
* 订单状态码
* 订单状态码
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
View file @
f03c3ee7
...
@@ -949,6 +949,13 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
...
@@ -949,6 +949,13 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
}
}
}
}
}
}
if
(
GoodsTypeEnum
.
SET_MEAL_GOODS
.
getGoodsType
().
equals
(
cartGoods
.
getGoodsType
()))
{
if
(
CollectionUtils
.
isEmpty
(
cartGoods
.
getProductGroupList
())
&&
CollectionUtils
.
isEmpty
(
cartGoods
.
getProductComboList
()))
{
cartGoodsList
.
remove
(
i
);
throw
new
ServiceException
(
ResponseResult
.
SHOPPING_CART_NO_MEAL
);
}
}
}
}
// 当加价购商品不为空时
// 当加价购商品不为空时
if
(
CollectionUtils
.
isNotEmpty
(
sendGoodsList
))
{
if
(
CollectionUtils
.
isNotEmpty
(
sendGoodsList
))
{
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingDiscountService.java
View file @
f03c3ee7
...
@@ -120,6 +120,14 @@ public class CalculationSharingDiscountService {
...
@@ -120,6 +120,14 @@ public class CalculationSharingDiscountService {
}
}
}
}
}
}
if
(
GoodsTypeEnum
.
SET_MEAL_GOODS
.
getGoodsType
().
equals
(
cartGoods
.
getGoodsType
()))
{
if
(
CollectionUtils
.
isEmpty
(
cartGoods
.
getProductGroupList
())
&&
CollectionUtils
.
isEmpty
(
cartGoods
.
getProductComboList
()))
{
cartGoodsList
.
remove
(
i
);
throw
new
ServiceException
(
ResponseResult
.
SHOPPING_CART_NO_MEAL
);
}
}
}
}
/*加价购商品不为空*/
/*加价购商品不为空*/
...
...
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