From 73b750200f25df08aa64124da49e7461f9de6653 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期五, 13 十二月 2024 15:09:49 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel --- UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/NettyServiceImpl.java | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/NettyServiceImpl.java b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/NettyServiceImpl.java index d7cf23d..00bc9a1 100644 --- a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/NettyServiceImpl.java +++ b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/NettyServiceImpl.java @@ -8,6 +8,8 @@ import com.stylefeng.guns.modular.system.warpper.OrderServerWarpper; import com.stylefeng.guns.modular.system.warpper.OrderStatusWarpper; import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService; +import com.stylefeng.guns.modular.transfer.model.OrderTransferCar; +import com.stylefeng.guns.modular.transfer.server.IOrderTransferService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -27,6 +29,8 @@ @Autowired private IOrderCrossCityService orderCrossCityService; + @Autowired + private IOrderTransferService orderTransferService; /** * 获取下单推送完后没有司机接单的提醒 @@ -43,6 +47,9 @@ break; case 2: endPushWarpper = orderTaxiService.queryEndPush(uid); + break; + case 7: + endPushWarpper = orderTransferService.queryEndPush(uid); break; } return ResultUtil.success(endPushWarpper); @@ -70,6 +77,9 @@ case 3: orderServerWarpper = orderCrossCityService.queryOrderServer(orderId, uid);//出租车 break; + case 7: + orderServerWarpper = orderTransferService.queryOrderServer(orderId, uid);//专车 + break; } return ResultUtil.success(orderServerWarpper); } -- Gitblit v1.7.1