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/crossCity/server/impl/OrderCrossCityServiceImpl.java |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
index 49916e2..bb1de00 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -1419,6 +1419,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);
+        }
+        
 		Map<String, String> geocode = gdMapGeocodingUtil.geocode(map.get("startLon").toString(), map.get("startLat").toString());
 		map.put("startCity", geocode.get("city"));
 		geocode = gdMapGeocodingUtil.geocode(map.get("endLon").toString(), map.get("endLat").toString());
@@ -2682,4 +2689,16 @@
 		}
 		return unPayOrderVOList;
 	}
+	
+	@Override
+	public void addAppeal(Integer uid, Integer orderId, String abnormalIntro, String abnormalImg) {
+		OrderCrossCity orderCrossCity = this.selectById(orderId);
+		if(orderCrossCity.getState()!=7 || orderCrossCity.getAbnormalIntro()!=null){
+			throw new RuntimeException("此订单无法申诉");
+		}
+		orderCrossCity.setAbnormalIntro(abnormalIntro);
+		orderCrossCity.setAbnormalImg(abnormalImg);
+		orderCrossCity.setAbnormal(1);
+		this.baseMapper.updateById(orderCrossCity);
+	}
 }

--
Gitblit v1.7.1