From 90f19cfec1055182b6e2b77cac8f7cafe1664e46 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 10 十一月 2025 14:24:10 +0800
Subject: [PATCH] 修改bug
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 63 +++++++++++++++++++------------
1 files changed, 39 insertions(+), 24 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 1ed8aa6..e700891 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
@@ -484,6 +484,27 @@
//添加消息
systemNoticeService.addSystemNotice(1, "您的快车订单已下单成功，我们正在为您指派司机，请稍后！", orderPrivateCar.getUserId(), 1);
baseWarpper.setId(orderPrivateCar.getId());
+
+ if(null != orderPrivateCar.getDriverId()){
+ Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
+ UserInfo userInfo = userInfoService.selectById(orderPrivateCar.getUserId());
+ Company company = companyService.selectById(driver.getCompanyId());
+ //调三方订单中心创建行程单
+ CreateTravelItineraryRequest request = new CreateTravelItineraryRequest();
+ request.setOrderNo("PR" + orderPrivateCar.getId());
+ request.setCustomerId(userInfo.getOnconUUID());
+ request.setDriverId(driver.getEmpId().toString());
+ request.setSupplierShopId(company.getEnterCode());
+ if(orderPrivateCar.getPromotion() !=null && 2 == orderPrivateCar.getPromotion()){
+ Driver driver1 = driverService.selectById(orderPrivateCar.getPromotionDriverId());
+ request.setPromoterId(driver1.getEmpId().toString());
+ }
+ request.setServiceType(2);
+ String travelItinerary = OrderUtil.createTravelItinerary(request);
+ orderPrivateCar.setTravelId(travelItinerary);
+ this.insertOrUpdate(orderPrivateCar);
+ }
+
} catch (Exception e) {
e.printStackTrace();
} finally {
@@ -721,22 +742,6 @@
orderPrivateCar.setPromotionDriverId(promotion1);
}
- Company company = companyService.selectById(driver.getCompanyId());
- //调三方订单中心创建行程单
- CreateTravelItineraryRequest request = new CreateTravelItineraryRequest();
- request.setOrderNo("PR" + orderPrivateCar.getId());
- request.setCustomerId(userInfo.getOnconUUID());
- request.setDriverId(driver.getEmpId().toString());
- request.setSupplierShopId(company.getEnterCode());
- if(orderPrivateCar.getPromotion() !=null && 2 == orderPrivateCar.getPromotion()){
- Driver driver1 = driverService.selectById(orderPrivateCar.getPromotionDriverId());
- request.setPromoterId(driver1.getEmpId().toString());
- }
- request.setServiceType(2);
- String travelItinerary = OrderUtil.createTravelItinerary(request);
- orderPrivateCar.setTravelId(travelItinerary);
- this.insertOrUpdate(orderPrivateCar);
-
//修改总订单人数
OrderPrivateCar orderPrivateCar2 = new OrderPrivateCar();
orderPrivateCar2.setSpellSuccess(1);
@@ -772,6 +777,24 @@
//添加消息
systemNoticeService.addSystemNotice(1, "您的快车订单已下单成功，我们正在为您指派司机，请稍后！", orderPrivateCar.getUserId(), 1);
baseWarpper.setId(orderPrivateCar.getId());
+ if(null != orderPrivateCar.getDriverId()){
+ Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
+ Company company = companyService.selectById(driver.getCompanyId());
+ //调三方订单中心创建行程单
+ CreateTravelItineraryRequest request = new CreateTravelItineraryRequest();
+ request.setOrderNo("PR" + orderPrivateCar.getId());
+ request.setCustomerId(userInfo.getOnconUUID());
+ request.setDriverId(driver.getEmpId().toString());
+ request.setSupplierShopId(company.getEnterCode());
+ if(orderPrivateCar.getPromotion() !=null && 2 == orderPrivateCar.getPromotion()){
+ Driver driver1 = driverService.selectById(orderPrivateCar.getPromotionDriverId());
+ request.setPromoterId(driver1.getEmpId().toString());
+ }
+ request.setServiceType(2);
+ String travelItinerary = OrderUtil.createTravelItinerary(request);
+ orderPrivateCar.setTravelId(travelItinerary);
+ this.insertOrUpdate(orderPrivateCar);
+ }
} catch (Exception e) {
e.printStackTrace();
} finally {
@@ -1138,14 +1161,6 @@
CancleOrder query = cancleOrderService.query(orderPrivateCar.getOrderType(), 1, openCity.getId());
if (null != query) {
if (payType == 1) {//微信支付
- String value = (String) redisTemplate.opsForValue().get("appletOpenId");
- String appletsOpenId = null;
- if (ToolUtil.isNotEmpty(value)) {
- JSONObject jsonObject = JSON.parseObject(value);
- appletsOpenId = jsonObject.getString(uid.toString());
- } else {
- appletsOpenId = userInfo.getAppletsOpenId();
- }
orderCancel.setPayType(1);
orderCancelService.updateById(orderCancel);
String app = type == 1 ? "APP" : "JSAPI";
--
Gitblit v1.7.1