fix

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

@@ -1243,7 +1243,7 @@ public class OrderAdapter {
                 responseVo.setAfterRefundInterval(false);
             }
             //商品信息转换
-            convent2ProductVos(ordersBean.getProductList(), responseVo);
+            convent2ProductVos(ordersBean.getProductList(), responseVo,ordersBean.getCompanyId());
             responseVo.setOrderAccounts(convent2OrderAccountVo(ordersBean.getApportionDetails()));
             if(CollectionUtils.isNotEmpty(ordersBean.getOrderCostDetailList())) {
                 ordersBean.getOrderCostDetailList().forEach(o -> {
@@ -1914,7 +1914,7 @@ public class OrderAdapter {
         return orderAccountVos;
     }
 
-    public void convent2ProductVos(List<QueryOrdersResponse.DataBean.OrderBean.ProductBean> productBeans, QueryOrderResponseVo responseVo) {
+    public void convent2ProductVos(List<QueryOrdersResponse.DataBean.OrderBean.ProductBean> productBeans, QueryOrderResponseVo responseVo,String partnerId) {
         if (CollectionUtils.isEmpty(productBeans)) {
             return;
         }
@@ -1951,13 +1951,15 @@ public class OrderAdapter {
                     List<ProductVo> setMaterialProducts = new ArrayList<>();
                     productBean.getMaterialProduct().forEach(product -> {
                         ProductVo material = convent2ProductVo(product);
+                        if(mcCafePartnerId.equals(partnerId)) {
                             material.setOriginalTotalAmount(new BigDecimal(material.getOriginalPrice()).multiply(new BigDecimal(productVo.getQty())).longValue());
                             material.setSaleTotalAmount(new BigDecimal(material.getFinalPrice()).multiply(new BigDecimal(productVo.getQty())).longValue());
-                        setMaterialProducts.add(material);
                             productVo.setOriginalPrice(new BigDecimal(productVo.getOriginalPrice()).add(new BigDecimal(material.getOriginalPrice())).longValue());
                             productVo.setFinalPrice(new BigDecimal(productVo.getFinalPrice()).add(new BigDecimal(material.getFinalPrice())).longValue());
                             productVo.setOriginalTotalAmount(new BigDecimal(productVo.getOriginalTotalAmount()).add(new BigDecimal(material.getOriginalTotalAmount())).longValue());
                             productVo.setSaleTotalAmount(new BigDecimal(productVo.getSaleTotalAmount()).add(new BigDecimal(material.getSaleTotalAmount())).longValue());
+                        }
+                        setMaterialProducts.add(material);
                     });
                     productVo.setSetMaterialProducts(setMaterialProducts);
                 }