wangming 1 долоо хоног өмнө
parent
commit
07c3b0bc6f

+ 8 - 8
yami-shop-api/src/main/java/com/yami/shop/api/controller/OrderRefundController.java

@@ -47,7 +47,8 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 
 @RestController
-@RequestMapping("/p/orderRefund")
+//@RequestMapping("/p/orderRefund")
+@RequestMapping("/orderRefund")
 @Api(tags = "订单退款接口")
 @AllArgsConstructor
 public class OrderRefundController {
@@ -651,9 +652,9 @@ public class OrderRefundController {
     /**
      * 用户撤销退货退款申请
      */
-    @PutMapping("/cancel")
+    @GetMapping("/cancel")
     @ApiOperation(value = "撤销退货退款申请", notes = "")
-    public ResponseEntity<String> cancel(@RequestBody String refundSn) {
+    public ResponseEntity<String> cancel(@RequestParam("refundSn") String refundSn) {
         OrderRefundDto orderRefund = orderRefundService.getOrderRefundByRefundSn(refundSn);
         if (Objects.isNull(orderRefund)) {
             throw new GlobalException("撤销失败 退款订单不存在");
@@ -733,10 +734,6 @@ public class OrderRefundController {
             throw new GlobalException("查看失败 该退款订单不存在");
         }
 
-        if (!Objects.equals(orderRefundDto.getUserId(), SecurityUtils.getUser().getUserId())) {
-            throw new GlobalException("查看失败 您没有此权限");
-        }
-
         ApiOrderRefundDto apiOrderRefundDto = mapperFacade.map(orderRefundDto, ApiOrderRefundDto.class);
         return ResponseEntity.ok(apiOrderRefundDto);
     }
@@ -748,9 +745,12 @@ public class OrderRefundController {
     @ApiOperation(value = "我的退款订单列表", notes = "我的退款订单列表,显示数量时候")
     @ApiImplicitParam(name = "applyType", value = "申请类型: 0/null 全部  1仅退款  2退款退货", required = false, dataType = "Integer")
     public ResponseEntity<IPage<ApiOrderRefundDto>> list(PageParam<OrderRefundDto> page,
-                                                         @RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime, @RequestParam(required = false) Integer applyType) {
+                                                         @RequestParam(required = false) String startTime,
+                                                         @RequestParam(required = false) String endTime,
+                                                         @RequestParam(required = false) Integer applyType) {
         OrderRefundDto orderRefundDto = new OrderRefundDto();
         orderRefundDto.setUserId(SecurityUtils.getUser().getUserId());
+        //orderRefundDto.setUserId("b7ab06c99e21450b848832d79aad773a");
         // 0/null全部  1仅退款 2退款退货
         if (Objects.equals(0, applyType)) {
             applyType = null;