From 5470d21a35286abe41fafc25a7deaabefd7c55da Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 28 五月 2024 14:30:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
index 5f6e7e5..7b6c60a 100644
--- a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
+++ b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java
@@ -8,6 +8,8 @@
import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
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.http.HttpEntity;
import org.springframework.http.HttpHeaders;
@@ -45,6 +47,8 @@
@Autowired
private IOrderCrossCityService orderCrossCityService;
+ @Autowired
+ private IOrderTransferService orderTransferService;
private Map<String, JSONObject> pushMap = new HashMap<>();//存储需要定时推送的数据
@@ -58,7 +62,7 @@
* @param type 1=用户，2=司机
* @param uid 对象id
* @param orderId 订单id
- * @param orderType 订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）
+ * @param orderType 订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车 7=接送机）
* @param state 订单状态（1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中，12=取消待支付）
*/
public void pushOrderState(Integer type, Integer uid, Integer orderId, Integer orderType, Integer state, Integer time){
@@ -146,6 +150,10 @@
OrderCrossCity orderCrossCity = orderCrossCityService.selectById(orderId);
userId = orderCrossCity.getUserId();
break;
+ case 7:
+ OrderTransferCar orderTransferCar = orderTransferService.selectById(orderId);
+ userId = orderTransferCar.getUserId();
+ break;
}
JSONObject data = new JSONObject();
data.put("id", userId);
--
Gitblit v1.7.1