Merge branch 'feature/1.9.9_购物车校验' into qa

# Conflicts:
#	assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/request/CheckCartRequest.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/AssortmentSdkService.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/BuyAndGiftsPromotionService.java

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>1.1.2.RELEASE</version>
+    <version>1.1.3.RELEASE</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

assortment-ordercenter-sdk/readme.md

@@ -5,4 +5,5 @@
 | 6.4.10.RELEASE| 骑手小费  | 张明警 | 2019-12-26  |
 | 1.1.0.RELEASE| 1.9.8需求打包release版本  | 侯书虎 | 2019-12-26  |
 | 1.1.1.RELEASE| 1.9.9sessionKey  | 胡超 | 20200108  |
-| 1.1.2.RELEASE| 1.9.9需求打包release版本  | 丁凯 | 20200108  |
+| 1.1.2.RELEASE| 1.9.9需求打包release版本  | 丁凯 | 20200108  |
\ No newline at end of file
+| 1.1.3.RELEASE| 1.9.10需求打包release版本（thirdCateId）  | 胡超 | 20200113  |
\ No newline at end of file

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -30,7 +30,6 @@ import org.apache.commons.lang.time.DateFormatUtils;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
-import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -139,6 +138,11 @@ public class OrderSdkAdapter {
         request.setOrderTask(requestVO.getOrderTask());
         request.setOperator(requestVO.getOperator());
 
+        // 扩展字段（第三方商品分类编号）
+        if (null != requestVO && null != requestVO.getOtherInfo()) {
+            request.setExtInfo(JSONObject.toJSONString(requestVO.getOtherInfo()));
+        }
+
         return request;
     }
 

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java

@@ -170,6 +170,9 @@ public class BaseCreateOrderRequest extends BaseConfig {
          * 会员规则ID
          */
         private String ruleId;
+
+        /** 第三方商品分类编号，不必传 */
+        private String thirdCateId;
     }
 
 

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/adapter/ShoppingCartAdapter.java

 package com.freemud.sdk.api.assortment.shoppingcart.adapter;
 
+import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO;
 import com.freemud.application.sdk.api.productcenter.request.product.valid.ProductAttributeValueType;
 import com.freemud.application.sdk.api.productcenter.request.product.valid.ValidateShopProductRequest;
@@ -44,22 +45,22 @@ public class ShoppingCartAdapter {
         return request;
     }
 
-    public ValidateShopProductRequest getValidateShopProductRequest(CheckCartRequest checkCartRequest){
+    public ValidateShopProductRequest getValidateShopProductRequest(CheckCartRequest checkCartRequest) {
         ValidateShopProductRequest validateShopProductRequest = new ValidateShopProductRequest();
-        validateShopProductRequest.setChannel(OrderChannelType.SAAS.getCode());
+        validateShopProductRequest.setChannel(checkCartRequest.getBusinessType());
         validateShopProductRequest.setPartnerId(checkCartRequest.getPartnerId());
         validateShopProductRequest.setStoreId(checkCartRequest.getStoreId());
         validateShopProductRequest.setProductTypeList(new ArrayList<>());
-        for (CartGoods cartGoods :checkCartRequest.getCartGoodsList()) {
+        for (CartGoods cartGoods : checkCartRequest.getCartGoodsList()) {
             // 过滤非商品券商品
-            if (cartGoods.getCartGoodsUid().startsWith(CommonsConstant.COUPON_PREFIX)){
+            if (cartGoods.getCartGoodsUid().startsWith(CommonsConstant.COUPON_PREFIX)) {
                 continue;
             }
             ValidateShopProductType productType = new ValidateShopProductType();
             productType.setSpuId(cartGoods.getSpuId());
-            productType.setSkuId(ObjectUtils.equals(GoodsTypeEnum.SKU_GOODS.getGoodsType(),cartGoods.getGoodsType())? cartGoods.getSkuId():cartGoods.getSpuId());
-            productType.setPrice(cartGoods.getOriginalPrice()==null?0:cartGoods.getOriginalPrice().intValue());
-            productType.setValidatePrice(productType.getPrice()==0?0:1);
+            productType.setSkuId(ObjectUtils.equals(GoodsTypeEnum.SKU_GOODS.getGoodsType(), cartGoods.getGoodsType()) ? cartGoods.getSkuId() : cartGoods.getSpuId());
+            productType.setPrice(cartGoods.getOriginalPrice() == null ? 0 : cartGoods.getOriginalPrice().intValue());
+            productType.setValidatePrice(productType.getPrice() == 0 ? 0 : 1);
             productType.setValidateAttribute(1);
             productType.setValidateStatuses(Arrays.asList(2));
             productType.setUuid(cartGoods.getCartGoodsUid());
@@ -73,10 +74,10 @@ public class ShoppingCartAdapter {
         return validateShopProductRequest;
     }
 
-    public List<ProductAttributeValueType> getAttributes( List<CartGoods.CartGoodsExtra> extra){
-        List<ProductAttributeValueType> attributeValueTypes=new ArrayList<>();
-        if (CollectionUtils.isNotEmpty(extra)){
-            for (CartGoods.CartGoodsExtra cartGoodsExtra :extra) {
+    public List<ProductAttributeValueType> getAttributes(List<CartGoods.CartGoodsExtra> extra) {
+        List<ProductAttributeValueType> attributeValueTypes = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(extra)) {
+            for (CartGoods.CartGoodsExtra cartGoodsExtra : extra) {
                 ProductAttributeValueType productAttributeValueType = new ProductAttributeValueType();
                 productAttributeValueType.setAttributeId(cartGoodsExtra.getAttributeId());
                 productAttributeValueType.setAttributeValue(cartGoodsExtra.getAttributeName());
@@ -86,14 +87,14 @@ public class ShoppingCartAdapter {
         return attributeValueTypes;
     }
 
-    public List<ValidateSkuProductType> getValidateSkuProductType(List<CartGoods.ComboxGoods> productComboList){
-        List<ValidateSkuProductType> result=new ArrayList<>();
-        if (CollectionUtils.isNotEmpty(productComboList)){
-            for (CartGoods.ComboxGoods comboxGoods :productComboList) {
+    public List<ValidateSkuProductType> getValidateSkuProductType(List<CartGoods.ComboxGoods> productComboList) {
+        List<ValidateSkuProductType> result = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(productComboList)) {
+            for (CartGoods.ComboxGoods comboxGoods : productComboList) {
                 ValidateSkuProductType validateSkuProductType = new ValidateSkuProductType();
                 validateSkuProductType.setProductId(comboxGoods.getGoodsId());
-                validateSkuProductType.setPrice(comboxGoods.getOriginalPrice()==null?0:comboxGoods.getOriginalPrice().intValue());
-                validateSkuProductType.setMarkUpPrice(comboxGoods.getFinalPrice()==null?0:comboxGoods.getFinalPrice().intValue());
+                validateSkuProductType.setPrice(comboxGoods.getOriginalPrice() == null ? 0 : comboxGoods.getOriginalPrice().intValue());
+                validateSkuProductType.setMarkUpPrice(comboxGoods.getFinalPrice() == null ? 0 : comboxGoods.getFinalPrice().intValue());
                 validateSkuProductType.setQty(comboxGoods.getQty());
                 validateSkuProductType.setAttributeList(getAttributes(comboxGoods.getExtra()));
                 result.add(validateSkuProductType);
@@ -237,10 +238,10 @@ public class ShoppingCartAdapter {
             cartGoodsStates.setPriceChanged(true);
         }
         cartGoods.setOriginalPrice(newOrigOriginalPrice);
-        cartGoods.setOriginalAmount(newOrigOriginalPrice*cartGoods.getQty());
-        cartGoods.setAmount(newOrigOriginalPrice*cartGoods.getQty());
+        cartGoods.setOriginalAmount(newOrigOriginalPrice * cartGoods.getQty());
+        cartGoods.setAmount(newOrigOriginalPrice * cartGoods.getQty());
         //咨询商品服务，套餐售价取originalPrice
-        cartGoods.setFinalPrice(isSetMealProduct?productBean.getOriginalPrice(): productBean.getFinalPrice());
+        cartGoods.setFinalPrice(isSetMealProduct ? productBean.getOriginalPrice() : productBean.getFinalPrice());
         cartGoods.setUnit(productBean.getUnit());
         cartGoods.setWeightType(CommonsConstant.WEIGHT_PRODUCT.equals(productBean.getWeightType()));
     }
@@ -248,67 +249,72 @@ public class ShoppingCartAdapter {
     /**
      * 更新当前购物车商品行信息
      *
-     * @param cartGoods       当前购物车商品行
-     * @param productBeans    购物车中所有的productId对应的商品详情
+     * @param cartGoods    当前购物车商品行
+     * @param productBeans 购物车中所有的productId对应的商品详情
      */
     public void updateCartGoodsInfoNew(CartGoods cartGoods, List<ProductBeanDTO> productBeans) {
-        Optional<ProductBeanDTO> firstProduct = productBeans.stream().filter(p -> ObjectUtils.equals(p.getPid(), cartGoods.getSpuId())).findFirst();
-        if (!firstProduct.isPresent()) {
-            return;
-        }
-        ProductBeanDTO spuProduct = firstProduct.get();
-        //是否是sku商品
-        boolean isSkuProduct=ObjectUtils.equals(GoodsTypeEnum.SKU_GOODS.getGoodsType(), cartGoods.getGoodsType());
-        // 如果是套餐商品，更新套餐内固定商品&可选商品的详细信息
-        boolean isSetMealProduct = ObjectUtils.equals(ProductType.SetMeal.getCode(), spuProduct.getType()) || ObjectUtils.equals(ProductType.IncreasedPackage.getCode(), spuProduct.getType());
-        ProductBeanDTO.SkuProductBean skuProduct = isSkuProduct ? spuProduct.getSkuList().stream().filter(p -> ObjectUtils.equals(cartGoods.getSkuId(), p.getSkuId())).findFirst().get() : null;
+        try {
+            Optional<ProductBeanDTO> firstProduct = productBeans.stream().filter(p -> ObjectUtils.equals(p.getPid(), cartGoods.getSpuId())).findFirst();
+            if (!firstProduct.isPresent()) {
+                return;
+            }
+            ProductBeanDTO spuProduct = firstProduct.get();
+            //是否是sku商品
+            boolean isSkuProduct = ObjectUtils.equals(GoodsTypeEnum.SKU_GOODS.getGoodsType(), cartGoods.getGoodsType());
+            // 如果是套餐商品，更新套餐内固定商品&可选商品的详细信息
+            boolean isSetMealProduct = ObjectUtils.equals(ProductType.SetMeal.getCode(), spuProduct.getType()) || ObjectUtils.equals(ProductType.IncreasedPackage.getCode(), spuProduct.getType());
+            ProductBeanDTO.SkuProductBean skuProduct = isSkuProduct ? spuProduct.getSkuList().stream().filter(p -> ObjectUtils.equals(cartGoods.getSkuId(), p.getSkuId())).findFirst().get() : null;
 
-        Map<String, String> attributes = getAttributesNew(cartGoods.getExtra());
-        cartGoods.setName(spuProduct.getName());
-        cartGoods.setSpuName(spuProduct.getName());
-        cartGoods.setSkuName(isSkuProduct?skuProduct.getProductName():spuProduct.getName());
-        cartGoods.setSpecProductId(attributes.get(ATTRIBUTEID));
-        cartGoods.setPic(spuProduct.getPicture());
-        cartGoods.setPackPrice(isSkuProduct?skuProduct.getPackPrice(): spuProduct.getPackPrice());
-        cartGoods.setStockLimit(isSkuProduct? ObjectUtils.equals(1, skuProduct.getStockLimit()):ObjectUtils.equals(1, spuProduct.getStockLimit()));
-        cartGoods.setCustomerCode(isSkuProduct?skuProduct.getCustomerCode(): spuProduct.getCustomerCode());
+            Map<String, String> attributes = getAttributesNew(cartGoods.getExtra());
+            cartGoods.setName(spuProduct.getName());
+            cartGoods.setSpuName(spuProduct.getName());
+            cartGoods.setSkuName(isSkuProduct ? skuProduct.getProductName() : spuProduct.getName());
+            cartGoods.setSpecProductId(attributes.get(ATTRIBUTEID));
+            cartGoods.setPic(spuProduct.getPicture());
+            cartGoods.setPackPrice(isSkuProduct ? skuProduct.getPackPrice() : spuProduct.getPackPrice());
+            cartGoods.setStockLimit(isSkuProduct ? ObjectUtils.equals(1, skuProduct.getStockLimit()) : ObjectUtils.equals(1, spuProduct.getStockLimit()));
+            cartGoods.setCustomerCode(isSkuProduct ? skuProduct.getCustomerCode() : spuProduct.getCustomerCode());
 
-        String skuSpecName = "";
-        if (isSkuProduct && CollectionUtils.isNotEmpty(skuProduct.getSkuSpecValues())) {
-            List<String> skuSpecValus = skuProduct.getSkuSpecValues().stream().map(p -> p.getSpecValue()).collect(Collectors.toList());
-            skuSpecName = StringUtils.join(skuSpecValus, "/");
-        }
-        String attributeName = attributes.get(ATTRIBUTENAME) == null ? "" : attributes.get(ATTRIBUTENAME);
-        cartGoods.setSubName(StringUtils.isNotEmpty(skuSpecName) && StringUtils.isNotEmpty(attributeName) ?
-                skuSpecName + "/" + attributeName : skuSpecName + attributeName);
+            String skuSpecName = "";
+            if (isSkuProduct && CollectionUtils.isNotEmpty(skuProduct.getSkuSpecValues())) {
+                List<String> skuSpecValus = skuProduct.getSkuSpecValues().stream().map(p -> p.getSpecValue()).collect(Collectors.toList());
+                skuSpecName = StringUtils.join(skuSpecValus, "/");
+            }
+            String attributeName = attributes.get(ATTRIBUTENAME) == null ? "" : attributes.get(ATTRIBUTENAME);
+            cartGoods.setSubName(StringUtils.isNotEmpty(skuSpecName) && StringUtils.isNotEmpty(attributeName) ?
+                    skuSpecName + "/" + attributeName : skuSpecName + attributeName);
 
-        if (isSetMealProduct) {
-            if (CollectionUtils.isNotEmpty(cartGoods.getProductComboList())) {
-                for (CartGoods.ComboxGoods productCombo : cartGoods.getProductComboList()) {
-                    updateComboxGoodsInfoNew(productCombo,spuProduct, true);
+            if (isSetMealProduct) {
+                if (CollectionUtils.isNotEmpty(cartGoods.getProductComboList())) {
+                    for (CartGoods.ComboxGoods productCombo : cartGoods.getProductComboList()) {
+                        updateComboxGoodsInfoNew(productCombo, spuProduct, true);
+                    }
                 }
-            }
-            if (CollectionUtils.isNotEmpty(cartGoods.getProductGroupList())) {
-                for (CartGoods.ComboxGoods productGroup : cartGoods.getProductGroupList()) {
-                    updateComboxGoodsInfoNew(productGroup,spuProduct, false);
+                if (CollectionUtils.isNotEmpty(cartGoods.getProductGroupList())) {
+                    for (CartGoods.ComboxGoods productGroup : cartGoods.getProductGroupList()) {
+                        updateComboxGoodsInfoNew(productGroup, spuProduct, false);
+                    }
                 }
             }
+            //更新当前商品行价格
+            Long newOrigOriginalPrice = 0L;
+            if (isSetMealProduct) {
+                newOrigOriginalPrice += cartGoods.getProductComboList().stream().mapToLong(t -> t.getOriginalAmount()).sum();
+                newOrigOriginalPrice += cartGoods.getProductGroupList().stream().mapToLong(t -> t.getOriginalAmount()).sum();
+            } else {
+                newOrigOriginalPrice = isSkuProduct ? skuProduct.getFinalPrice() : spuProduct.getFinalPrice();
+            }
+            cartGoods.setOriginalPrice(newOrigOriginalPrice);
+            cartGoods.setOriginalAmount(newOrigOriginalPrice * cartGoods.getQty());
+            cartGoods.setAmount(newOrigOriginalPrice * cartGoods.getQty());
+            //咨询商品服务，套餐售价取originalPrice
+            cartGoods.setFinalPrice(isSetMealProduct ? spuProduct.getOriginalPrice() : isSkuProduct ? skuProduct.getFinalPrice() : spuProduct.getFinalPrice());
+            cartGoods.setUnit(spuProduct.getUnit());
+            cartGoods.setWeightType(CommonsConstant.WEIGHT_PRODUCT.equals(spuProduct.getWeightType()));
+        } catch (Exception ex) {
+            ErrorLog.infoConvertJson(this.getClass(),"updateCartGoodsInfoNew_Error",ex);
+            cartGoods.setCartGoodsUid(null);
         }
-        //更新当前商品行价格
-        Long newOrigOriginalPrice = 0L;
-        if (isSetMealProduct) {
-            newOrigOriginalPrice+=cartGoods.getProductComboList().stream().mapToLong(t->t.getOriginalAmount()).sum();
-            newOrigOriginalPrice += cartGoods.getProductGroupList().stream().mapToLong(t -> t.getOriginalAmount()).sum();
-        } else {
-            newOrigOriginalPrice =isSkuProduct?skuProduct.getFinalPrice(): spuProduct.getFinalPrice();
-        }
-        cartGoods.setOriginalPrice(newOrigOriginalPrice);
-        cartGoods.setOriginalAmount(newOrigOriginalPrice*cartGoods.getQty());
-        cartGoods.setAmount(newOrigOriginalPrice*cartGoods.getQty());
-        //咨询商品服务，套餐售价取originalPrice
-        cartGoods.setFinalPrice(isSetMealProduct?spuProduct.getOriginalPrice(): isSkuProduct? skuProduct.getFinalPrice():spuProduct.getFinalPrice());
-        cartGoods.setUnit(spuProduct.getUnit());
-        cartGoods.setWeightType(CommonsConstant.WEIGHT_PRODUCT.equals(spuProduct.getWeightType()));
     }
 
     private boolean updateComboxGoodsInfo(CartGoods cartGoods, CartGoods.ComboxGoods comboxGoods, ProductBeanDTO parentProductBean, List<ProductBeanDTO> productBeans, CartGoodsStates cartGoodsStates, List<String> invalidGoodsIdList) {
@@ -348,8 +354,8 @@ public class ShoppingCartAdapter {
         comboxGoods.setPic(productBean.getPicture());
         comboxGoods.setPackPrice(productBean.getPackPrice());
         comboxGoods.setOriginalPrice(productBean.getFinalPrice());
-        comboxGoods.setOriginalAmount(productBean.getFinalPrice()*comboxGoods.getQty());
-        comboxGoods.setAmount(finalPrice*comboxGoods.getQty());
+        comboxGoods.setOriginalAmount(productBean.getFinalPrice() * comboxGoods.getQty());
+        comboxGoods.setAmount(finalPrice * comboxGoods.getQty());
         comboxGoods.setCustomerCode(productBean.getCustomerCode());
         comboxGoods.setFinalPrice(finalPrice);
         comboxGoods.setWeightType(CommonsConstant.WEIGHT_PRODUCT.equals(productBean.getWeightType()));
@@ -358,41 +364,41 @@ public class ShoppingCartAdapter {
     }
 
     /**
-     *  更新套餐固定商品、可选商品信息
+     * 更新套餐固定商品、可选商品信息
      *
-     * @param comboxGoods 固定商品或可选商品
+     * @param comboxGoods       固定商品或可选商品
      * @param parentProductBean 套餐服商品
-     * @param isComboxGoods 是否是固定商品
+     * @param isComboxGoods     是否是固定商品
      * @return
      */
     private void updateComboxGoodsInfoNew(CartGoods.ComboxGoods comboxGoods, ProductBeanDTO parentProductBean, boolean isComboxGoods) {
 
         ProductBeanDTO.ProductComboType productComboType = new ProductBeanDTO.ProductComboType();
-        ProductBeanDTO.ProductGroupType.GroupDetailType groupDetailType=new  ProductBeanDTO.ProductGroupType.GroupDetailType();
-        if (isComboxGoods){
-            productComboType=   parentProductBean.getProductComboList().stream().filter(p -> ObjectUtils.equals(comboxGoods.getGoodsId(), p.getProductId())).findFirst().orElse(new ProductBeanDTO.ProductComboType());
-        }else {
-            Map<String, ProductBeanDTO.ProductGroupType.GroupDetailType> map=new HashMap<>();
-            parentProductBean.getProductGroupList().stream().map(t-> t.getGroupDetail()).forEach(group-> group.forEach(detailType -> map.put( detailType.getProductId(),detailType)));
+        ProductBeanDTO.ProductGroupType.GroupDetailType groupDetailType = new ProductBeanDTO.ProductGroupType.GroupDetailType();
+        if (isComboxGoods) {
+            productComboType = parentProductBean.getProductComboList().stream().filter(p -> ObjectUtils.equals(comboxGoods.getGoodsId(), p.getProductId())).findFirst().orElse(new ProductBeanDTO.ProductComboType());
+        } else {
+            Map<String, ProductBeanDTO.ProductGroupType.GroupDetailType> map = new HashMap<>();
+            parentProductBean.getProductGroupList().stream().map(t -> t.getGroupDetail()).forEach(group -> group.forEach(detailType -> map.put(detailType.getProductId(), detailType)));
             groupDetailType = map.get(comboxGoods.getGoodsId());
         }
 
         // 若是固定商品则取商品详情的FinalPrice，若是可选商品则取MarkUpPrice
-        Long finalPrice =isComboxGoods? productComboType.getFinalPrice().longValue():groupDetailType.getMarkUpPrice().longValue();
+        Long finalPrice = isComboxGoods ? productComboType.getFinalPrice().longValue() : groupDetailType.getMarkUpPrice().longValue();
         // 设置商品详情
         Map<String, String> attributes = getAttributesNew(comboxGoods.getExtra());
-        comboxGoods.setName(isComboxGoods?productComboType.getProductName():groupDetailType.getProductName());
+        comboxGoods.setName(isComboxGoods ? productComboType.getProductName() : groupDetailType.getProductName());
         comboxGoods.setSpuName(comboxGoods.getName());
         comboxGoods.setSpecProductId(attributes.get(ATTRIBUTEID));
         comboxGoods.setSubName(attributes.get(ATTRIBUTENAME));
-        comboxGoods.setPic(isComboxGoods?productComboType.getPicture():groupDetailType.getPicture());
-        comboxGoods.setOriginalPrice(isComboxGoods?productComboType.getFinalPrice().longValue():groupDetailType.getProductFinalPrice().longValue());
-        comboxGoods.setOriginalAmount(comboxGoods.getOriginalPrice()*comboxGoods.getQty());
-        comboxGoods.setAmount(finalPrice*comboxGoods.getQty());
-        comboxGoods.setCustomerCode(isComboxGoods?productComboType.getCustomerCode():groupDetailType.getCustomerCode());
+        comboxGoods.setPic(isComboxGoods ? productComboType.getPicture() : groupDetailType.getPicture());
+        comboxGoods.setOriginalPrice(isComboxGoods ? productComboType.getFinalPrice().longValue() : groupDetailType.getProductFinalPrice().longValue());
+        comboxGoods.setOriginalAmount(comboxGoods.getOriginalPrice() * comboxGoods.getQty());
+        comboxGoods.setAmount(finalPrice * comboxGoods.getQty());
+        comboxGoods.setCustomerCode(isComboxGoods ? productComboType.getCustomerCode() : groupDetailType.getCustomerCode());
         comboxGoods.setFinalPrice(finalPrice);
-        comboxGoods.setWeightType(isComboxGoods? CommonsConstant.WEIGHT_PRODUCT.equals(productComboType.getWeightType()):CommonsConstant.WEIGHT_PRODUCT.equals(groupDetailType.getWeightType()));
-        comboxGoods.setUnit(isComboxGoods?productComboType.getUnit():groupDetailType.getUnit());
+        comboxGoods.setWeightType(isComboxGoods ? CommonsConstant.WEIGHT_PRODUCT.equals(productComboType.getWeightType()) : CommonsConstant.WEIGHT_PRODUCT.equals(groupDetailType.getWeightType()));
+        comboxGoods.setUnit(isComboxGoods ? productComboType.getUnit() : groupDetailType.getUnit());
     }
 
     private Map<String, String> getAttributes(CartGoods cartGoods, List<CartGoods.CartGoodsExtra> extra, List<ProductBeanDTO.ProductAttributeGroupListBean> attributeGroupListBeanList, List<String> invalidGoodsIdList) {

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/ShoppingCartBaseService.java

@@ -200,12 +200,6 @@ public interface ShoppingCartBaseService {
 
             List<ProductBeanDTO> productList = valiadResult.getSuccessList().stream().map(ValiadShopProductResult::getProductType).collect(Collectors.toList());
             CartGoodsStates cartGoodsStates = new CartGoodsStates();
-            //更新购物车详细信息
-            if (CollectionUtils.isEmpty(checkCartRequest.getCartGoodsList()) || CollectionUtils.isEmpty(productList)){
-                checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
-                checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(ShoppingCartConstant.SHOPPING_CART_INVALIAD_GOODS);
-                return CartResponseUtil.error(valiadResponse.getMessage(),checkCartRequest);
-            }
             for (CartGoods cartGoods : checkCartRequest.getCartGoodsList()) {
                 // 当goodsId为空或商品是商品券时直接跳过
                 if (StringUtils.isEmpty(cartGoods.getGoodsId()) || Objects.equals(cartGoods.getGoodsType(), GoodsTypeEnum.COUPON_GOODS.getGoodsType())) {
@@ -220,6 +214,12 @@ public interface ShoppingCartBaseService {
             if (cartGoodsStates != null && cartGoodsStates.isOrderWayFlag()) {
                 setToastMsgIfNotExist(checkCartRequest.getShoppingCartGoodsResponseVo(), ShoppingCartConstant.ORDER_WAY_CHANGE);
             }
+            //若商品详情赋值有异常，直接移除购物车
+            if (checkCartRequest.getCartGoodsList().stream().anyMatch(cart->StringUtils.isEmpty( cart.getCartGoodsUid()))){
+                checkCartRequest.getCartGoodsList().removeIf(k ->  StringUtils.isEmpty(k.getCartGoodsUid()));
+                checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
+                checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(ShoppingCartConstant.SHOPPING_CART_INVALIAD_GOODS);
+            }
             return CartResponseUtil.success(checkCartRequest);
         } catch (Exception e) {
             ErrorLog.printErrorLog("assortment-shoppingcart-sdk", checkCartRequest.getTrackingNo(), e.getMessage(), "checkAllCartGoods", checkCartRequest, e, Level.ERROR);
@@ -247,6 +247,7 @@ public interface ShoppingCartBaseService {
         // 包含：1、普通商品 2、套餐内的固定商品和可选商品
         ShoppingCartAdapter shoppingCartAdapter = SDKCommonBaseContextWare.getBean(ShoppingCartAdapter.class);
         GetProductInfoRequest getSpuProductInfoRequest = shoppingCartAdapter.convertGetProductInfoRequest(checkCartRequest);
+        getSpuProductInfoRequest.setBusinessType(checkCartRequest.getBusinessType());
         BaseResponse<List<ProductBeanDTO>> productInfo = getProductsInfo(getSpuProductInfoRequest);
         if ((productInfo == null) || (!CartResponseConstant.SUCCESS.getCode().equals(productInfo.getCode()))) {
             return;
@@ -275,7 +276,7 @@ public interface ShoppingCartBaseService {
     default CartGoodsStates updateSpqCartGoodsInfo(List<CartGoods> cartGoodsList, Integer orderWay, String partnerId, String trackingNo, CartGoodsStates goodsStates) {
         //获取所有商品券cartGoodsUid=sqp+code
         List<String> couponIds = cartGoodsList.parallelStream()
-                .filter(k -> k.getCartGoodsUid().startsWith(CommonsConstant.COUPON_PREFIX)).map(CartGoods::getSpuId).collect(Collectors.toList());
+                .filter(k ->StringUtils.isNotEmpty(k.getCartGoodsUid())&& k.getCartGoodsUid().startsWith(CommonsConstant.COUPON_PREFIX)).map(CartGoods::getSpuId).collect(Collectors.toList());
 
         if (CollectionUtils.isEmpty(couponIds)) {
             return goodsStates;

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java

@@ -332,7 +332,7 @@ public class ShoppingCartConvertAdapter {
         cartGoods.setSpuId(spuId);
         cartGoods.setSkuId(skuId);
         cartGoods.setQty(qty);
-        Integer goodsType = StringUtils.isEmpty(skuId) ? GoodsTypeEnum.SPU_GOODS.getGoodsType() : GoodsTypeEnum.SKU_GOODS.getGoodsType();
+        Integer goodsType = StringUtils.isEmpty(skuId)||ObjectUtils.equals(spuId,skuId) ? GoodsTypeEnum.SPU_GOODS.getGoodsType() : GoodsTypeEnum.SKU_GOODS.getGoodsType();
         if (spuId.startsWith(CommonsConstant.COUPON_PREFIX)) {
             goodsType = GoodsTypeEnum.COUPON_GOODS.getGoodsType();
         } else if (CollectionUtils.isNotEmpty(addShoppingCartGoodsRequestVo.getProductComboList())) {