Commit 4a237def by 孙昱

Merge branch 'feature-yu.sun-20200915-new' into qa

parents 85f98f0a af841982
...@@ -248,6 +248,7 @@ public interface ShoppingCartBaseService { ...@@ -248,6 +248,7 @@ public interface ShoppingCartBaseService {
for (int i = 0; i < validateResult.getFailureList().size(); i++) { for (int i = 0; i < validateResult.getFailureList().size(); i++) {
ValiadShopProductResult validaProduct = validateResult.getFailureList().get(i); ValiadShopProductResult validaProduct = validateResult.getFailureList().get(i);
for (CartGoods cartGoods : checkCartRequest.getCartGoodsList()) { for (CartGoods cartGoods : checkCartRequest.getCartGoodsList()) {
checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
if (cartGoods.getCartGoodsUid().equals(validaProduct.getUuid())) { if (cartGoods.getCartGoodsUid().equals(validaProduct.getUuid())) {
String spuName = null == validaProduct.getProductType() ? (StringUtils.isNotEmpty(cartGoods.getSkuName()) ? cartGoods.getSkuName() : String spuName = null == validaProduct.getProductType() ? (StringUtils.isNotEmpty(cartGoods.getSkuName()) ? cartGoods.getSkuName() :
StringUtils.isNotEmpty(cartGoods.getName()) ? cartGoods.getName() : "") : validaProduct.getProductType().getName(); StringUtils.isNotEmpty(cartGoods.getName()) ? cartGoods.getName() : "") : validaProduct.getProductType().getName();
...@@ -255,7 +256,6 @@ public interface ShoppingCartBaseService { ...@@ -255,7 +256,6 @@ public interface ShoppingCartBaseService {
if (StringUtils.isNotEmpty(spuName)){ if (StringUtils.isNotEmpty(spuName)){
invalidSpu.add(spuName); invalidSpu.add(spuName);
} }
checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
cartGoodsStates.setHasInvalidGoods(true); cartGoodsStates.setHasInvalidGoods(true);
cartGoods.setCartGoodsUid(null); cartGoods.setCartGoodsUid(null);
break; break;
...@@ -264,13 +264,11 @@ public interface ShoppingCartBaseService { ...@@ -264,13 +264,11 @@ public interface ShoppingCartBaseService {
if (StringUtils.isNotEmpty(spuName)) { if (StringUtils.isNotEmpty(spuName)) {
notFoundSpu.add(spuName); notFoundSpu.add(spuName);
} }
checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
cartGoodsStates.setHasInvalidGoods(true); cartGoodsStates.setHasInvalidGoods(true);
cartGoods.setCartGoodsUid(null); cartGoods.setCartGoodsUid(null);
break; break;
} }
if (PRODUCT_PRICE_CHANGE == validaProduct.getCode()) { if (PRODUCT_PRICE_CHANGE == validaProduct.getCode()) {
checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
if (StringUtils.isNotEmpty(spuName)) { if (StringUtils.isNotEmpty(spuName)) {
changePriceSpu.add(spuName); changePriceSpu.add(spuName);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment