Merge branch 'feature-yu.sun-20200915' into develop

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/constant/ShoppingCartConstant.java

@@ -33,6 +33,19 @@ public class ShoppingCartConstant {
     public final static String ONE_TRADE_CAN_ONLY_USE_ONE_GOODS_COUPON = "一笔交易仅允许同时使用一张商品券";
     public final static String ORDER_WAY_CHANGE = "切换点餐方式，商品库存和价格等可能会发生变化。";
 
+    /**
+     * 商品价格校验失败
+     */
+    public static final int PRODUCT_PRICE_CHANGE = 102;
+
+    /**
+     * 商品不存在
+     */
+    public static final int PRODUCT_NOTFOUND= 103;
 
+    /**
+     * 商品状态校验失败
+     */
+    public static final int PRODUCT_DOWN= 104;
 }
 

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/ShoppingCartBaseService.java

@@ -48,6 +48,8 @@ import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import static com.freemud.sdk.api.assortment.shoppingcart.constant.ShoppingCartConstant.*;
+
 /**
  * All rights Reserved, Designed By www.freemud.cn
  *
@@ -194,6 +196,88 @@ public interface ShoppingCartBaseService {
         }
     }
 
+    default BaseResponse<CheckCartRequest> checkAllCartGoodsForMCoffee(CheckCartRequest checkCartRequest) {
+        ShoppingCartAdapter shoppingCartAdapter = SDKCommonBaseContextWare.getBean(ShoppingCartAdapter.class);
+        ProductService productService = SDKCommonBaseContextWare.getBean(ProductService.class);
+        try {
+            ValidateShopProductRequest validateShopProductRequest = shoppingCartAdapter.getValidateShopProductRequest(checkCartRequest);
+            com.freemud.application.sdk.api.base.BaseResponse<ValiadShopProductResponse> valiadResponse = productService.validateShopProduct(validateShopProductRequest);
+
+            //TODO 疑问
+            if (valiadResponse == null || !CartResponseConstant.SUCCESS.getCode().equals(valiadResponse.getCode()) || valiadResponse.getData()==null) {
+                checkCartRequest.getCartGoodsList().clear();
+                checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
+                checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(ShoppingCartConstant.SHOPPING_CART_INVALIAD_GOODS);
+                return CartResponseUtil.error(valiadResponse.getMessage(),checkCartRequest);
+            }
+            ValiadShopProductResponse validateResult = valiadResponse.getData();
+            //非法商品（商品是否存在、商品是否处于上架状态）自动移除，返回前端提示
+            if (CollectionUtils.isNotEmpty(validateResult.getFailureList())){
+                for (int i = 0; i < validateResult.getFailureList().size(); i++) {
+                    checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
+                    switch (validateResult.getFailureList().get(i).getCode()){
+                        case PRODUCT_PRICE_CHANGE :
+                            checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(ShoppingCartConstant.SHOPPING_CART_ACTIVITY_CHANGE);
+                            break;
+                        case PRODUCT_NOTFOUND:
+                            checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(ShoppingCartConstant.SHOPPING_CART_EMPTY_GOODS_LIST);
+                            break;
+                        case PRODUCT_DOWN:
+                            checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(ShoppingCartConstant.SHOPPING_CART_INVALID_GOODS_EXIST);
+                            break;
+                        default:
+                            break;
+                    }
+//                    return CartResponseUtil.error(valiadResponse.getMessage(),checkCartRequest);
+                }
+                setToastMsgIfNotExist(checkCartRequest.getShoppingCartGoodsResponseVo(), ShoppingCartConstant.SHOPPING_CART_GOODS_CHANGE);
+                for (CartGoods cartGoods :checkCartRequest.getCartGoodsList()) {
+                    if (validateResult.getFailureList().stream().anyMatch(f->cartGoods.getCartGoodsUid().equals(f.getUuid()))){
+                        cartGoods.setCartGoodsUid(null);
+                        checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
+                        checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(ShoppingCartConstant.SHOPPING_CART_INVALIAD_GOODS);
+                    }
+                }
+                checkCartRequest.getCartGoodsList().removeIf(k ->  StringUtils.isEmpty(k.getCartGoodsUid()));
+            }
+            List<ProductBeanDTO> productList = validateResult.getSuccessList().stream().map(ValiadShopProductResult::getProductType).collect(Collectors.toList());
+            CartGoodsStates cartGoodsStates = new CartGoodsStates();
+            for (CartGoods cartGoods : checkCartRequest.getCartGoodsList()) {
+                // 当goodsId为空或商品是商品券时直接跳过
+                if (StringUtils.isEmpty(cartGoods.getGoodsId()) || Objects.equals(cartGoods.getGoodsType(), GoodsTypeEnum.COUPON_GOODS.getGoodsType())) {
+                    continue;
+                }
+                shoppingCartAdapter.updateCartGoodsInfoNew(cartGoods, productList);
+            }
+            //校验商品券是否有当前点餐方式
+            cartGoodsStates = updateSpqCartGoodsInfo(checkCartRequest.getCartGoodsList(), checkCartRequest.getOrderWay(), checkCartRequest.getPartnerId(), checkCartRequest.getTrackingNo(), cartGoodsStates
+                    , checkCartRequest.getStoreId());
+
+            // 点餐方式改变商品券发生变动
+            if (cartGoodsStates != null && cartGoodsStates.isOrderWayFlag()) {
+                setToastMsgIfNotExist(checkCartRequest.getShoppingCartGoodsResponseVo(), ShoppingCartConstant.ORDER_WAY_CHANGE);
+            }
+            //若商品详情赋值有异常，直接移除购物车
+            if (checkCartRequest.getCartGoodsList().stream().anyMatch(cart -> StringUtils.isEmpty(cart.getCartGoodsUid()))) {
+                checkCartRequest.getCartGoodsList().removeIf(k -> StringUtils.isEmpty(k.getCartGoodsUid()));
+                checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
+                checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(ShoppingCartConstant.SHOPPING_CART_INVALIAD_GOODS);
+            }
+            //todo 小料
+            if (checkCartRequest.getCartGoodsList().stream().anyMatch(cart -> cart.getGoodsType().equals(GoodsTypeEnum.EXCEPTION_GOODS.getGoodsType()))) {
+                checkCartRequest.getCartGoodsList().removeIf(k -> k.getGoodsType().equals(GoodsTypeEnum.EXCEPTION_GOODS.getGoodsType()));
+                checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
+                checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(ShoppingCartConstant.SHOPPING_CART_MATERIAL_ERROR);
+            }
+            return CartResponseUtil.success(checkCartRequest);
+        } catch (Exception e) {
+            ErrorLog.printErrorLog("assortment-shoppingcart-sdk", checkCartRequest.getTrackingNo(), e.getMessage(), "checkAllCartGoods", checkCartRequest, e, Level.ERROR);
+            checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
+            checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(ShoppingCartConstant.SHOPPING_CART_INVALIAD_GOODS);
+            return CartResponseUtil.error(e.getMessage(),checkCartRequest);
+        }
+    }
+
 
 
     /**

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

@@ -172,6 +172,35 @@ public class AssortmentSdkService {
         checkCartRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
         checkCartRequest.setMenuType(BusinessTypeEnum.getByType(menuType).getCode());
         BaseResponse<CheckCartRequest> baseResponse ;
+        baseResponse= shoppingCartService.checkAllCartGoodsForMCoffee(checkCartRequest);
+        if (baseResponse == null) {
+            return null;
+        }
+        return baseResponse.getResult();
+    }
+
+    /**
+     * 调用SDK校验购物车
+     *
+     * @param oldAllCartGoodsList
+     * @param partnerId
+     * @param storeId
+     * @param shoppingCartGoodsResponseVo
+     * @param orderType
+     */
+    public CheckCartRequest checkShoppingCartSdkForMCoffee(List<CartGoods> oldAllCartGoodsList, String partnerId,
+                                                  String storeId, ShoppingCartGoodsBaseResponseVo shoppingCartGoodsResponseVo
+            , Integer orderType, String tableNumber, String menuType ,ShoppingCartBaseService shoppingCartService) {
+        CheckCartRequest checkCartRequest = new CheckCartRequest();
+        checkCartRequest.setCartGoodsList(JSONArray.parseArray(JSONObject.toJSONString(oldAllCartGoodsList), com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.class));
+        checkCartRequest.setOrderWay(orderType);
+        checkCartRequest.setPartnerId(partnerId);
+        checkCartRequest.setShoppingCartGoodsResponseVo(JSONObject.parseObject(JSONObject.toJSONString(shoppingCartGoodsResponseVo), com.freemud.sdk.api.assortment.shoppingcart.domain.ShoppingCartGoodsResponseVo.class));
+        checkCartRequest.setStoreId(storeId);
+        checkCartRequest.setTableNumber(tableNumber);
+        checkCartRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
+        checkCartRequest.setMenuType(BusinessTypeEnum.getByType(menuType).getCode());
+        BaseResponse<CheckCartRequest> baseResponse ;
         baseResponse= shoppingCartService.checkAllCartGoodsNew(checkCartRequest);
         if (baseResponse == null) {
             return null;
@@ -179,6 +208,7 @@ public class AssortmentSdkService {
         return baseResponse.getResult();
     }
 
+
     /**
      * 调用SDK获取商品详情
      *