Commit 36172dce authored by 周健威's avatar 周健威

Merge remote-tracking branch 'origin/feature_chw_zjw' into feature_chw_zjw

parents 62604c13 dd9571ee
......@@ -96,6 +96,7 @@ public class OrderDetailBiz{
if ((insureStatus == 1 && baseOrder.getStatus() .equals(OrderStatusEnum.ORDER_TOSTART.getCode())) ||insureStatus == 2 )
insureAmount = orderItems.stream().filter(x->x.getType()==104).map(OrderItem::getRealAmount).reduce(BigDecimal.ZERO, (x, y) -> x.add(y));
goodsAmount = goodsAmount.subtract(insureAmount);
OrderRentVehicleDetail vehicleDetail=orderRentVehicleDetails.get(0);
//获取营收明细dto
OrderDetailDTO orderDetailDTO = new OrderDetailDTO();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment