From 16ea9b9d48a4e437676e702c00fac8ed3a2333b7 Mon Sep 17 00:00:00 2001
From: irving <oujunyiirving@gmail.com>
Date: Sat, 1 Nov 2025 14:05:30 -0400
Subject: [PATCH] fix(order): guard nulls and compare enums safely in clerk
 order details; add privacy masking for RANDOM pending; apply spotless
 (2025-11-01)

---
 .../service/impl/PlayOrderInfoServiceImpl.java    | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java
index 9e9bbf2..e13d3e7 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java
@@ -440,13 +440,20 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl<PlayOrderInfoMapper, P
                 PlayCustomUserInfoEntity::getLevelId);
         PlayClerkOrderDetailsReturnVo returnVo = this.baseMapper.selectJoinOne(PlayClerkOrderDetailsReturnVo.class,
                 lambdaQueryWrapper);
+        if (returnVo == null) {
+            throw new CustomException("订单不存在或已失效");
+        }
         // 如果订单状态为退款，查询订单退款原因
-        if (returnVo.getOrderStatus().equals(OrderStatus.CANCELLED.getCode())) {
+        if (OrderStatus.CANCELLED.getCode().equals(returnVo.getOrderStatus())) {
             PlayOrderRefundInfoEntity orderRefundInfoEntity = playOrderRefundInfoService
                     .selectPlayOrderRefundInfoByOrderId(returnVo.getId());
-            returnVo.setRefundByType(orderRefundInfoEntity.getRefundByType());
-            returnVo.setRefundById(orderRefundInfoEntity.getRefundById());
-            returnVo.setRefundReason(orderRefundInfoEntity.getRefundReason());
+            if (orderRefundInfoEntity != null) {
+                returnVo.setRefundByType(orderRefundInfoEntity.getRefundByType());
+                returnVo.setRefundById(orderRefundInfoEntity.getRefundById());
+                returnVo.setRefundReason(orderRefundInfoEntity.getRefundReason());
+            } else {
+                log.warn("Refund info missing for cancelled order, orderId={}", returnVo.getId());
+            }
         }
         if (returnVo.getEstimatedRevenue() == null) {
             returnVo.setEstimatedRevenue(BigDecimal.ZERO);