多规格问题fix

shopping-cart-application-service/src/main/java/cn/freemud/demo/adapter/manager/ProductDTO2BOAdapter.java

@@ -22,11 +22,11 @@ public class ProductDTO2BOAdapter {
     @Resource
     private MapperFacade mapperFacade;
 
-    public ProductBO convert2ProductBO(ProductBeanDTO productBeanDTO, Map<String, String> idMap) {
+    public ProductBO convert2ProductBO(ProductBeanDTO productBeanDTO) {
 
         ProductBO productBO = BeanUtil.convertBean(productBeanDTO, ProductBO::new);
-        productBO.setSpuId(productBeanDTO.getPid());
-        productBO.setSkuId(idMap.get(productBeanDTO.getPid()));
+        productBO.setGoodsId(productBeanDTO.getPid());
+
         return productBO;
     }
 

shopping-cart-application-service/src/main/java/cn/freemud/demo/entities/bo/goods/GetProductBO.java

@@ -12,6 +12,7 @@ public class GetProductBO {
     private String storeId;
     private List<String> spuid;
     private List<String> skuid;
+    private List<String> goodsId;
     private String menuType;
 
     private Integer couponType;

shopping-cart-application-service/src/main/java/cn/freemud/demo/manager/product/KgdProductServiceImpl.java

@@ -67,21 +67,13 @@ public class KgdProductServiceImpl implements ProductService {
     @Override
     public List<ProductBO> getProductInfo(GetProductBO getProductBO) {
         // 获取添加商品的详细信息
-        if (CollectionUtils.isEmpty(getProductBO.getSkuid()) || (getProductBO.getSkuid().size() == 1 && StringUtils.isBlank(getProductBO.getSkuid().get(0)))){
-            getProductBO.setSkuid(getProductBO.getSpuid());
-        }
+
         List<ProductBeanDTO> productBeanListSpuClass = assortmentSdkService.getProductsInfoSdk(getProductBO.getPartnerId(),
-                        getProductBO.getStoreId(), getProductBO.getSkuid(), getProductBO.getMenuType(), shoppingCartBaseService);
-        List<String> skuid = getProductBO.getSkuid();
-        List<String> spuid = getProductBO.getSpuid();
-        Map<String, String> idMap = new HashMap<>();
-        for (int i = 0; i < getProductBO.getSpuid().size(); i++){
-            idMap.put(spuid.get(i), skuid.get(i));
-        }
+                        getProductBO.getStoreId(), getProductBO.getGoodsId(), getProductBO.getMenuType(), shoppingCartBaseService);
 
         List<ProductBO> productList = new ArrayList<>();
         for (ProductBeanDTO dto : productBeanListSpuClass){
-            ProductBO platformProductBO = productDTO2BOAdapter.convert2ProductBO(dto, idMap);
+            ProductBO platformProductBO = productDTO2BOAdapter.convert2ProductBO(dto);
             productList.add(platformProductBO);
         }
         return productList;

shopping-cart-application-service/src/main/java/cn/freemud/demo/service/AbstractAddGoodsService.java

@@ -283,13 +283,12 @@ public abstract class AbstractAddGoodsService implements AddGoodsService {
             if (checkSpqBO == null){
                 return null;
             }
-            getProductBO.setSpuid(Collections.singletonList(checkSpqBO.getSpuId()));
-            getProductBO.setSkuid(Collections.singletonList(checkSpqBO.getSkuId()));
+            getProductBO.setGoodsId(Collections.singletonList(checkSpqBO.getSkuId()));
             getProductBO.setCouponType(checkSpqBO.getType());
             getProductBO.setActivityCode(checkSpqBO.getDetails().getActive().getActiveCode());
         } else {
-            getProductBO.setSkuid(Collections.singletonList(baseRequestBO.getSkuId()));
-            getProductBO.setSpuid(Collections.singletonList(baseRequestBO.getSpuId()));
+            String goodsId = StringUtils.isEmpty(baseRequestBO.getSkuId()) ? baseRequestBO.getSpuId() : baseRequestBO.getSkuId();
+            getProductBO.setGoodsId(Collections.singletonList(goodsId));
         }
 
         return getProductBO;
@@ -937,7 +936,7 @@ public abstract class AbstractAddGoodsService implements AddGoodsService {
         getProductStock.setPartnerId(baseRequestDTO.getPartnerId());
         getProductStock.setStoreId(baseRequestDTO.getShopId());
         List<Long> productIds = new ArrayList<>();
-        productIds.add(Long.parseLong(checkBussinessRulesBO.getProduct().getSkuId()));
+        productIds.add(Long.parseLong(checkBussinessRulesBO.getProduct().getGoodsId()));
         getProductStock.setProductIds(productIds);
 
 

shopping-cart-application-service/src/main/java/cn/freemud/demo/service/AbstractApportionService.java

@@ -991,8 +991,7 @@ public class AbstractApportionService implements GetShoppingCartGoodsApportionSe
         getProductBO.setMenuType(baseRequestDTO.getMenuType());
         getProductBO.setPartnerId(baseRequestDTO.getPartnerId());
         getProductBO.setStoreId(baseRequestDTO.getShopId());
-        getProductBO.setSpuid(goodsIds);
-        getProductBO.setSkuid(goodsIds);
+        getProductBO.setGoodsId(goodsIds);
 
         List<ProductBO> productsInfo = productManager.getProductsInfo(getProductBO, baseRequestDTO.getManagerService().getProductService());
 

shopping-cart-application-service/src/main/java/cn/freemud/demo/service/AbstractListCartGoodsService.java

@@ -840,8 +840,7 @@ public class AbstractListCartGoodsService implements ListCartGoodsService {
         getProductBO.setMenuType(baseRequestDTO.getMenuType());
         getProductBO.setPartnerId(baseRequestDTO.getPartnerId());
         getProductBO.setStoreId(baseRequestDTO.getShopId());
-        getProductBO.setSpuid(goodsIds);
-        getProductBO.setSkuid(goodsIds);
+        getProductBO.setGoodsId(goodsIds);
 
 
         List<ProductBO> productsInfo = productManager.getProductsInfo(getProductBO, baseRequestDTO.getManagerService().getProductService());
@@ -1106,7 +1105,6 @@ public class AbstractListCartGoodsService implements ListCartGoodsService {
         if (result == null || CollectionUtils.isEmpty(result.getGoods())) {
             return null;
         }
-        String menuType = baseRequestDTO == null ? null : baseRequestDTO.getMenuType();
         List<ProductBO> products = this.drawGiftInfo(result, baseRequestDTO);
         return this.gifAddCart(products, result);
     }

shopping-cart-application-service/src/main/java/cn/freemud/demo/service/AbstractUpdateGoodsQtyService.java

@@ -226,8 +226,8 @@ public abstract class AbstractUpdateGoodsQtyService implements UpdateGoodsQtySer
 
     private GetProductBO convert2ProductBO(UpdateAddGoodsBO baseRequestBO, CartGoods cartGoods) {
         GetProductBO getProductBO = new GetProductBO();
-        getProductBO.setSkuid(Collections.singletonList(cartGoods.getSkuId()));
-        getProductBO.setSpuid(Collections.singletonList(cartGoods.getSpuId()));
+        String goodsId = StringUtils.isEmpty(baseRequestBO.getSkuId()) ? baseRequestBO.getSpuId() : baseRequestBO.getSkuId();
+        getProductBO.setGoodsId(Collections.singletonList(goodsId));
         getProductBO.setStoreId(baseRequestBO.getShopId());
         getProductBO.setPartnerId(baseRequestBO.getPartnerId());
         getProductBO.setMenuType(BusinessTypeEnum.getByType(baseRequestBO.getMenuType()).getCode());