From 4af0a2ddc8940cd38d0e602409cace1a7c50ea13 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 04 八月 2025 09:55:58 +0800
Subject: [PATCH] 新增加开通城市基础配置功能
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 76 +++++++++++++++++++++-----------------
1 files changed, 42 insertions(+), 34 deletions(-)
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 4ed52c8..57f5b56 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -9,10 +9,7 @@
import com.stylefeng.guns.modular.smallLogistics.model.OrderLogistics;
import com.stylefeng.guns.modular.smallLogistics.server.IOrderLogisticsService;
import com.stylefeng.guns.modular.system.dao.DriverWorkMapper;
-import com.stylefeng.guns.modular.system.model.DriverWork;
-import com.stylefeng.guns.modular.system.model.Reassign;
-import com.stylefeng.guns.modular.system.model.SysTimeoutMoney;
-import com.stylefeng.guns.modular.system.model.TimeOutAppeal;
+import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.ChinaMobileUtil;
import com.stylefeng.guns.modular.system.util.PushUtil;
@@ -62,6 +59,13 @@
@Resource
private DriverWorkMapper driverWorkMapper;
+ @Autowired
+ private ISysTimeoutMoneyService sysTimeoutMoneyService;
+ @Autowired
+ private IOpenCityService openCityService;
+
+ @Autowired
+ private ICarService carService;
@@ -257,6 +261,18 @@
if(null == driverWork1){
return ResultUtil.error("您已下班，无法接单");
}
+
+ Driver driver = driverService.selectById(uid);
+
+ //判断车辆是否正在使用中
+ Car car = carService.selectById(driver.getCarId());
+ if(car.getUseDriverId() != null && !car.getUseDriverId().equals(uid)){
+ return ResultUtil.error("当前绑定车辆正在使用中，请更换车辆");
+ }else if(car.getUseDriverId()==null){
+ car.setUseDriverId(uid);
+ carService.updateById(car);
+ }
+
return orderService.grabOrder(orderId, orderType, uid);
}catch (Exception e){
e.printStackTrace();
@@ -265,8 +281,7 @@
}
- @Autowired
- private ISysTimeoutMoneyService sysTimeoutMoneyService;
+
/**
* 获取服务中页面订单详情
@@ -291,8 +306,8 @@
Map<String, Object> map = orderService.queryOrderInfo(uid, orderId, orderType);
if (orderType == 4 || orderType == 5){
-
- SysTimeoutMoney sysTimeoutMoney = sysTimeoutMoneyService.selectOne(null);
+ OpenCity openCity = openCityService.openCity1(map.get("startLon").toString(), map.get("startLat").toString());
+ SysTimeoutMoney sysTimeoutMoney = sysTimeoutMoneyService.selectOne(new EntityWrapper<SysTimeoutMoney>().eq("openCityId", openCity.getId()));
map.put("timeOutMoney",Double.parseDouble(map.get("timeOutMoney").toString()));
map.put("note","配送超过" + sysTimeoutMoney.getTimeOut() + "分钟扣订单的" + sysTimeoutMoney.getDeductMoney() + "%费用");
@@ -311,12 +326,14 @@
}
}
return ResultUtil.success(OrderInfoWarpper.getOrderInfoWarpper(map));
- //return ResultUtil.success(OrderInfoWarpper.getOrderInfoWarpper(map));
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
}
}
+
+
+
@ResponseBody
@PostMapping("/api/order/queryOrderInfo1")
@@ -335,8 +352,8 @@
Map<String, Object> map = orderService.queryOrderInfo(uid, orderId, 7);
if (orderType == 4 || orderType == 5){
-
- SysTimeoutMoney sysTimeoutMoney = sysTimeoutMoneyService.selectOne(null);
+ OpenCity openCity = openCityService.openCity1(map.get("startLon").toString(), map.get("startLat").toString());
+ SysTimeoutMoney sysTimeoutMoney = sysTimeoutMoneyService.selectOne(new EntityWrapper<SysTimeoutMoney>().eq("openCityId", openCity.getId()));
map.put("timeOutMoney",Double.parseDouble(map.get("timeOutMoney").toString()));
map.put("note","配送超过" + sysTimeoutMoney.getTimeOut() + "分钟扣订单的" + sysTimeoutMoney.getDeductMoney() + "%费用");
@@ -540,6 +557,10 @@
return ResultUtil.runErr();
}
}
+
+
+
+
@ResponseBody
@PostMapping("/api/order/cancleOrder")
@@ -557,6 +578,9 @@
return ResultUtil.runErr();
}
}
+
+
+
@ResponseBody
@PostMapping("/api/order/updatePeopleNum")
@ApiOperation(value = "修改人数", tags = {"司机端-服务中"}, notes = "")
@@ -574,6 +598,8 @@
return ResultUtil.runErr();
}
}
+
+
@ResponseBody
@PostMapping("/api/order/confirmFees1")
@@ -709,30 +735,7 @@
}
- @ResponseBody
- @PostMapping("/base/order/test")
- public String test(String phoneA, String phoneB){
- try {
- Map<String, String> map = chinaMobileUtil.midAxbBindSend(phoneA, phoneB, (System.currentTimeMillis() + 86400000));
- System.err.println(JSON.toJSONString(map));
- }catch (Exception e){
- e.printStackTrace();
- return "";
- }
- return null;
- }
- @ResponseBody
- @PostMapping("/base/order/test_")
- public String test(String bindId){
- try {
- Map<String, String> map = chinaMobileUtil.midAxbUnBindSend(bindId, null, null);
- }catch (Exception e){
- e.printStackTrace();
- return "";
- }
- return null;
- }
/**
@@ -765,6 +768,9 @@
}
+
+
+
@ResponseBody
@PostMapping("/api/order/queryVoiceBroadcast")
@ApiOperation(value = "接单后获取语音播报内容", tags = {"司机端-首页"}, notes = "")
@@ -811,6 +817,8 @@
}
}
+
+
@ResponseBody
--
Gitblit v1.7.1