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/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 3 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 422f3e2..9ff2ccc 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
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.aliyun.oss.ServiceException;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.core.util.ToolUtil;
@@ -17,6 +18,7 @@
import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
import com.stylefeng.guns.modular.system.dao.*;
import com.stylefeng.guns.modular.system.model.*;
+import com.stylefeng.guns.modular.system.model.vo.UnPayOrderVO;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.*;
import com.stylefeng.guns.modular.system.warpper.*;
@@ -26,6 +28,7 @@
import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
import com.stylefeng.guns.modular.taxi.service.IPaymentRecordService;
import com.stylefeng.guns.modular.taxi.service.ITransactionDetailsService;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
@@ -1157,6 +1160,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);
+ }
+
+
if(Integer.valueOf(String.valueOf(map.get("state"))) != 8 && Integer.valueOf(String.valueOf(map.get("state"))) != 9){
map.put("redPacketMoney", null);
map.put("couponMoney", null);
@@ -2498,7 +2509,7 @@
}
Company query = companyCityService.query(String.valueOf(orderPrivateCar.getStartLon()), String.valueOf(orderPrivateCar.getStartLat()));//获取起点所属分公司
List<PushOrder> querys = pushOrderService.querys(null, 1, query.getId());//获取需要推送的次数
- for(int i = 1; i <= querys.size(); i++){
+ for(int i = 1; i <= querys.size()+5; i++){
OrderPrivateCar orderPrivateCar = orderPrivateCarMapper.selectById(id);
if (null == orderPrivateCar || orderPrivateCar.getState() > 1) {
break;
@@ -2540,7 +2551,7 @@
orderIds.remove(orderPrivateCar.getId());
return;
}
- if (i == querys.size() && state == 1) {
+ if (i == querys.size()+5 && state == 1) {
pushUtil.pushEndPush(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1);
orderIds.remove(orderPrivateCar.getId());
}
@@ -2582,7 +2593,7 @@
endPushWarpper.setState(1);
List<PushOrder> querys = pushOrderService.querys(null, 2, orderPrivateCar.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, orderPrivateCar.getCompanyId()).get(0);
time += pushOrder.getPushTime() * 1000;
}
@@ -2687,4 +2698,46 @@
public List<Map<String, Object>> queryOrderInfo2(Integer orderId, Integer state, String lon, String lat) {
return this.baseMapper.queryOrderInfo2(orderId,state,lon,lat);
}
+
+ /**
+ * 获取专车未支付订单
+ * @param uid
+ * @return
+ */
+ @Override
+ public List<UnPayOrderVO> getUnpayPrivateOrders(Integer uid) {
+ EntityWrapper<OrderPrivateCar> wrapper = new EntityWrapper<>();
+ wrapper.eq("userId", uid);
+ wrapper.eq("state", 7);
+ //查出未支付订单
+ List<OrderPrivateCar> orderPrivateCars = this.selectList(wrapper);
+ List<UnPayOrderVO> unPayOrderVOList = new ArrayList<>();
+ for (OrderPrivateCar order : orderPrivateCars) {
+ UnPayOrderVO vo = new UnPayOrderVO();
+ // 复制属性
+ //添加司机信息
+ DriverInfoWarpper driverInfoWarpper = new DriverInfoWarpper();
+ Driver driver = driverService.selectById(order.getDriverId());
+ BeanUtils.copyProperties(driver, driverInfoWarpper);
+ vo.setDriverInfoWarpper(driverInfoWarpper);
+ //其余信息
+ BeanUtils.copyProperties(order, vo);
+ unPayOrderVOList.add(vo);
+ }
+
+ return unPayOrderVOList;
+ }
+
+ @Override
+ public void addAppeal(Integer uid, Integer orderId,String abnormalIntro, String abnormalImg) {
+ OrderPrivateCar orderPrivateCar = this.selectById(orderId);
+ if(orderPrivateCar.getState()!=7 || orderPrivateCar.getAbnormalIntro()!=null){
+ throw new RuntimeException("此订单无法申诉");
+ }
+ orderPrivateCar.setAbnormalIntro(abnormalIntro);
+ orderPrivateCar.setAbnormalImg(abnormalImg);
+ orderPrivateCar.setAbnormal(1);
+ this.baseMapper.updateById(orderPrivateCar);
+
+ }
}
--
Gitblit v1.7.1