From 2f2b4c7ed80ee5132718523e0c7e7e2956aaf27d Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期五, 15 八月 2025 17:54:25 +0800 Subject: [PATCH] 未接单取消 --- UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java index 9b16e19..b0b0470 100644 --- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java +++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java @@ -718,7 +718,16 @@ String travelItinerary = OrderUtil.createTravelItinerary(request); orderPrivateCar.setTravelId(travelItinerary); + Integer promotion1 = isPromotion(orderPrivateCar.getUserId()); + if(promotion1!=null){ + orderPrivateCar.setPromotion(2); + Driver driver1 = driverService.selectById(promotion); + orderPrivateCar.setPromotionUser(driver1.getName()); + orderPrivateCar.setPromotionPhone(driver1.getPhone()); + orderPrivateCar.setPromotionDriverId(promotion1); + } this.insertOrUpdate(orderPrivateCar); + //修改总订单人数 OrderPrivateCar orderPrivateCar2 = new OrderPrivateCar(); orderPrivateCar2.setSpellSuccess(1); @@ -2865,12 +2874,15 @@ } } Thread.sleep(pushOrder.getPushTime() * 1000);//设置等待时间 - Integer state = orderPrivateCarMapper.selectById(orderPrivateCar.getId()).getState(); + OrderPrivateCar orderPrivateCar1 = orderPrivateCarMapper.selectById(orderPrivateCar.getId()); + Integer state =orderPrivateCar1.getState(); if (state > 1) { orderIds.remove(orderPrivateCar.getId()); break; } if (i == querys.size() + 5) { + orderPrivateCar1.setState(10); + orderPrivateCarMapper.updateById(orderPrivateCar1); pushUtil.pushEndPush(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1); orderIds.remove(orderPrivateCar.getId()); } -- Gitblit v1.7.1