From 5e7bf77a48a2803eaa8c5a3b301ad2aac5b70100 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 15 八月 2025 18:31:49 +0800
Subject: [PATCH] 修改bug
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java | 37 ++++++++++++++++++-------------------
1 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
index 57c6917..15c85ec 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.account.service.ITEnterpriseWithdrawalService;
@@ -126,25 +127,28 @@
// if(null != query){
// return ResultUtil.error("有未完成支付的改派申请");
// }
+ int types=1;
Reassign query = reassignMapper.query(uid, null, reassign.getOrderId(), reassign.getOrderType(), 1);
if (null != query) {
+ types=2;
// return ResultUtil.error("不能重复提交申请");
reassignMapper.deleteById(query.getId());
}
query = reassignMapper.query(uid, null, reassign.getOrderId(), reassign.getOrderType(), 2);
- int types=1;
+
if (null != query) {
types=2;
// return ResultUtil.error("您提交的申请正在处理中");
}
-
//获取支付金额
-// Double aDouble = orderService.queryReassignMoney(reassign.getOrderId(), reassign.getOrderType());
-// reassign.setMoney(aDouble);
-// reassign.setOriginalDriverId(uid);
-// reassign.setOriginalCarId(driver.getCarId());
-// reassign.setInsertTime(new Date());
-// this.insert(reassign);
+ Double aDouble = orderService.queryReassignMoney(reassign.getOrderId(), reassign.getOrderType());
+ reassign.setMoney(aDouble);
+ reassign.setOriginalDriverId(uid);
+ reassign.setOriginalCarId(driver.getCarId());
+ reassign.setInsertTime(new Date());
+ if(types==1){
+ this.insert(reassign);
+ }
// systemNoticeService.addSystemNotice(2, "您的改派申请已成功提交，我们会尽快为你处理！", uid, 1);
//开始支付
@@ -284,6 +288,7 @@
Driver driver = driverService.selectById(uid);
//修改改派通知状态
switch (reassign.getOrderType()) {
+
case 1:
OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(reassign.getOrderId());
orderPrivateCar.setState(orderPrivateCar.getOldState());
@@ -322,6 +327,7 @@
OrderUtil.modifyTravelItinerary(request1);
break;
}
+ reassignMapper.delete(new EntityWrapper<Reassign>().eq("orderId",reassign.getOrderId()).eq("orderType",reassign.getOrderType()));
return ResultUtil.success();
}
@@ -759,11 +765,7 @@
}
OpenCity openCity = openCityService.openCity1(orderTaxi.getStartLon().toString(), orderTaxi.getStartLat().toString());
List<PushOrder> querys = pushOrderService.querys(null, 2, openCity.getId());//获取需要推送的次数
- int size=1;
- if(type==2){
- size = 6;
- }
-
+ int size=18;
for (int i = 1; i <= size; i++) {
int finalI = i;
PushOrder pushOrder = querys.stream().filter(s -> s.getType() == (finalI <= 3 ? finalI : 3)).findFirst().orElse(null);
@@ -797,7 +799,7 @@
if (state != 1 || state!= 11) {
break;
}
- if (i == 6 && (state == 1 || state==11)) {
+ if (i == 18 && (state == 1 || state==11)) {
pushUtil.pushEndPush(1, orderTaxi.getUserId(), orderTaxi.getId(), 2);
orderTaxi1.setState(10);
orderTaxiService.updateById(orderTaxi1);
@@ -832,10 +834,7 @@
}
OpenCity openCity = openCityService.openCity1(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
List<PushOrder> querys = pushOrderService.querys(null, 1, openCity.getId());//获取需要推送的次数
- int size=1;
- if(type==2){
- size=6;
- }
+ int size=18;
for (int i = 1; i <= size; i++) {
OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(id);
if (null == orderPrivateCar || (orderPrivateCar.getState() > 1 && orderPrivateCar.getState() != 11)) {
@@ -880,7 +879,7 @@
orderIds.remove(orderPrivateCar.getId());
return;
}
- if (i == 6 && (state == 1 || state==11)) {
+ if (i == 18 && (state == 1 || state==11)) {
pushUtil.pushEndPush(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1);
orderPrivateCar.setState(10);
orderPrivateCarService.updateById(orderPrivateCar);
--
Gitblit v1.7.1