From ed02b20b31e013159c55ab14b81772e41b36649c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 26 七月 2025 17:37:59 +0800
Subject: [PATCH] 修改下单逻辑和抢单等相关逻辑
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 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..10b334c 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,7 +59,10 @@
@Resource
private DriverWorkMapper driverWorkMapper;
-
+ @Autowired
+ private ISysTimeoutMoneyService sysTimeoutMoneyService;
+ @Autowired
+ private IOpenCityService openCityService;
@@ -265,8 +265,7 @@
}
- @Autowired
- private ISysTimeoutMoneyService sysTimeoutMoneyService;
+
/**
* 获取服务中页面订单详情
@@ -291,8 +290,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,7 +310,6 @@
}
}
return ResultUtil.success(OrderInfoWarpper.getOrderInfoWarpper(map));
- //return ResultUtil.success(OrderInfoWarpper.getOrderInfoWarpper(map));
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -335,8 +333,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() + "%费用");
--
Gitblit v1.7.1