Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

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

@@ -1653,7 +1653,14 @@ public class OrderAdapter {
                 }
                 if (ObjectUtils.equals(ProductTypeEnum.MATERIAL_PRODUCT.getCode(), productBean.getProductType())) {
                     List<ProductVo> setMaterialProducts = new ArrayList<>();
-                    productBean.getMaterialProduct().forEach(product -> setMaterialProducts.add(convent2ProductVo(product)));
+                    productBean.getMaterialProduct().forEach(product -> {
+                        ProductVo material = convent2ProductVo(product);
+                        setMaterialProducts.add(material);
+                        productVo.setOriginalPrice(new BigDecimal(productVo.getOriginalPrice()).subtract(new BigDecimal(material.getOriginalPrice())).longValue());
+                        productVo.setFinalPrice(new BigDecimal(productVo.getFinalPrice()).subtract(new BigDecimal(material.getFinalPrice())).longValue());
+                        productVo.setOriginalTotalAmount(new BigDecimal(productVo.getOriginalTotalAmount()).subtract(new BigDecimal(material.getOriginalTotalAmount())).longValue());
+                        productVo.setSaleTotalAmount(new BigDecimal(productVo.getSaleTotalAmount()).subtract(new BigDecimal(material.getSaleTotalAmount())).longValue());
+                    });
                     productVo.setSetMaterialProducts(setMaterialProducts);
                 }
                 productVos.add(productVo);