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())){