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
dab542fc
Commit
dab542fc
authored
Jan 19, 2021
by
yu.sun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sunyu::update::update sdk and fix bug about goodsType
parent
006c010a
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
2 deletions
+8
-2
shopping-cart-application-service/pom.xml
+1
-1
shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartMccafeAdapter.java
+3
-1
shopping-cart-application-service/src/main/java/cn/freemud/enums/GoodsTypeEnum.java
+1
-0
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
+3
-0
No files found.
shopping-cart-application-service/pom.xml
View file @
dab542fc
...
...
@@ -45,7 +45,7 @@
<dependency>
<groupId>
cn.freemud
</groupId>
<artifactId>
assortment-shoppingcart-sdk
</artifactId>
<version>
2.0.2
0
-SNAPSHOT
</version>
<version>
2.0.2
1
-SNAPSHOT
</version>
</dependency>
<!-- 再来一单查询订单信息 -->
<dependency>
...
...
shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartMccafeAdapter.java
View file @
dab542fc
...
...
@@ -171,7 +171,9 @@ public class ShoppingCartMccafeAdapter {
cartGoodsDetailDto
.
setClassificationName
(
cartGoods
.
getClassificationName
());
if
(
GoodsTypeEnum
.
SET_MEAL_GOODS
.
getGoodsType
().
equals
(
cartGoods
.
getGoodsType
()))
{
cartGoodsDetailDto
.
setProductType
(
ProductType
.
SETMEAL
.
getCode
());
}
else
if
(
cartGoods
.
isWeightType
())
{
}
else
if
(
GoodsTypeEnum
.
VIRTUAL_GOODS
.
getGoodsType
().
equals
(
cartGoods
.
getGoodsType
())){
cartGoodsDetailDto
.
setProductType
(
ProductType
.
VIRTUAL_PRODUCT
.
getCode
());
}
else
if
(
cartGoods
.
isWeightType
())
{
cartGoodsDetailDto
.
setProductType
(
ProductType
.
WEIGHT_PRODUCT
.
getCode
());
}
...
...
shopping-cart-application-service/src/main/java/cn/freemud/enums/GoodsTypeEnum.java
View file @
dab542fc
...
...
@@ -23,6 +23,7 @@ public enum GoodsTypeEnum {
SPU_GOODS
(
5
,
"spu商品"
),
REDUCE_PRICE_GOODS
(
6
,
"超值加购商品"
),
ALL_COUPON_GOODS
(
8
,
"万能券商品"
),
VIRTUAL_GOODS
(
9
,
"虚拟商品"
),
MATERIAL
(
88
,
"有加料的商品"
),
EXCEPTION_GOODS
(
99
,
"异常商品:商品菜单变化导致和购物车不商品匹配"
);
private
Integer
goodsType
;
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
View file @
dab542fc
...
...
@@ -1473,7 +1473,10 @@ public class ShoppingCartMCoffeeServiceImpl {
goodsType
=
GoodsTypeEnum
.
SET_MEAL_GOODS
.
getGoodsType
();
}
else
if
(
CommonsConstant
.
COUPON_TYPE
.
equals
(
addShoppingCartGoodsRequestVo
.
getCouponType
())){
goodsType
=
GoodsTypeEnum
.
ALL_COUPON_GOODS
.
getGoodsType
();
}
else
if
(
Objects
.
equals
(
1
,
addShoppingCartGoodsRequestVo
.
getIsMonthCard
())){
goodsType
=
GoodsTypeEnum
.
VIRTUAL_GOODS
.
getGoodsType
();
}
if
(
addShoppingCartGoodsRequestVo
.
getOperationType
()
!=
null
&&
addShoppingCartGoodsRequestVo
.
getOperationType
()
==
2
)
{
goodsType
=
GoodsTypeEnum
.
REDUCE_PRICE_GOODS
.
getGoodsType
();
}
...
...
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