Browse Source

20230413 17:48

wangzhuo 2 years ago
parent
commit
29124f1a2c

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

@@ -473,7 +473,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 
 				//有销售政策:产生返利=销售明细中的(特价-真实特价)X 条数 的明细和
 				//有销售政策:产生返利=销售明细中的(特价-真实特价)X 条数 的明细和
 				correctCreateProfit = list.stream().filter(e -> ObjectUtils.isNotNull(e.getPriceType())).
 				correctCreateProfit = list.stream().filter(e -> ObjectUtils.isNotNull(e.getPriceType())).
-					reduce(BigDecimal.ZERO, (x, y) -> x.add((y.getPrice().subtract(y.getRealSpecialOffer())).multiply(y.getOrderQuantity())), BigDecimal::add);
+					reduce(BigDecimal.ZERO, (x, y) -> x.add((y.getPrice().subtract(y.getRealSpecialOffer() == null ? BigDecimal.ZERO : y.getRealSpecialOffer())).multiply(y.getOrderQuantity())), BigDecimal::add);
 
 
 				//无销售政策:产生返利=(单价*数量)* (2%+1%+1%)
 				//无销售政策:产生返利=(单价*数量)* (2%+1%+1%)
 				faultCreateProfit = list.stream().filter(e -> ObjectUtils.isNull(e.getPriceType())).
 				faultCreateProfit = list.stream().filter(e -> ObjectUtils.isNull(e.getPriceType())).