irving/peipei-backend
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fix(order): guard nulls and compare enums safely in clerk order details; add privacy masking for RANDOM pending; apply spotless (2025-11-01)

Browse Source
This commit is contained in:
irving
2025-11-01 14:05:30 -04:00
parent 427ad4b08a
commit 16ea9b9d48
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java
View File

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