Merge remote-tracking branch 'origin/feature/coco_new-刘鹏飞' into qa

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

@@ -86,8 +86,16 @@ public class CocoCouponRelationServiceImpl implements CouponRelationService {
         }
 
         // 根据商品id转map
-        Map<String,QueryOrdersResponseDto.DataBean.OrderBean.ProductBean> productMap = productList.stream().collect(Collectors.
-                toMap(QueryOrdersResponseDto.DataBean.OrderBean.ProductBean::getProductId, Function.identity(), (oldValue, newValue) -> newValue));
+        Map<String,QueryOrdersResponseDto.DataBean.OrderBean.ProductBean> productMap = new HashMap<>();
+        for(QueryOrdersResponseDto.DataBean.OrderBean.ProductBean pb : productList){
+            productMap.put(pb.getSpecification(),pb);
+            List<QueryOrdersResponseDto.DataBean.OrderBean.ProductBean> materialProducts = pb.getMaterialProduct();
+            if(materialProducts != null && !materialProducts.isEmpty()){
+                for(QueryOrdersResponseDto.DataBean.OrderBean.ProductBean materialProduct : materialProducts){
+                    productMap.put(materialProduct.getSpecification(),materialProduct);
+                }
+            }
+        }
 
         // 根据活动号分组，没有活动号的直接筛选掉
         Map<String,List<OrderSettlementResp>> orderSettlementMap = orderSettlementList.stream().filter(os -> StringUtils.isNotEmpty(os.getExternalObjectId()))