多规格商品下单支持保存商品的spu级的三方编号

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

@@ -3141,7 +3141,7 @@ public class OrderSdkAdapter {
             extInfo.setScore(product.getScore());
         }
         extInfo.setStapleFood(product.getStapleFood());
-
+        extInfo.setThirdSpuProductId(product.getSpuCustomerCode());
         extInfo.setOriginalGoodsUid(product.getOriginalGoodsUid());
         extInfo.setCartGoodsUid(product.getCartGoodsUid());
         // todo 订单行扩展字段商品组

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

@@ -62,6 +62,10 @@ public class CreateOrderProductRequest extends BaseConfig {
      */
     private String customerCode;
     /**
+     * 多规格对应的父级商品的三方编号
+     */
+    private String spuCustomerCode;
+    /**
      * 商品货号，商品服务可重复
      */
     private String productCode;

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

@@ -37,6 +37,11 @@ public class OrderProductAddInfoDto extends BaseConfig {
     private Boolean isFixedProduct;
 
     /**
+     * 商品Spu级的第三方id（多规格SPU级的三方id）
+     */
+    private String thirdSpuProductId;
+
+    /**
      * 第三方商品规格ID
      */
     private String thirdProductSpecId;

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -2789,6 +2789,7 @@ public class OrderAdapter {
         createOrderProductDemoDto.setParentProductId(cartGoodsDetailDto.getParentProductId());
         createOrderProductDemoDto.setIsFixedProduct(cartGoodsDetailDto.getIsFixedProduct());
         createOrderProductDemoDto.setCustomerCode(cartGoodsDetailDto.getCustomerCode());
+        createOrderProductDemoDto.setSpuCustomerCode(cartGoodsDetailDto.getSpuCustomerCode());
         createOrderProductDemoDto.setProductCode(cartGoodsDetailDto.getProductCode());
         createOrderProductDemoDto.setHasStockProudct(cartGoodsDetailDto.isStockLimit());
         createOrderProductDemoDto.setWeight(cartGoodsDetailDto.getWeight());

order-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java

@@ -128,6 +128,11 @@ public class ShoppingCartGoodsDto {
         private String spuId;
 
         /**
+         * 多规格对应的父级商品的三方编号
+         */
+        private String spuCustomerCode;
+
+        /**
          * 原有商品类型
          *
          * 溯源: 订单有自己的商品逻辑 无法使用原有字段类型记录处理

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

@@ -57,7 +57,6 @@ public class ItemServiceImpl implements ItemService{
         //查询商品详情
         GetProductInfoDto getProductInfoDto = storeItemAdapter.convert2ProductInfoDto(partnerId, storeId, ProductInfoType.ALL.getCode(), result,menuType);
         ProductInfosDto productInfosDto = storeItemClient.listProductInfos(getProductInfoDto);
-        AppLogUtil.infoLog("storeItemClient_listProductInfos", gson.toJson(getProductInfoDto), gson.toJson(productInfosDto));
         if (ResponseCodeConstant.RESPONSE_SUCCESS.equals(productInfosDto.getErrcode()) && productInfosDto.getData() != null
                 && CollectionUtils.isNotEmpty(productInfosDto.getData().getProducts())) {
             productInfosDto.getData().getProducts().forEach(productBean -> {

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

@@ -128,6 +128,7 @@ public class ShoppingCartConvertAdapter {
         cartGoodsDetailDto.setStockLimit(cartGoods.isStockLimit());
         cartGoodsDetailDto.setProductCode(cartGoods.getCustomerCode());
         cartGoodsDetailDto.setCustomerCode(cartGoods.getCustomerCode());
+        cartGoodsDetailDto.setSpuCustomerCode(cartGoods.getSpuCustomerCode());
         cartGoodsDetailDto.setWeight(cartGoods.getWeight());
         cartGoodsDetailDto.setUnit(cartGoods.getUnit());
         cartGoodsDetailDto.setActivityDiscountsDtos(new ArrayList<>());
@@ -440,6 +441,7 @@ public class ShoppingCartConvertAdapter {
         cartGoods.setNodeId(addShoppingCartGoodsRequestVo.getNodeId());
         cartGoods.setCategoryName(addShoppingCartGoodsRequestVo.getCategoryName());
         cartGoods.setCustomerCategoryCode(addShoppingCartGoodsRequestVo.getCustomerCategoryCode());
+        cartGoods.setSpuCustomerCode(addShoppingCartGoodsRequestVo.getSpuCustomerCode());
         List<CartGoods.ComboxGoods> productComboList = new ArrayList<>();
         List<CartGoods.ComboxGoods> productGroupList = new ArrayList<>();
         List<CartGoods.MaterialGoods> materialGoodsList = new ArrayList<>();

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java

@@ -173,6 +173,10 @@ public class ShoppingCartGoodsDto {
          */
         private String spuId;
         /**
+         * 多规格对应的父级商品的三方编号
+         */
+        private String spuCustomerCode;
+        /**
          * spuId  如果是单品 skuId=spuId
          */
         private String skuId;

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/AddShoppingCartGoodsRequestVo.java

@@ -68,6 +68,12 @@ public class AddShoppingCartGoodsRequestVo extends BaseRequestVo{
     @ApiModelProperty(value = "第三方的分类编码")
     private String customerCategoryCode;
     /**
+     * 商品spu级的三方编码
+     * 单规格值商品本身，多规格为具体规格商品对应的spu级别的商品，套餐为套餐本身
+     */
+    @ApiModelProperty(value = "商品spu级的三方编码")
+    private String spuCustomerCode;
+    /**
      * 套餐固定商品
      */
     private List<ComboxGoodsRequestVo> productComboList;

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/CartGoods.java

@@ -292,6 +292,11 @@ public class CartGoods {
      */
     private String customerCode;
     /**
+     * 商品的SPU级 第三方编码
+     * 单规格和套餐商品，就是本身，多规格商品，是父商品
+     */
+    private String spuCustomerCode;
+    /**
      * 商品起售份数
      * 无起售份数默认值1
      */

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

@@ -424,6 +424,7 @@ public class CalculationCommonService {
         cartGoodsDetailDto.setStockLimit(cartGoods.isStockLimit());
         cartGoodsDetailDto.setProductCode(cartGoods.getCustomerCode());
         cartGoodsDetailDto.setCustomerCode(cartGoods.getCustomerCode());
+        cartGoodsDetailDto.setSpuCustomerCode(cartGoods.getSpuCustomerCode());
         cartGoodsDetailDto.setWeight(cartGoods.getWeight());
         cartGoodsDetailDto.setUnit(cartGoods.getUnit());
         cartGoodsDetailDto.setActivityDiscountsDtos(new ArrayList<>());