Merge branch 'feature/1.9.32-加料商品开发' into qa

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

@@ -754,7 +754,7 @@ public class OrderSdkAdapter {
             if (ObjectUtils.equals(ProductTypeEnum.MATERIAL_PRODUCT.getCode(), orderItem.getProductType())) {
                 // 获取加料子商品列表
                 productBean.setMaterialProduct(new ArrayList<>());
-                String partnerProductId = orderItem.getProductId();
+                String partnerProductId = orderItem.getProductId() + "_" + orderItem.getProductSeq();
                 List<OrderItemResp> materialProducts = orderItemList.stream().filter(item -> ObjectUtils.equals(partnerProductId, item.getParentProductId())).collect(Collectors.toList());
                 materialProducts.forEach(material -> productBean.getMaterialProduct().add(getOldOrderProduct(orderSettlementResps, material)));
             }
@@ -2567,8 +2567,10 @@ public class OrderSdkAdapter {
             originalAmount += updateOrderItemAndSettlement(orderItemList, orderSettlementCreateReqList, productRequest, partnerId, "");
             if (ProductTypeEnum.MATERIAL_PRODUCT.getCode().equals(productRequest.getProductType())) {
                 if (CollectionUtils.isNotEmpty(productRequest.getMaterialProduct())) {
+                    // 父类商品productId=productId+seq
+                    String partnerProductId = productRequest.getProductId() + "_" + index;
                     productRequest.getMaterialProduct().stream().forEach(
-                        material -> updateOrderItemAndSettlement(orderItemList, orderSettlementCreateReqList, material, partnerId, productRequest.getProductId())
+                        material -> updateOrderItemAndSettlement(orderItemList, orderSettlementCreateReqList, material, partnerId, partnerProductId)
                     );
                 }
             }