合并分支

order-application-service/src/main/java/cn/freemud/service/impl/MallOrderServiceImpl.java

@@ -510,7 +510,7 @@ public class MallOrderServiceImpl implements MallOrderService {
         for (CreateOrderProductRequest productDto : createOrderDto.getProducts()) {
             pids.add(productDto.getSpecification());
         }
-        Map<String, GetProductsVo> products = itemService.getProducts(pids, createOrderDto.getCompanyId(), createOrderDto.getShopId());
+        Map<String, GetProductsVo> products = itemService.getSpuProducts(pids, createOrderDto.getCompanyId(), createOrderDto.getShopId(),"saasmall");
         if (products.isEmpty()) {
             return createOrderDto;
         }

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

@@ -33,6 +33,7 @@ import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustome
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO;
 import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
+import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
 import com.freemud.sdk.api.assortment.shoppingcart.request.CheckCartRequest;
 import com.freemud.sdk.api.assortment.shoppingcart.service.ShoppingCartBaseService;
 import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartMallBaseServiceImpl;
@@ -231,7 +232,7 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
         //查询商品信息
         List<String> pids = new ArrayList<>();
         pids.add(cartGoods.getGoodsId());
-        Map<String, GetProductsVo> products = itemService.getProducts(pids, partnerId, storeId);
+        Map<String, GetProductsVo> products = itemService.getProducts(pids, partnerId, storeId,"saasmall");
 
         GetProductsVo getProductsVo = products.get(cartGoods.getGoodsId());
         // 商品没有库存限制
@@ -412,7 +413,7 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
     @Override
     public ActivityCalculationDiscountResponseDto.CalculationDiscountResult getActivityCalculationDiscountResponse(
             String partnerId, String storeId, String userId, String appId, Integer orderType, List<CartGoods> cartGoodsList,
-            List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons, List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList) {
+            List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons, List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList,String menuType) {
         return null;
     }