From 570ae72b8ab5cf51b91fd6dc48411710dbf04125 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期六, 26 七月 2025 14:46:32 +0800
Subject: [PATCH] 未完成订单
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
index 9090f85..0f338bc 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -1720,6 +1720,14 @@
if(Integer.valueOf(String.valueOf(map.get("state"))) == 11){
map.put("state", map.get("oldState"));
}
+
+ if(Integer.valueOf(String.valueOf(map.get("state"))) ==7 && (map.get("responsibilityType")==null || Integer.valueOf(String.valueOf(map.get("responsibilityType")))<4)){
+ map.put("appealButton", 1);
+ }
+ if(map.get("abnormalIntro")!=null){
+ map.put("appealStatus", 1);
+ }
+
String driverId = (String) redisTemplate.opsForValue().get("DEVICE_" + map.get("driverId"));
map.put("device", ToolUtil.isNotEmpty(driverId) ? 2 : 1);
map.put("orderType", 2);
@@ -1744,7 +1752,7 @@
endPushWarpper.setState(1);
List<PushOrder> querys = pushOrderService.querys(null, 2, orderTaxi.getCompanyId());//获取需要推送的次数
int time = 0;
- for(int i = 1; i <= querys.size(); i++){
+ for(int i = 1; i <= querys.size()+5; i++){
PushOrder pushOrder = pushOrderService.querys(i, 2, orderTaxi.getCompanyId()).get(0);
time += pushOrder.getPushTime() * 1000;
}
@@ -2101,7 +2109,7 @@
}
Company query = companyCityService.query(String.valueOf(orderTaxi.getStartLon()), String.valueOf(orderTaxi.getStartLat()));//获取起点所属分公司
List<PushOrder> querys = pushOrderService.querys(null, 2, query.getId());//获取需要推送的次数
- for (int i = 1; i <= querys.size(); i++) {
+ for (int i = 1; i <= querys.size()+5; i++) {
PushOrder pushOrder = pushOrderService.querys(i, 2, query.getId()).get(0);
System.out.println("pushOrder:" + pushOrder);
//获取空闲司机
@@ -2132,7 +2140,7 @@
if (state != 1) {
break;
}
- if (i == querys.size() && state == 1) {
+ if (i == querys.size()+5 && state == 1) {
pushUtil.pushEndPush(1, orderTaxi.getUserId(), orderTaxi.getId(), 2);
orderIds.remove(orderTaxi.getId());
}
@@ -2257,4 +2265,16 @@
return unPayOrderVOList;
}
+
+ @Override
+ public void addAppeal(Integer uid, Integer orderId, String abnormalIntro, String abnormalImg) {
+ OrderTaxi orderTaxi = this.selectById(orderId);
+ if(orderTaxi.getState()!=7 || orderTaxi.getAbnormalIntro()!=null){
+ throw new RuntimeException("此订单无法申诉");
+ }
+ orderTaxi.setAbnormalIntro(abnormalIntro);
+ orderTaxi.setAbnormalImg(abnormalImg);
+ orderTaxi.setAbnormal(1);
+ this.baseMapper.updateById(orderTaxi);
+ }
}
--
Gitblit v1.7.1