Merge remote-tracking branch 'origin/master-v4' into master-v4

陶杰

2024-12-11 b1bef8fac3c0553f87b7047673123b23b68daa49

 src/main/java/com/mzl/flower/web/customer/OrderCustomerController.java

@@ -92,7 +92,7 @@
            @ApiImplicitParam(name = "id", value = "订单id", required = true, dataType = "String", paramType = "query"),
    })
    @ApiOperation(value = "退款")
    public ResponseEntity<ReturnDataDTO> refundOrder(String id) {
    public ResponseEntity<ReturnDataDTO> refundOrder(String id) throws Exception {
        orderService.refundCheck(id);
        paymentV3Service.refundOrder(id);
        return returnData(R.SUCCESS.getCode(), null);