From b86bca07c2bf3997860d6df3c1e6e9ed7cc0d280 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期日, 28 四月 2024 17:47:48 +0800
Subject: [PATCH] 新增加功能
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 deletions(-)
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 fbfc461..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);
+// }
}
@@ -652,6 +652,7 @@
orderPrivateCar.setGetoffAddress(address);
orderPrivateCar.setGetoffTime(new Date());
orderPrivateCar.setEndServiceTime(new Date());
+ orderPrivateCar.setCancelMidway(1);
}else{
orderPrivateCar.setState(10);
}
@@ -663,6 +664,7 @@
orderPrivateCar.setGetoffAddress(address);
orderPrivateCar.setGetoffTime(new Date());
orderPrivateCar.setEndServiceTime(new Date());
+ orderPrivateCar.setCancelMidway(1);
}
orderPrivateCar.setOldState(6);
orderPrivateCar.setState(12);
@@ -1584,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()));
@@ -1982,6 +1985,10 @@
query.setState(1);
query.setRedPacketActivityId(id.getId());
userRedPacketRecordService.updateById(query);
+
+ // todo 待翻译
+ String content = 1 == language ? ("您收到一个额度为GHS " + money + " 的红包，请查收") : 2 == language ? "" : "";
+ systemNoticeService.addSystemNotice(1, content, query.getUserId(), 1);
UserInfo userInfo = userInfoService.selectById(orderPrivateCar.getUserId());
if(ToolUtil.isNotEmpty(userInfo.getEmail())){
--
Gitblit v1.7.1