Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 in...

cloudroam

2024-11-07 9615ef3023e1a60d202e86178003a2b864191106

 src/main/java/com/mzl/flower/web/init/InitResource.java

@@ -36,7 +36,7 @@
        return returnData(R.SUCCESS.getCode(), null);
    }

    @GetMapping("/callback")
    /*@GetMapping("/callback")
    public ResponseEntity<ReturnDataDTO> callback(String orderId) {
        String originalXml = "";
        UserPaymentDTO dto = new UserPaymentDTO();
@@ -50,5 +50,5 @@
        userPaymentV3Service.saveCallbackInfo(dto, Constants.ORDER_STATUS_BACKEND.PAYMENT.name());

        return returnData(R.SUCCESS.getCode(), null);
    }
    }*/
}