Merge branch 'pxb' into xin

xin

2025-09-12 a21a8b9b733edd59dbcd3f696d2b69f10c4c3fc9

 oying-system/src/main/java/com/oying/modules/sh/rest/OrderReturnController.java

@@ -2,12 +2,12 @@

import com.oying.annotation.Log;
import com.oying.modules.sh.domain.OrderReturn;
import com.oying.modules.sh.domain.request.AuditOrderReturn;
import com.oying.modules.sh.domain.request.ReturnOrder;
import com.oying.modules.sh.service.OrderReturnService;
import com.oying.modules.sh.domain.dto.OrderReturnQueryCriteria;
import com.oying.utils.R;
import lombok.RequiredArgsConstructor;

import java.util.List;

import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -48,13 +48,35 @@
        return new ResponseEntity<>(R.success(orderReturnService.queryAll(criteria, page)), HttpStatus.OK);
    }

    @ApiOperation("订单号订单售后")
    @GetMapping(value = "/getByReturnNum")
    public ResponseEntity<Object> getByReturnNum(@RequestParam String returnNum) {
        return new ResponseEntity<>(R.success(orderReturnService.getByReturnNum(returnNum)), HttpStatus.OK);
    }

    @PostMapping
    @Log("新增退款订单")
    @ApiOperation("新增退款订单")
    @PreAuthorize("@el.check('orderReturn:add')")
    public ResponseEntity<Object> createOrderReturn(@Validated @RequestBody OrderReturn resources) {
    @Log("申请订单售后")
    @ApiOperation("申请订单售后")
    public ResponseEntity<Object> createOrderReturn(@Validated @RequestBody ReturnOrder resources) {
        orderReturnService.create(resources);
        return new ResponseEntity<>(R.success(), HttpStatus.CREATED);
    }

    @PostMapping("cancel")
    @Log("取消订单售后")
    @ApiOperation("取消订单售后")
    public ResponseEntity<Object> cancel(@RequestParam String returnNum) {
        orderReturnService.cancel(returnNum);
        return new ResponseEntity<>(R.success(), HttpStatus.CREATED);
    }

    @PutMapping("audit")
    @Log("审核退款订单")
    @ApiOperation("审核退款订单")
    @PreAuthorize("@el.check('orderReturn:edit')")
    public ResponseEntity<Object> audit(@Validated @RequestBody AuditOrderReturn resources) {
        orderReturnService.audit(resources);
        return new ResponseEntity<>(R.success(), HttpStatus.NO_CONTENT);
    }

    @PutMapping
@@ -64,14 +86,5 @@
    public ResponseEntity<Object> updateOrderReturn(@Validated @RequestBody OrderReturn resources) {
        orderReturnService.update(resources);
        return new ResponseEntity<>(R.success(), HttpStatus.NO_CONTENT);
    }

    @DeleteMapping
    @Log("删除退款订单")
    @ApiOperation("删除退款订单")
    @PreAuthorize("@el.check('orderReturn:del')")
    public ResponseEntity<Object> deleteOrderReturn(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
        orderReturnService.deleteAll(ids);
        return new ResponseEntity<>(R.success(), HttpStatus.OK);
    }
}