出口销售订单毛利润毛利率修改第n次

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -207,7 +207,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				orderMessage.setGrossProfitRate(grossProfitRate);//毛利率
 			}else if (CollectionUtils.isNotEmpty(list) && order.getTradeType().equals(OrderTypeEnum.EXPORT.getType())){
 				//出口的毛利额=销售价 * 汇率 - (采购价+配件价格)    毛利率 =毛利额/（采购单价+配件价格）
-				BigDecimal amount = list.stream().map(OrderItems::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);//金额求和
+				BigDecimal amount = list.stream().reduce(BigDecimal.ZERO,(x,y) ->{
+					return x.add(y.getPrice().multiply(y.getOrderQuantity()));
+				},BigDecimal::add);//金额求和
 				BigDecimal purchaseAmount = list.stream().reduce(BigDecimal.ZERO,(x,y) ->{
 					return x.add(y.getPurchaseAmount().multiply(y.getOrderQuantity()));
 				},BigDecimal::add);//采购金额求和