aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev/dev_xp' into dev/dev

Browse Source 
# Conflicts:
#	src/main/resources/paypal-sandbox.properties
This commit is contained in:
xupei
2024-04-11 11:45:03 +08:00
parent 754de78b57 1d443b140b
commit 75a63c7a6f
7 changed files with 119 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/ai/da/controller/PayPalCheckoutController.java
View File

@@ -45,8 +45,8 @@ public class PayPalCheckoutController {
@ApiOperation(value = "查询指定订单")
@PostMapping(value = "/trade/query/{orderNo}")
public Response<String> queryOrder(@PathVariable String orderNo) throws SerializeException {
String s = payPalCheckoutService.queryOrder(orderNo);
public Response<Order> queryOrder(@PathVariable String orderNo) throws SerializeException {
Order s = payPalCheckoutService.queryOrder(orderNo);
return Response.success(s);
}