Merge remote-tracking branch 'origin/master'

shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java

@@ -89,6 +89,8 @@ public enum ResponseResult {
     SHOPPING_CART_GOODS_COUPON_CAN_NOT_USE("44022", "已加入同样优惠券，第二张暂不可用"),
     SHOPPING_CART_PRODUCT_CAN_NOT_USE("44023", "商品不可用"),
     SHOPPING_CART_COUPON_CAN_NOT_USE("44024", "商品券不可用"),
+    SHOPPING_CART_LIMIT_ADD("44025", "加购数量超过限制"),
+
     /**
      * 订单状态码
      */

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

@@ -208,7 +208,7 @@ public class AssortmentSdkService {
         checkCartRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
         checkCartRequest.setMenuType(BusinessTypeEnum.getByType(menuType).getCode());
         BaseResponse<CheckCartRequest> baseResponse ;
-        baseResponse= shoppingCartService.checkAllCartGoodsForMCoffee(checkCartRequest);
+        baseResponse= shoppingCartService.checkAllCartGoodsNew(checkCartRequest);
         if (baseResponse == null) {
             return null;
         }
@@ -253,4 +253,4 @@ public class AssortmentSdkService {
         cartParamDto.setStoreId(storeId);
         return cartParamDto;
     }
-}
\ No newline at end of file
+}