|
|
@@ -959,7 +959,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
.reduce(BigDecimal.ZERO, BigDecimal::add));
|
|
|
}
|
|
|
//获取订单费用信息
|
|
|
- List<OrderFees> orderFeesList = orderFeesService.getOrderFees(order);
|
|
|
+ List<OrderFees> orderFeesList = orderFeesService.list(new QueryWrapper<OrderFees>().eq("pid", order.getId())
|
|
|
+ .eq("fees_type","1").eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted", 0).orderByAsc("id"));
|
|
|
if (CollectionUtils.isNotEmpty(orderFeesList)){
|
|
|
bigDecimal = bigDecimal.add(orderFeesList.stream().filter(e ->e.getAmount() != null)
|
|
|
.map(OrderFees::getAmount)
|
lazhaoqian