Merge branches 'develop' and 'feature/20200926_麦咖啡特定属性与加料_wuping' of…

Merge branches 'develop' and 'feature/20200926_麦咖啡特定属性与加料_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

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

@@ -533,7 +533,7 @@ public class ShoppingCartConvertAdapter {
         if (CollectionUtils.isNotEmpty(productComboList)) {
             for (com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.ComboxGoods comboxGoods : productComboList) {
                 ValidateSkuProductType validateSkuProductType = new ValidateSkuProductType();
-                validateSkuProductType.setProductId(comboxGoods.getSpuId());
+                validateSkuProductType.setProductId(StringUtils.isNotEmpty(comboxGoods.getSpuId()) ? comboxGoods.getSpuId() : comboxGoods.getSkuId());
                 validateSkuProductType.setSkuId(comboxGoods.getSkuId());
                 validateSkuProductType.setPrice(comboxGoods.getOriginalPrice() == null ? 0 : comboxGoods.getOriginalPrice().intValue());
                 validateSkuProductType.setMarkUpPrice(comboxGoods.getFinalPrice() == null ? 0 : comboxGoods.getFinalPrice().intValue());