From 09c94fccfc3e62395c08ca47ae248fb573bca095 Mon Sep 17 00:00:00 2001 From: keivn Date: Thu, 30 Dec 2021 23:37:11 +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/service/impl/IPCommonServiceImpl.java | 1 + .../src/main/resources/mapper/carpool/POrderMapper.xml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ruiyi-carpool/src/main/java/com/ruoyi/carpool/service/impl/IPCommonServiceImpl.java b/ruiyi-carpool/src/main/java/com/ruoyi/carpool/service/impl/IPCommonServiceImpl.java index 49d668020..9b20970f8 100644 --- a/ruiyi-carpool/src/main/java/com/ruoyi/carpool/service/impl/IPCommonServiceImpl.java +++ b/ruiyi-carpool/src/main/java/com/ruoyi/carpool/service/impl/IPCommonServiceImpl.java @@ -51,6 +51,7 @@ public class IPCommonServiceImpl implements IPCommonService { logger.info("订单：" + orderNum+" 已经有司机接单，请联系司机。"); return AjaxResult.error("订单已经有司机接单，请联系司机。"); }else { + /*校验是否可以取消*/ Map info = pCommonMapper.queryOrderMemberStateByOpenId(commonVO); if(info != null && info.get("state") == 0){ diff --git a/ruiyi-carpool/src/main/resources/mapper/carpool/POrderMapper.xml b/ruiyi-carpool/src/main/resources/mapper/carpool/POrderMapper.xml index b6d44919b..3df99996c 100644 --- a/ruiyi-carpool/src/main/resources/mapper/carpool/POrderMapper.xml +++ b/ruiyi-carpool/src/main/resources/mapper/carpool/POrderMapper.xml @@ -42,8 +42,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select - id, order_num, departure, destination, departure_time, member, state,creater_name,creater_phone,creater_openid - isDelete, create_user, create_time, update_user, update_time + id, order_num, departure, destination, departure_time, member,state,creater_openid,isDelete,creater_name,creater_phone , + driver_id, create_user, create_time, update_user, update_time ,driver_open_id from p_order