Merge remote-tracking branch 'remotes/origin/feature/20201103-fix新算价异常'

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

@@ -1949,18 +1949,29 @@ public class OrderAdapter {
                 }
                 if (ObjectUtils.equals(ProductTypeEnum.MATERIAL_PRODUCT.getCode(), productBean.getProductType())) {
                     List<ProductVo> setMaterialProducts = new ArrayList<>();
+                    if(mcCafePartnerId.equals(partnerId)) {
                         productBean.getMaterialProduct().forEach(product -> {
                             ProductVo material = convent2ProductVo(product);
-                        if(mcCafePartnerId.equals(partnerId)) {
+                            setMaterialProducts.add(material);
                             material.setOriginalTotalAmount(new BigDecimal(material.getOriginalPrice()).multiply(new BigDecimal(productVo.getQty())).longValue());
                             material.setSaleTotalAmount(new BigDecimal(material.getFinalPrice()).multiply(new BigDecimal(productVo.getQty())).longValue());
                             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());
+                            productVo.setSaleTotalAmount(new BigDecimal(productVo.getSaleTotalAmount()).add(new BigDecimal(material.getSaleTotalAmount())).longValue());
+                        });
                     }
+                    else {
+                            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(product.getSettlementPrice())).longValue());
                             });
+                    }
                     productVo.setSetMaterialProducts(setMaterialProducts);
                 }
                 productVos.add(productVo);