coco订单详情展示的商品单价需要加上小料的价格

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

@@ -161,10 +161,36 @@ public class CocoOrderRelationServiceImpl implements OrderRelationService {
                     for(int i = 0 ; i < num-1 ; i++){
                         ProductVo newProduct = JSONObject.parseObject(JSONObject.toJSONString(product),ProductVo.class);
                         newProduct.setQty(1);
+
+                        // 商品原单价=商品原单价+小料原单价
+                        List<ProductVo> smallMaterial = newProduct.getSetMaterialProducts();
+                        Long smallMaterialOriTotal = 0L;
+                        if(smallMaterial != null && !smallMaterial.isEmpty()){
+                            for(ProductVo sm : smallMaterial){
+                                smallMaterialOriTotal = smallMaterialOriTotal + sm.getOriginalPrice();
+                            }
+                        }
+                        // 商品现单价 = 商品现单价+小料现单价
+                        smallMaterialOriTotal = smallMaterialOriTotal == null ? 0 : smallMaterialOriTotal;
+                        newProduct.setOriginalPrice(smallMaterialOriTotal + (product.getOriginalPrice() == null ? 0L : product.getOriginalPrice()));
+
                         productVos.add(newProduct);
                     }
 
                     product.setQty(1);
+
+                    // 商品原单价=商品原单价+小料原单价
+                    List<ProductVo> smallMaterial = product.getSetMaterialProducts();
+                    Long smallMaterialOriTotal = 0L;
+                    if(smallMaterial != null && !smallMaterial.isEmpty()){
+                        for(ProductVo sm : smallMaterial){
+                            smallMaterialOriTotal = smallMaterialOriTotal + sm.getOriginalPrice();
+                        }
+                    }
+                    // 商品现单价 = 商品现单价+小料现单价
+                    smallMaterialOriTotal = smallMaterialOriTotal == null ? 0 : smallMaterialOriTotal;
+                    product.setOriginalPrice(smallMaterialOriTotal + (product.getOriginalPrice() == null ? 0L : product.getOriginalPrice()));
+
                 }
             }
 
@@ -174,4 +200,5 @@ public class CocoOrderRelationServiceImpl implements OrderRelationService {
 
         queryOrderResponseVo.setProducts(masterProducts);
     }
+
 }