|
|
@@ -1642,8 +1642,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
List<PointsRecord> pointsRecords = pointsRecordMapper.findByOrderNumber(order.getOrderNumber(), 2);
|
|
|
List<OrderRefund> orderRefundList = orderRefundMapper.findByOrderNumber(order.getOrderNumber(), 70);
|
|
|
|
|
|
- for (OrderRefund refund : orderRefundList) {
|
|
|
- refundOffsetPoints += refund.getOffsetPoints();
|
|
|
+ if (CollectionUtil.isNotEmpty(orderRefundList)) {
|
|
|
+ for (OrderRefund refund : orderRefundList) {
|
|
|
+ refundOffsetPoints += Optional.ofNullable(refund)
|
|
|
+ .map(OrderRefund::getOffsetPoints)
|
|
|
+ .orElse(0L);
|
|
|
+ }
|
|
|
}
|
|
|
// pointsRecordMapper.selectList(new LambdaQueryWrapper<PointsRecord>()
|
|
|
// .eq(PointsRecord::getOrderNumber, order.getOrderNumber())
|
|
|
@@ -2744,4 +2748,4 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
int totalNums = subOrder.getOrderItems().stream().mapToInt(OrderItem::getProdCount).sum();
|
|
|
subOrder.setProductNums(totalNums);
|
|
|
}
|
|
|
-}
|
|
|
+}
|