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

@@ -48,12 +48,22 @@ public class AfterSaleOrderController {
         return R.ok();
     }
 
+    /**
+     * 取消退货/取消申请
+     * @param orderId
+     * @return R
+     */
     @ApiOperation("取消退货/取消申请")
     @Log(title = "取消退货/取消申请", businessType = BusinessType.UPDATE)
     @PutMapping("/cancel/{orderId}")
     public R cancel(@PathVariable Long orderId) {
-        this.afterSaleOrderService.cancel(orderId);
-        return R.ok();
+        try {
+            this.afterSaleOrderService.cancel(orderId);
+            return R.ok();
+        } catch (Exception e) {
+            log.error("取消退货/取消申请失败", e);
+            throw new RuntimeException(e);
+        }
     }
 
     @ApiOperation("售后信息修改物流单号")