From d9651adb6f06263bfc222e41669368b1b308d593 Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Wed, 4 Dec 2024 17:54:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E5=8D=95=E6=97=B6=E8=BF=94=E5=9B=9Eor?= =?UTF-8?q?dersn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/bookAbroad/controller/OrderController.java | 2 +- .../modules/pay/paypal/controller/PaypalController.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/peanut/modules/bookAbroad/controller/OrderController.java b/src/main/java/com/peanut/modules/bookAbroad/controller/OrderController.java index 72574190..d4bb5dbd 100644 --- a/src/main/java/com/peanut/modules/bookAbroad/controller/OrderController.java +++ b/src/main/java/com/peanut/modules/bookAbroad/controller/OrderController.java @@ -80,7 +80,7 @@ public class OrderController { } } Map result = new HashMap<>(); - result.put("orderId", buyOrder.getOrderId()); + result.put("orderSn", buyOrder.getOrderSn()); return R.ok(result); } diff --git a/src/main/java/com/peanut/modules/pay/paypal/controller/PaypalController.java b/src/main/java/com/peanut/modules/pay/paypal/controller/PaypalController.java index 13893432..e734c93a 100644 --- a/src/main/java/com/peanut/modules/pay/paypal/controller/PaypalController.java +++ b/src/main/java/com/peanut/modules/pay/paypal/controller/PaypalController.java @@ -38,10 +38,14 @@ public class PaypalController { @RequestMapping("/createOrder") public R createOrder(@RequestBody Map params){ - BuyOrder buyOrder = buyOrderService.getById(params.get("orderId").toString()); + BuyOrder buyOrder = buyOrderService.getOne(new LambdaQueryWrapper() + .eq(BuyOrder::getOrderSn,params.get("orderSn"))); if ("3".equals(buyOrder.getOrderStatus())){ return R.error("订单已完成"); } + if ("point".equals(buyOrder.getOrderType())){ + buyOrder.setRemark("Recharge Virtual Coin"); + } JSONObject res = paypalConfig.createOrder(buyOrder); if (res.containsKey("links")&&res.containsKey("status")){ if ("CREATED".equals(res.get("status").toString())){