From 0b5d21c6338bb3bd094a5bf2379001c4e9772eb5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 26 七月 2025 18:03:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 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 49702bf..30055e5 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
@@ -1737,6 +1737,13 @@
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);
@@ -2287,4 +2294,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