套餐价格问题

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartMccafeAdapter.java

@@ -152,7 +152,7 @@ public class ShoppingCartMccafeAdapter {
         cartGoodsDetailDto.setSkuName(StringUtils.isEmpty(cartGoods.getSkuName()) ? cartGoods.getSpuName() : cartGoods.getSkuName());
         cartGoodsDetailDto.setOriginalPrice(cartGoods.getOriginalPrice());
 //        cartGoodsDetailDto.setTotalDiscountAmount(0);
-        cartGoodsDetailDto.setSalePrice(cartGoods.getOriginalPrice());
+        cartGoodsDetailDto.setSalePrice(cartGoods.getFinalPrice());
         cartGoodsDetailDto.setPicture(cartGoods.getPic());
         cartGoodsDetailDto.setQty(cartGoods.getQty());
         cartGoodsDetailDto.setActivityType(cartGoods.getActivityType());

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java

@@ -1890,6 +1890,7 @@ public class ShoppingCartMCoffeeServiceImpl {
             if (CollectionUtils.isNotEmpty(validateResult.getFailureList())){
                 List<String> invalidSpu = new ArrayList<>();
                 List<String> notFoundSpu = new ArrayList<>();
+                List<String> numErrorSpu = new ArrayList<>();
                 List<String> changePriceSpu = new ArrayList<>();
                 List<String> disableCoupon = new ArrayList<>();
                 for (int i = 0; i < validateResult.getFailureList().size(); i++) {
@@ -1919,6 +1920,15 @@ public class ShoppingCartMCoffeeServiceImpl {
                                 cartGoods.setCartGoodsUid(null);
                                 break;
                             }
+                            if (111 == validaProduct.getCode() || 112 == validaProduct.getCode()) {
+                                numErrorSpu.add(spuName);
+                                if (StringUtils.isNotEmpty(couponName)){
+                                    disableCoupon.add(couponName);
+                                }
+                                cartGoodsStates.setHasInvalidGoods(true);
+                                cartGoods.setCartGoodsUid(null);
+                                break;
+                            }
                             if (PRODUCT_PRICE_CHANGE == validaProduct.getCode()) {
                                 changePriceSpu.add(spuName);
                                 shoppingCartConvertAdapter.updateCartGoodsInfo(cartGoods, validaProduct.getProductType(), validaProduct.getSubProductTypeMap());
@@ -1947,6 +1957,9 @@ public class ShoppingCartMCoffeeServiceImpl {
                 if (CollectionUtils.isNotEmpty(changePriceSpu)){
                     toastMsg = toastMsg.concat(CART_PRODUCT_PRICE_CHANGE.replace("$spuName",StringUtils.join(changePriceSpu,",")));
                 }
+                if (CollectionUtils.isNotEmpty(numErrorSpu)){
+                    toastMsg = toastMsg.concat("您选择的【$spuName】不满足购买条件".replace("$spuName",StringUtils.join(numErrorSpu,",")));
+                }
 
                 if (CollectionUtils.isNotEmpty(disableCoupon)){
                     toastMsg = toastMsg.concat(COUPON_IS_DISABLE.replace("$couponName",StringUtils.join(disableCoupon,",")));