围餐

shopping-cart-application-service/src/main/java/cn/freemud/aop/IsConvertEnAspect.java

 package cn.freemud.aop;
 
 import cn.freemud.base.entity.BaseResponse;
-import cn.freemud.enums.ResponseResult;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;

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

@@ -97,13 +97,15 @@ public class ShoppingCartMealServiceImpl implements ShoppingCartNewService {
 
     @Override
     public BaseResponse addGoods(AddShoppingCartGoodsRequestVo requestVo) {
-
         // 获取用户信息
         CustomerInfoVo customerInfo = getCustomerInfoVo(requestVo.getSessionId());
-        //todo 单元测试使用
-        //customerInfo = test(customerInfo, requestVo.getSessionId());
-
-        checkBase(customerInfo);
+        if (customerInfo == null || customerInfo.getMemberId() == null) {
+            return ResponseUtil.error(ResponseResult.NOT_LOGIN);
+        }
+        if (StringUtils.isBlank(customerInfo.getTableNumber()) || StringUtils.isBlank(customerInfo.getStoreId()) || StringUtils.isBlank(customerInfo.getPartnerId())) {
+            return ResponseUtil.error(ResponseResult.SHOPPING_CART_NO_BIND_TABLE_NUMBER);
+        }
+//        checkBase(customerInfo);
         String userId = customerInfo.getMemberId();
         String partnerId = customerInfo.getPartnerId();
         String storeId = customerInfo.getStoreId();
@@ -129,7 +131,7 @@ public class ShoppingCartMealServiceImpl implements ShoppingCartNewService {
         List<ProductBeanDTO> productBeanListSpuClass =
                 assortmentSdkService.getProductsInfoSdk(partnerId, storeId, Collections.singletonList(spuId2), BusinessTypeEnum.SAAS_WC.getName(), mealCartBaseService);
         if (productBeanListSpuClass == null) {
-            throw new ServiceException(ResponseResult.SHOPPING_CART_ADD_ERROR);
+            return ResponseUtil.error(ResponseResult.SHOPPING_CART_ADD_ERROR);
         }
         //缓存中获取购物车商品信息
         // 注意，围餐和点餐redis数据结构不一样