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
3bb6eb3f
Commit
3bb6eb3f
authored
Nov 05, 2020
by
yu.sun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sunyu::update::checkout cartInfo about coupon disable
parent
c9fac5bb
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
0 deletions
+17
-0
assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/constant/ShoppingCartConstant.java
+5
-0
assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/domain/CartGoods.java
+4
-0
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
+8
-0
No files found.
assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/constant/ShoppingCartConstant.java
View file @
3bb6eb3f
...
@@ -51,6 +51,11 @@ public class ShoppingCartConstant {
...
@@ -51,6 +51,11 @@ public class ShoppingCartConstant {
public
static
final
String
CART_PRODUCT_INVALID_STATE
=
"您选择的【$spuName】商品已失效;"
;
public
static
final
String
CART_PRODUCT_INVALID_STATE
=
"您选择的【$spuName】商品已失效;"
;
/**
/**
* 优惠券不满足使用条件
*/
public
static
final
String
COUPON_IS_DISABLE
=
"您选择的【$couponName】不满足使用条件"
;
/**
* 必选商品组无勾选商品
* 必选商品组无勾选商品
*/
*/
public
static
final
int
PRODUCT_GROUP_EMPTY
=
109
;
public
static
final
int
PRODUCT_GROUP_EMPTY
=
109
;
...
...
assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/domain/CartGoods.java
View file @
3bb6eb3f
...
@@ -51,6 +51,10 @@ public class CartGoods {
...
@@ -51,6 +51,10 @@ public class CartGoods {
* 商品券code
* 商品券code
*/
*/
private
String
couponCode
;
private
String
couponCode
;
/**
* 商品券名称
*/
private
String
couponName
;
private
String
spuId
;
private
String
spuId
;
private
String
skuId
;
private
String
skuId
;
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
View file @
3bb6eb3f
...
@@ -1476,20 +1476,24 @@ public class ShoppingCartMCoffeeServiceImpl {
...
@@ -1476,20 +1476,24 @@ public class ShoppingCartMCoffeeServiceImpl {
List
<
String
>
invalidSpu
=
new
ArrayList
<>();
List
<
String
>
invalidSpu
=
new
ArrayList
<>();
List
<
String
>
notFoundSpu
=
new
ArrayList
<>();
List
<
String
>
notFoundSpu
=
new
ArrayList
<>();
List
<
String
>
changePriceSpu
=
new
ArrayList
<>();
List
<
String
>
changePriceSpu
=
new
ArrayList
<>();
List
<
String
>
disableCoupon
=
new
ArrayList
<>();
for
(
int
i
=
0
;
i
<
validateResult
.
getFailureList
().
size
();
i
++)
{
for
(
int
i
=
0
;
i
<
validateResult
.
getFailureList
().
size
();
i
++)
{
checkCartRequest
.
getShoppingCartGoodsResponseVo
().
setChanged
(
true
);
checkCartRequest
.
getShoppingCartGoodsResponseVo
().
setChanged
(
true
);
ValiadShopProductResult
validaProduct
=
validateResult
.
getFailureList
().
get
(
i
);
ValiadShopProductResult
validaProduct
=
validateResult
.
getFailureList
().
get
(
i
);
for
(
com
.
freemud
.
sdk
.
api
.
assortment
.
shoppingcart
.
domain
.
CartGoods
cartGoods
:
checkCartRequest
.
getCartGoodsList
())
{
for
(
com
.
freemud
.
sdk
.
api
.
assortment
.
shoppingcart
.
domain
.
CartGoods
cartGoods
:
checkCartRequest
.
getCartGoodsList
())
{
if
(
cartGoods
.
getSkuId
().
equals
(
validaProduct
.
getSkuId
()))
{
if
(
cartGoods
.
getSkuId
().
equals
(
validaProduct
.
getSkuId
()))
{
String
spuName
=
null
==
validaProduct
.
getProductType
()
?
cartGoods
.
getSpuName
()
:
validaProduct
.
getProductType
().
getName
();
String
spuName
=
null
==
validaProduct
.
getProductType
()
?
cartGoods
.
getSpuName
()
:
validaProduct
.
getProductType
().
getName
();
String
couponName
=
StringUtils
.
isNotEmpty
(
cartGoods
.
getCouponName
())
?
cartGoods
.
getCouponName
()
:
""
;
if
(
PRODUCT_DOWN
==
validaProduct
.
getCode
())
{
if
(
PRODUCT_DOWN
==
validaProduct
.
getCode
())
{
invalidSpu
.
add
(
spuName
);
invalidSpu
.
add
(
spuName
);
disableCoupon
.
add
(
couponName
);
cartGoodsStates
.
setHasInvalidGoods
(
true
);
cartGoodsStates
.
setHasInvalidGoods
(
true
);
cartGoods
.
setCartGoodsUid
(
null
);
cartGoods
.
setCartGoodsUid
(
null
);
break
;
break
;
}
}
if
(
PRODUCT_NOTFOUND
==
validaProduct
.
getCode
())
{
if
(
PRODUCT_NOTFOUND
==
validaProduct
.
getCode
())
{
notFoundSpu
.
add
(
spuName
);
notFoundSpu
.
add
(
spuName
);
disableCoupon
.
add
(
couponName
);
cartGoodsStates
.
setHasInvalidGoods
(
true
);
cartGoodsStates
.
setHasInvalidGoods
(
true
);
cartGoods
.
setCartGoodsUid
(
null
);
cartGoods
.
setCartGoodsUid
(
null
);
break
;
break
;
...
@@ -1520,6 +1524,10 @@ public class ShoppingCartMCoffeeServiceImpl {
...
@@ -1520,6 +1524,10 @@ public class ShoppingCartMCoffeeServiceImpl {
toastMsg
=
toastMsg
.
concat
(
CART_PRODUCT_PRICE_CHANGE
.
replace
(
"$spuName"
,
StringUtils
.
join
(
changePriceSpu
,
","
)));
toastMsg
=
toastMsg
.
concat
(
CART_PRODUCT_PRICE_CHANGE
.
replace
(
"$spuName"
,
StringUtils
.
join
(
changePriceSpu
,
","
)));
}
}
if
(
CollectionUtils
.
isNotEmpty
(
disableCoupon
)){
toastMsg
=
toastMsg
.
concat
(
COUPON_IS_DISABLE
.
replace
(
"$couponName"
,
StringUtils
.
join
(
disableCoupon
,
","
)));
}
checkCartRequest
.
getShoppingCartGoodsResponseVo
().
setToastMsg
(
toastMsg
);
checkCartRequest
.
getShoppingCartGoodsResponseVo
().
setToastMsg
(
toastMsg
);
setToastMsgIfNotExist
(
checkCartRequest
.
getShoppingCartGoodsResponseVo
(),
com
.
freemud
.
sdk
.
api
.
assortment
.
shoppingcart
.
constant
.
ShoppingCartConstant
.
SHOPPING_CART_GOODS_CHANGE
);
setToastMsgIfNotExist
(
checkCartRequest
.
getShoppingCartGoodsResponseVo
(),
com
.
freemud
.
sdk
.
api
.
assortment
.
shoppingcart
.
constant
.
ShoppingCartConstant
.
SHOPPING_CART_GOODS_CHANGE
);
...
...
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