From 25c0586d55151f853a25451e15bf2cf85e1cc79d Mon Sep 17 00:00:00 2001 From: keivn Date: Thu, 30 Dec 2021 23:53:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E8=B5=B7=E6=8B=BC?= =?UTF-8?q?=E5=8D=95=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/carpool/controller/POrderController.java | 2 +- .../java/com/ruoyi/carpool/service/IPOrderService.java | 2 +- .../com/ruoyi/carpool/service/impl/POrderServiceImpl.java | 7 +++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ruiyi-carpool/src/main/java/com/ruoyi/carpool/controller/POrderController.java b/ruiyi-carpool/src/main/java/com/ruoyi/carpool/controller/POrderController.java index 0c0a675bf..50636d21c 100644 --- a/ruiyi-carpool/src/main/java/com/ruoyi/carpool/controller/POrderController.java +++ b/ruiyi-carpool/src/main/java/com/ruoyi/carpool/controller/POrderController.java @@ -102,7 +102,7 @@ public class POrderController extends BaseController @PostMapping("/takeOrder") public AjaxResult takeOrder(@RequestBody POrder pOrder) { - return pOrderService.takeOrder(pOrder); + return toAjax(pOrderService.takeOrder(pOrder)); } /** * 修改订单信息 diff --git a/ruiyi-carpool/src/main/java/com/ruoyi/carpool/service/IPOrderService.java b/ruiyi-carpool/src/main/java/com/ruoyi/carpool/service/IPOrderService.java index adb8a7612..ce4fb7846 100644 --- a/ruiyi-carpool/src/main/java/com/ruoyi/carpool/service/IPOrderService.java +++ b/ruiyi-carpool/src/main/java/com/ruoyi/carpool/service/IPOrderService.java @@ -82,5 +82,5 @@ public interface IPOrderService * @param pOrder 订单信息 * @return 结果 */ - public AjaxResult takeOrder(POrder pOrder); + public int takeOrder(POrder pOrder); } diff --git a/ruiyi-carpool/src/main/java/com/ruoyi/carpool/service/impl/POrderServiceImpl.java b/ruiyi-carpool/src/main/java/com/ruoyi/carpool/service/impl/POrderServiceImpl.java index 34a0bdbd9..3e9f476fd 100644 --- a/ruiyi-carpool/src/main/java/com/ruoyi/carpool/service/impl/POrderServiceImpl.java +++ b/ruiyi-carpool/src/main/java/com/ruoyi/carpool/service/impl/POrderServiceImpl.java @@ -181,12 +181,11 @@ public class POrderServiceImpl implements IPOrderService * @return 结果 */ @Override - public AjaxResult takeOrder(POrder pOrder) + public int takeOrder(POrder pOrder) { +// String driverOpenId = pOrder.getDriverOpenId(); pOrder.setIsTake("1"); - pOrderMapper.takeOrderById(pOrder); - - return null ; + return pOrderMapper.takeOrderById(pOrder); }