From fff5b0c53f98e2ec0a38a7a35bfe0b1f1c580721 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期日, 28 四月 2024 16:49:28 +0800
Subject: [PATCH] 新增加功能
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 30 +++++++-------
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml | 3 +
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderWarpper.java | 3 +
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 33 ++++++++--------
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml | 3 +
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java | 5 ++
6 files changed, 42 insertions(+), 35 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml
index 9854eb3..fde805c 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml
@@ -265,7 +265,8 @@
h.userType as cancelUserType,
h.money as cancelMoney,
h.reason as cancelReason,
- h.remark as cancelRemark
+ h.remark as cancelRemark,
+ a.snatchOrderTime
from t_order_logistics a
left join t_driver b on (a.driverId = b.id)
left join t_car c on (a.carId = c.id)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
index 3337fa0..78a83ce 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -776,21 +776,21 @@
if(orderLogistics.getState() == 1){
this.pushOrder(orderLogistics);
}else{
- //接单后定时任务判断司机是否去接乘客，没有则推送提醒
- CancleOrder cancleOrder = cancleOrderService.query(orderLogistics.getCompanyId());
- if(null != cancleOrder){
- JSONObject object = JSON.parseObject(cancleOrder.getContent());
- long time = object.getInteger("driverTimeout") * 60000L;
- new Timer().schedule(new TimerTask() {
- @Override
- public void run() {
- OrderLogistics orderLogistics1 = OrderLogisticsServiceImpl.this.selectById(orderLogistics.getId());
- if(orderLogistics1.getState() == 2){
- pushUtil.pushDriverTimeOut(1, orderLogistics1.getUserId(), orderLogistics1.getId(), 4);
- }
- }
- }, time);
- }
+// //接单后定时任务判断司机是否去接乘客，没有则推送提醒
+// CancleOrder cancleOrder = cancleOrderService.query(orderLogistics.getCompanyId());
+// if(null != cancleOrder){
+// JSONObject object = JSON.parseObject(cancleOrder.getContent());
+// long time = object.getInteger("driverTimeout") * 60000L;
+// new Timer().schedule(new TimerTask() {
+// @Override
+// public void run() {
+// OrderLogistics orderLogistics1 = OrderLogisticsServiceImpl.this.selectById(orderLogistics.getId());
+// if(orderLogistics1.getState() == 2){
+// pushUtil.pushDriverTimeOut(1, orderLogistics1.getUserId(), orderLogistics1.getId(), 4);
+// }
+// }
+// }, time);
+// }
}
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml
index 5133047..bc34314 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml
@@ -446,7 +446,8 @@
a.isFree,
a.moneyType,
a.moneyTime,
- a.isFrozen
+ a.isFrozen,
+ a.snatchOrderTime
from t_order_private_car a
left join t_driver b on (a.driverId = b.id)
left join t_car c on (a.carId = c.id)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index e0b2fe9..1e44723 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -439,21 +439,21 @@
if(orderPrivateCar.getState() == 1){
this.pushOrder(orderPrivateCar);
}else{
- //接单后定时任务判断司机是否去接乘客，没有则推送提醒
- CancleOrder cancleOrder = cancleOrderService.query(orderPrivateCar.getCompanyId());
- if(null != cancleOrder){
- JSONObject object = JSON.parseObject(cancleOrder.getContent());
- long time = object.getInteger("driverTimeout") * 60000L;
- new Timer().schedule(new TimerTask() {
- @Override
- public void run() {
- OrderPrivateCar orderPrivateCar1 = OrderPrivateCarServiceImpl.this.selectById(orderPrivateCar.getId());
- if(orderPrivateCar1.getState() == 2){
- pushUtil.pushDriverTimeOut(1, orderPrivateCar1.getUserId(), orderPrivateCar1.getId(), 1);
- }
- }
- }, time);
- }
+// //接单后定时任务判断司机是否去接乘客，没有则推送提醒
+// CancleOrder cancleOrder = cancleOrderService.query(orderPrivateCar.getCompanyId());
+// if(null != cancleOrder){
+// JSONObject object = JSON.parseObject(cancleOrder.getContent());
+// long time = object.getInteger("driverTimeout") * 60000L;
+// new Timer().schedule(new TimerTask() {
+// @Override
+// public void run() {
+// OrderPrivateCar orderPrivateCar1 = OrderPrivateCarServiceImpl.this.selectById(orderPrivateCar.getId());
+// if(orderPrivateCar1.getState() == 2){
+// pushUtil.pushDriverTimeOut(1, orderPrivateCar1.getUserId(), orderPrivateCar1.getId(), 1);
+// }
+// }
+// }, time);
+// }
}
@@ -1586,7 +1586,8 @@
Double maxPrice = jsonObject.getDouble("maxPrice");
Integer type1 = jsonObject.getInteger("type");
if(1 == type1){
- List<SettlementDetail> settlementDetailList = settlementDetailService.selectList(new EntityWrapper<SettlementDetail>().eq("driverId", driver.getId()).isNull("settlementRecordId").last(" and DATE_FORMAT(now(), '%Y-%m-%d') = DATE_FORMAT(createTime, '%Y-%m-%d')"));
+ List<SettlementDetail> settlementDetailList = settlementDetailService.selectList(new EntityWrapper<SettlementDetail>().eq("driverId", driver.getId())
+ .isNull("settlementRecordId").last(" and DATE_FORMAT(now(), '%Y-%m-%d') = DATE_FORMAT(createTime, '%Y-%m-%d')"));
BigDecimal total = new BigDecimal(0);
for (SettlementDetail detail : settlementDetailList) {
total = total.add(new BigDecimal(detail.getPrice()));
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
index ac567c2..2450c01 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
@@ -17,7 +17,7 @@
private Integer orderType;
@ApiModelProperty("订单类型（1=普通订单，2=摆渡车）")
private Integer type;
- @ApiModelProperty("订单状态（1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中，12=取消待支付）")
+ @ApiModelProperty("订单状态（1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中，12=取消待支付，13=补差价）")
private Integer state;
@ApiModelProperty("下单时间")
private String insertTime;
@@ -140,6 +140,8 @@
private String receipt;
@ApiModelProperty("是否冻结（1=否，2=是）")
private Integer isFrozen;
+ @ApiModelProperty("司机接单时间")
+ private String snatchOrderTime;
@ApiModelProperty("超时取消时间")
private Integer timeOutCancel;
private List<OrderPosition> orderPositionList;
@@ -213,6 +215,7 @@
orderInfoWarpper.setReceipt(null != map.get("receipt") ? map.get("receipt").toString() : "");
orderInfoWarpper.setIsFrozen(null != map.get("isFrozen") ? Integer.valueOf(map.get("isFrozen").toString()) : 1);
orderInfoWarpper.setTimeOutCancel(null != map.get("timeOutCancel") ? Integer.valueOf(map.get("timeOutCancel").toString()) : 0);
+ orderInfoWarpper.setSnatchOrderTime(null != map.get("snatchOrderTime") ? map.get("snatchOrderTime").toString() : "");
}
if(orderInfoWarpper.getState()==7){
orderInfoWarpper.setOrderMoney(orderInfoWarpper.getOrderMoney()-orderInfoWarpper.getDiscountMoney());
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderWarpper.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderWarpper.java
index 959eaa9..d4faec9 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderWarpper.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderWarpper.java
@@ -29,7 +29,7 @@
@ApiModelProperty("司机id")
private Integer driverId;
@ApiModelProperty("订单状态（1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中，12=取消待支付）<br/>" +
- "小件物流订单状态（1=待接单，2=待出发，3=待到达预约地点，4=待取货，5=送货中，6=已送达，7=待支付，8=需补差价，9=已取货，10=已取消，11=已支付差价")
+ "小件物流订单状态（1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中，12=取消待支付，13=补差价")
private Integer state;
@ApiModelProperty("货物类型（小件物流）")
private String cargoType;
@@ -256,6 +256,7 @@
orderWarpper.setDifferenceMoney(null != map.get("differenceMoney") ? Double.valueOf(map.get("differenceMoney").toString()) : 0D);
orderWarpper.setReceipt(null != map.get("receipt") ? String.valueOf(map.get("receipt")) : "");
orderWarpper.setIsFrozen(null != map.get("isFrozen") ? Integer.valueOf(String.valueOf(map.get("isFrozen"))) : 1);
+ orderWarpper.setCancelMidway(null != map.get("cancelMidway") ? Integer.valueOf(String.valueOf(map.get("cancelMidway"))) : 0);
list.add(orderWarpper);
}
}
--
Gitblit v1.7.1