Merge remote-tracking branch 'origin/point_dev' into point_dev

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/AfterSaleOrderServiceImpl.java

@@ -136,7 +136,7 @@ public class AfterSaleOrderServiceImpl extends ServiceImpl<AfterSaleOrderMapper,
         // 2. 查询并校验订单（公共方法提取）
         ProductOrderInfo productOrderInfo = this.productOrderInfoService.getAndCheckOrder(orderId, loginUser.getCOpenid());
 
-        // 3. 状态校验：必须是 退货中/退款中 才能取消退货
+        // 3. 状态校验：必须是 售后中 才能取消
         if (!ProductOrderStatusEnum.AFTER_SALES.getCode().equals(productOrderInfo.getOrderStatus())) {
             throw new ServiceException("订单状态异常，仅售后中状态可取消售后");
         }

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/ProductOrderInfoServiceImpl.java

@@ -443,6 +443,8 @@ public class ProductOrderInfoServiceImpl extends ServiceImpl<ProductOrderInfoMap
         // 查询售后订单
         LambdaQueryWrapper<AfterSaleOrder> queryWrapper = new LambdaQueryWrapper<AfterSaleOrder>()
                 .eq(AfterSaleOrder::getOrderId, orderId)
+                // 关键：添加 不等于取消状态 的条件
+                .ne(AfterSaleOrder::getAfterSaleStatus, AfterSaleStatusEnum.CANCELLED.getCode())
                 .orderByDesc(AfterSaleOrder::getCreateTime)
                 .last("LIMIT 1");
         AfterSaleOrder afterSaleOrder = afterSaleOrderMapper.selectOne(queryWrapper);