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
f33b5737
Commit
f33b5737
authored
Sep 25, 2020
by
徐康
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/bugfix/20200924_修复问题临时分支' into bugfix/20200924_修复问题临时分支
parents
a54949cb
e25391d1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletions
+5
-1
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
+5
-1
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
View file @
f33b5737
...
@@ -580,7 +580,11 @@ public class ShoppingCartMCoffeeServiceImpl {
...
@@ -580,7 +580,11 @@ public class ShoppingCartMCoffeeServiceImpl {
cartGoods
.
setSpuId
(
orderItem
.
getProductId
());
cartGoods
.
setSpuId
(
orderItem
.
getProductId
());
cartGoods
.
setSkuId
(
orderItem
.
getProductSpec
());
cartGoods
.
setSkuId
(
orderItem
.
getProductSpec
());
if
(
6
==
orderItem
.
getProductType
())
{
if
(
6
==
orderItem
.
getProductType
())
{
cartGoods
.
setGoodsType
(
3
);
cartGoods
.
setGoodsType
(
com
.
freemud
.
sdk
.
api
.
assortment
.
shoppingcart
.
constant
.
GoodsTypeEnum
.
SET_MEAL_GOODS
.
getGoodsType
());
}
else
if
(
10
==
orderItem
.
getProductType
())
{
cartGoods
.
setGoodsType
(
com
.
freemud
.
sdk
.
api
.
assortment
.
shoppingcart
.
constant
.
GoodsTypeEnum
.
SKU_GOODS
.
getGoodsType
());
}
else
{
cartGoods
.
setGoodsType
(
com
.
freemud
.
sdk
.
api
.
assortment
.
shoppingcart
.
constant
.
GoodsTypeEnum
.
COMMON_GOODS
.
getGoodsType
());
}
}
if
((
"早餐啡常搭"
.
equals
(
orderItem
.
getProductName
())
&&
"早餐啡常搭"
.
equals
(
orderItem
.
getProductSpecName
()))
if
((
"早餐啡常搭"
.
equals
(
orderItem
.
getProductName
())
&&
"早餐啡常搭"
.
equals
(
orderItem
.
getProductSpecName
()))
||
(
"啡常搭"
.
equals
(
orderItem
.
getProductName
())
&&
"啡常搭"
.
equals
(
orderItem
.
getProductSpecName
())))
{
||
(
"啡常搭"
.
equals
(
orderItem
.
getProductName
())
&&
"啡常搭"
.
equals
(
orderItem
.
getProductSpecName
())))
{
...
...
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