Преглед изворни кода

feat(order-manage): 新增订单金额列展示

- 在订单列表中添加订单金额列,标题为“订单金额(元)”
- 订单金额列居中显示,宽度设置为140
- 对金额进行数值格式化,保留两位小数
- 金额无效时显示“--”符号替代提示
Sheep пре 2 дана
родитељ
комит
65e56a6c0d

+ 7 - 3
yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderServiceImpl.java

@@ -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);
     }
-}
+}