修改类型

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/AddGoodsByWeixinCardRequestVo.java

@@ -55,5 +55,5 @@ public class AddGoodsByWeixinCardRequestVo {
     /**
      * 业务类型： 0 : 自提 1：外卖 2：微商城
      */
-    private Integer menuType ;
+    private String menuType ;
 }

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/AddShoppingCartGoodsRequestVo.java

@@ -83,6 +83,6 @@ public class AddShoppingCartGoodsRequestVo {
     /**
      * 业务类型： 0 : 自提 1：外卖 2：微商城
      */
-    private Integer menuType ;
+    private String menuType ;
 
 }

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java

@@ -93,7 +93,7 @@ public class ShoppingCartInfoRequestVo {
     /**
      * 业务类型： 0 : 自提 1：外卖 2：微商城
      */
-    private Integer menuType ;
+    private String menuType ;
 
     @Data
     public final static class SendGoods {

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/UpdateShoppingCartGoodsQtyRequestVo.java

@@ -61,6 +61,6 @@ public class UpdateShoppingCartGoodsQtyRequestVo {
     /**
      * 业务类型： 0 : 自提 1：外卖 2：微商城
      */
-    private Integer menuType ;
+    private String menuType ;
 
 }

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

@@ -3,10 +3,10 @@ package cn.freemud.enums;
 import java.util.Arrays;
 
 public enum BusinessTypeEnum {
-    SAAS_PICKUP(0,"自提","saas"),
-    SAAS_DELIVERY(1,"外卖","saas_delivery"),
-    SAAS_MALL(2,"商城","saas_mall"),
-    SAAS_WC(3,"围餐","wc");
+    SAAS_PICKUP(0,"saas","saas"),
+    SAAS_DELIVERY(1,"saasdelivery","saasdelivery"),
+    SAAS_MALL(2,"saasmall","saasmall"),
+    SAAS_WC(3,"wc","wc");
 
 
     private Integer type;
@@ -25,6 +25,12 @@ public enum BusinessTypeEnum {
                 .findFirst().orElse(BusinessTypeEnum.SAAS_PICKUP);
     }
 
+    public static BusinessTypeEnum getByType(String type) {
+        return Arrays.stream(BusinessTypeEnum.values())
+                .filter(e -> e.name.equals(type))
+                .findFirst().orElse(BusinessTypeEnum.SAAS_PICKUP);
+    }
+
     public Integer getType() {
         return type;
     }

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

@@ -137,7 +137,7 @@ public class AssortmentSdkService {
      * @param orderType
      */
     public CheckCartRequest checkShoppingCartSdk(List<CartGoods> oldAllCartGoodsList, String partnerId, String storeId, ShoppingCartGoodsBaseResponseVo shoppingCartGoodsResponseVo
-            , Integer orderType, String tableNumber, Integer menuType ,ShoppingCartBaseService shoppingCartService) {
+            , 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);
@@ -164,7 +164,7 @@ public class AssortmentSdkService {
      * @param goodsIds
      * @return
      */
-    public List<ProductBeanDTO> getProductsInfoSdk(String partnerId, String storeId, List<String> goodsIds,Integer menuType, ShoppingCartBaseService shoppingCartService) {
+    public List<ProductBeanDTO> getProductsInfoSdk(String partnerId, String storeId, List<String> goodsIds,String menuType, ShoppingCartBaseService shoppingCartService) {
         GetProductInfoRequest request = new GetProductInfoRequest();
         request.setGoodsIds(goodsIds);
         request.setPartnerId(partnerId);

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

@@ -149,7 +149,7 @@ public class BuyAndGiftsPromotionService implements IPromotionService {
      * @return
      */
     private List<ProductBeanDTO> buildActivityProduct(ActivityQueryDto activityQueryDto, List<ActivityCalculationDiscountResponseDto
-            .CalculationDiscountResult.SendActivity.SendGoods> sendGoodsList,Integer menuType) {
+            .CalculationDiscountResult.SendActivity.SendGoods> sendGoodsList,String menuType) {
         //获取
         List<String> goodsIds = sendGoodsList.stream().map(ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity.SendGoods::getGoodsId).collect(Collectors.toList());
         List<ProductBeanDTO> productBeanList = assortmentSdkService.getProductsInfoSdk(activityQueryDto.getPartnerId()

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

@@ -240,7 +240,7 @@ public class ShoppingCartMealServiceImpl implements ShoppingCartNewService {
             return;
         }
         //检查购物车中是否存在非法或者价格变更商品
-        CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdk(cartGoodsList, customerInfo.getPartnerId(), customerInfo.getStoreId(), responseVo, orderType, customerInfo.getTableNumber(), BusinessTypeEnum.SAAS_WC.getType(),this.mealCartBaseService);
+        CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdk(cartGoodsList, customerInfo.getPartnerId(), customerInfo.getStoreId(), responseVo, orderType, customerInfo.getTableNumber(), BusinessTypeEnum.SAAS_WC.getName(),this.mealCartBaseService);
         if (checkCartRequest != null) {
             if (checkCartRequest.getShoppingCartGoodsResponseVo() != null && StringUtils.isNotBlank(checkCartRequest.getShoppingCartGoodsResponseVo().getToastMsg())) {
                 responseVo.setToastMsg(checkCartRequest.getShoppingCartGoodsResponseVo().getToastMsg());
@@ -459,7 +459,7 @@ public class ShoppingCartMealServiceImpl implements ShoppingCartNewService {
         //锁定当前所有购物车行
         this.mealCartBaseService.lockCart(partnerId, storeId, tableNumber, cartGoodsList.stream().map(CartGoods::getCartGoodsUid).collect(Collectors.toList()));
         //检查购物车中是否存在非法或者价格变更商品
-        CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdk(cartGoodsList, customerInfo.getPartnerId(), customerInfo.getStoreId(), new ShoppingCartGoodsBaseResponseVo(), shoppingCartInfoRequestVo.getOrderType(), customerInfo.getTableNumber(),BusinessTypeEnum.SAAS_WC.getType() ,this.mealCartBaseService);
+        CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdk(cartGoodsList, customerInfo.getPartnerId(), customerInfo.getStoreId(), new ShoppingCartGoodsBaseResponseVo(), shoppingCartInfoRequestVo.getOrderType(), customerInfo.getTableNumber(),BusinessTypeEnum.SAAS_WC.getName() ,this.mealCartBaseService);
         if (checkCartRequest != null) {
             if (checkCartRequest.getShoppingCartGoodsResponseVo() != null && StringUtils.isNotBlank(checkCartRequest.getShoppingCartGoodsResponseVo().getToastMsg())) {
                 return ResponseUtil.error(ResponseResult.SHOPPING_CART_VERSION_ERROR.getCode(), checkCartRequest.getShoppingCartGoodsResponseVo().getToastMsg(), result);
@@ -498,7 +498,7 @@ public class ShoppingCartMealServiceImpl implements ShoppingCartNewService {
     @Override
     public List<CartGoods> updateCartGoodsLegal(CartGoods cartGoods, String userId, ShoppingCartGoodsBaseResponseVo shoppingCartGoodsResponseVo, AddShoppingCartGoodsRequestVo addShoppingCartGoodsRequestVo, List<CartGoods> oldAllCartGoodsList) {
 
-        CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdk(Collections.singletonList(cartGoods), addShoppingCartGoodsRequestVo.getPartnerId(), addShoppingCartGoodsRequestVo.getShopId(), shoppingCartGoodsResponseVo, addShoppingCartGoodsRequestVo.getOrderType(), addShoppingCartGoodsRequestVo.getTableNumber(),BusinessTypeEnum.SAAS_WC.getType() ,this.mealCartBaseService);
+        CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdk(Collections.singletonList(cartGoods), addShoppingCartGoodsRequestVo.getPartnerId(), addShoppingCartGoodsRequestVo.getShopId(), shoppingCartGoodsResponseVo, addShoppingCartGoodsRequestVo.getOrderType(), addShoppingCartGoodsRequestVo.getTableNumber(),BusinessTypeEnum.SAAS_WC.getName() ,this.mealCartBaseService);
 
         if (checkCartRequest == null) {
             throw new ServiceException(ResponseResult.STORE_ITEM_CHECK_VAILD_ERROR);

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

@@ -842,7 +842,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
      * @param storeId
      */
     private void processSendGoods(List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList
-            , String partnerId, String storeId,Integer menuType, ShoppingCartBaseService shoppingCartService) {
+            , String partnerId, String storeId,String menuType, ShoppingCartBaseService shoppingCartService) {
         List<String> goodsIds = sendGoodsList.parallelStream().map(ShoppingCartInfoRequestVo.SendGoods::getGoodsId).collect(Collectors.toList());
         List<ProductBeanDTO> productBeanList =
                 assortmentSdkService.getProductsInfoSdk(partnerId, storeId, goodsIds, menuType, shoppingCartService);