取消退货代码逻辑调整

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/ProductOrderController.java

@@ -132,21 +132,6 @@ public class ProductOrderController extends BaseController {
         return R.fail();
     }
 
-    /**
-     * 取消退货
-     * @param dto
-     * @return R
-     */
-    @ApiOperation("取消退货")
-    @PutMapping("/cancel/return")
-    public R cancelReturn(@Validated @RequestBody ProductOrderOperateDTO dto) {
-        boolean bool = this.productOrderInfoService.cancelReturn(dto);
-        if (bool) {
-            return R.ok();
-        }
-        return R.fail();
-    }
-
     @PreAuthorize("@ss.hasPermi('product:order:query')")
     @PostMapping("/admin/page")
     @ApiOperation("积分订单管理分页接口")

nightFragrance-massage/src/main/java/com/ylx/massage/service/IProductOrderInfoService.java

@@ -57,8 +57,6 @@ public interface IProductOrderInfoService extends IService<ProductOrderInfo> {
 
     boolean confirmReceipt(ProductOrderOperateDTO dto);
 
-    boolean cancelReturn(ProductOrderOperateDTO dto);
-
     Page<ProductOrderPageItemVo> adminPage(Page<ProductOrderInfo> page, ProductOrderPageDTO dto);
 
     ProductOrderDetailAdminVo getOrderDetailForAdmin(Long orderId);

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

@@ -123,11 +123,13 @@ public class AfterSaleOrderServiceImpl extends ServiceImpl<AfterSaleOrderMapper,
             throw new ServiceException("订单状态异常，仅售后中状态可取消售后");
         }
 
-        // 4. 取消售后订单
+        // 4. 取消售后订单(待审核 或 等待用户寄回)
         LambdaQueryWrapper<AfterSaleOrder> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(AfterSaleOrder::getOrderId, orderId)
                 .eq(AfterSaleOrder::getOpenId, loginUser.getCOpenid())
-                .eq(AfterSaleOrder::getAfterSaleStatus, AfterSaleStatusEnum.WAIT_AUDIT.getCode());
+                .in(AfterSaleOrder::getAfterSaleStatus,
+                        AfterSaleStatusEnum.WAIT_AUDIT.getCode(),
+                        AfterSaleStatusEnum.WAITING_USER_RETURN.getCode());
 
         AfterSaleOrder afterSaleOrder = this.afterSaleOrderMapper.selectOne(queryWrapper);
         if (ObjectUtil.isNull(afterSaleOrder)) {

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

@@ -467,27 +467,6 @@ public class ProductOrderInfoServiceImpl extends ServiceImpl<ProductOrderInfoMap
         return this.updateById(productOrderInfo);
     }
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public boolean cancelReturn(ProductOrderOperateDTO dto) {
-
-        // 1. 获取当前登录用户（公共方法提取）
-        WxLoginUser loginUser = getCurrentWxLoginUser();
-
-        // 2. 查询并校验订单（公共方法提取）
-        ProductOrderInfo productOrderInfo = getAndCheckOrder(dto.getOrderId(), loginUser.getCOpenid());
-
-        // 3. 状态校验：必须是 退货中/退款中 才能取消退货
-        /*if (!ProductOrderStatusEnum.RETURNING.getCode().equals(productOrderInfo.getOrderStatus())) {
-            throw new ServiceException("订单状态异常，仅退货中状态可取消退货");
-        }*/
-        // 修改订单信息
-        LocalDateTime now = LocalDateTime.now();
-        productOrderInfo.setOrderStatus(ProductOrderStatusEnum.WAIT_RECEIVE.getCode());
-        productOrderInfo.setUpdateTime(now);
-        return this.updateById(productOrderInfo);
-    }
-
     @Override
     public Page<ProductOrderPageItemVo> adminPage(Page<ProductOrderInfo> page, ProductOrderPageDTO dto) {
         return this.productOrderInfoMapper.adminPage(page, dto);