From 574cd41b6e4aa65426c7597297aa94f6259d6666 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 21 八月 2025 18:57:26 +0800
Subject: [PATCH] 修改bug
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 68 +++-------------------------------
1 files changed, 6 insertions(+), 62 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 7cee817..d34c2b8 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -638,14 +638,13 @@
} else {
OrderPrivateCar orderPrivateCar1 = null;
OpenCity openCity = openCityService.openCity1(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
+ TbSpellOrderRule spellOrderRule = spellOrderRuleService.selectOne(new EntityWrapper<TbSpellOrderRule>().eq("openCityId", openCity.getId()));
//判断是否有相同线路的拼车-有直接拼成功，或者推送拼车订单
List<OrderPrivateCar> orderList = orderPrivateCarMapper.selectList(new EntityWrapper<OrderPrivateCar>().eq("rideType", 3).in("state", "2,3,4").le("totalPeopleNum", 4 - peopleNum));
for (OrderPrivateCar order : orderList) {
- TbSpellOrderRule spellOrderRule = spellOrderRuleService.selectOne(new EntityWrapper<TbSpellOrderRule>().eq("openCityId", openCity.getId()));
if (spellOrderRule != null) {
JSONObject jsonObject = JSONObject.parseObject(spellOrderRule.getContent());
//判断时间
-
if (travelTime.getTime() >= order.getTravelTime().getTime() - jsonObject.getInteger("num5") * 60000L && travelTime.getTime() <= order.getTravelTime().getTime() + jsonObject.getInteger("num6") * 60000L) {
// Double dis1 = Double.valueOf(gdMapElectricFenceUtil.getDistance(orderPrivateCar.getStartLon() + "," + orderPrivateCar.getStartLat(), order.getStartLon() + "," + order.getStartLat(), 1).get("distance").toString());
// Double dis2 = Double.valueOf(gdMapElectricFenceUtil.getDistance(orderPrivateCar.getEndLon() + "," + orderPrivateCar.getEndLat(), order.getEndLon() + "," + order.getEndLat(), 1).get("distance").toString());
@@ -663,7 +662,6 @@
if (orderPrivateCar1 == null) {
orderList = orderPrivateCarMapper.selectList(new EntityWrapper<OrderPrivateCar>().eq("rideType", 3).eq("state", 5).le("totalPeopleNum", 4 - peopleNum));
for (OrderPrivateCar order : orderList) {
- TbSpellOrderRule spellOrderRule = spellOrderRuleService.selectOne(new EntityWrapper<TbSpellOrderRule>().eq("openCityId", openCity.getId()));
if (spellOrderRule != null) {
JSONObject jsonObject = JSONObject.parseObject(spellOrderRule.getContent());
//判断时间
@@ -975,7 +973,7 @@
// return ResultUtil.error("司机已到达预约点，取消会产生一定的费用");
// }
if (orderPrivateCar.getState() >= 5 && orderPrivateCar.getState() != 11) {
- return ResultUtil.error("取消订单失败，不合法的操作");
+ return ResultUtil.error("订单已取消，请刷新页面");
}
Integer number1 = this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("pid", orderPrivateCar.getPid() == null ? orderPrivateCar.getId() : orderPrivateCar.getPid()).lt("state", 6));
Integer number2 = this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("id", orderPrivateCar.getPid() == null ? orderPrivateCar.getId() : orderPrivateCar.getPid()).lt("state", 6));
@@ -1000,73 +998,17 @@
orderCancelService.saveData(orderPrivateCar1.getId(), 1, "无司机接单", "无司机接单", null, null, 2, 1, uid);
orderPrivateCar1.setState(10);
this.updateById(orderPrivateCar1);
-
- Driver driver1 = null;
- Company company = null;
- //中台修改订单状态
- ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
- request.setOrderId(orderPrivateCar1.getTravelId());
- request.setStatus(orderPrivateCar1.getState());
- if (null != orderPrivateCar1.getDriverId()) {
- driver1 = driverService.selectById(orderPrivateCar1.getDriverId());
- company = companyService.selectById(driver1.getCompanyId());
- request.setDriverId(driver1.getEmpId().toString());
- request.setSupplierShopId(company.getEnterCode());
- }
- if (2 == orderPrivateCar1.getPromotion()) {
- Driver driver2 = driverService.selectById(orderPrivateCar1.getPromotionDriverId());
- request.setPromoterId(driver2.getEmpId().toString());
- }
- OrderUtil.modifyTravelItinerary(request);
}
List<OrderTaxi> list1 = orderTaxiService.selectList(new EntityWrapper<OrderTaxi>().eq("type", 2).eq("crossCityOrderId", orderPrivateCar.getCrossCityOrderId()).eq("place", orderPrivateCar.getPlace()));
for (OrderTaxi orderTaxi : list1) {
orderCancelService.saveData(orderTaxi.getId(), 2, "无司机接单", "无司机接单", null, null, 2, 1, uid);
orderTaxi.setState(10);
orderTaxiService.updateById(orderTaxi);
-
- Driver driver1 = null;
- Company company = null;
- //中台修改订单状态
- ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
- request.setOrderId(orderTaxi.getTravelId());
- request.setStatus(orderTaxi.getState());
- if (null != orderTaxi.getDriverId()) {
- driver1 = driverService.selectById(orderTaxi.getDriverId());
- company = companyService.selectById(driver1.getCompanyId());
- request.setDriverId(driver1.getEmpId().toString());
- request.setSupplierShopId(company.getEnterCode());
- }
- if (2 == orderTaxi.getPromotion()) {
- Driver driver2 = driverService.selectById(orderTaxi.getPromotionDriverId());
- request.setPromoterId(driver2.getEmpId().toString());
- }
- OrderUtil.modifyTravelItinerary(request);
}
} else {
integer = orderCancelService.saveData(id, 1, "无司机接单", "无司机接单", null, null, 2, 1, uid);
orderPrivateCar.setState(10);
this.updateById(orderPrivateCar);
-
- Driver driver1 = null;
- Company company = null;
- //中台修改订单状态
- ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
- request.setOrderId(orderPrivateCar.getTravelId());
- request.setStatus(orderPrivateCar.getState());
- if (null != orderPrivateCar.getDriverId()) {
- driver1 = driverService.selectById(orderPrivateCar.getDriverId());
- company = companyService.selectById(driver1.getCompanyId());
- request.setDriverId(driver1.getEmpId().toString());
- request.setSupplierShopId(company.getEnterCode());
- }
- if (2 == orderPrivateCar.getPromotion()) {
- Driver driver2 = driverService.selectById(orderPrivateCar.getPromotionDriverId());
- request.setPromoterId(driver2.getEmpId().toString());
- }
- if(orderPrivateCar.getTravelId()!=null){
- OrderUtil.modifyTravelItinerary(request);
- }
}
} else {
OpenCity openCity = openCityService.openCity1(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
@@ -1163,7 +1105,7 @@
return ResultUtil.error("取消订单失败，订单信息有误", "");
}
if (orderPrivateCar.getState() != 12) {
- return ResultUtil.error("取消订单失败，不合法的操作", "");
+ return ResultUtil.error("订单已取消，请刷新页面", "");
}
OrderCancel orderCancel = null;
if (null == cancleId) {
@@ -2197,6 +2139,7 @@
orderMoney = new BigDecimal(orderMoney).setScale(2, RoundingMode.HALF_UP).doubleValue();
System.out.println("!!!" + orderMoney + "!!!!");
orderMoney = orderMoney < 0 ? 0 : orderMoney;
+ orderPrivateCar.setPayMoney(orderMoney);
if (payType == 1) {//微信支付
if (orderMoney == 0) {
return ResultUtil.error("请使用余额支付");
@@ -2332,7 +2275,6 @@
orderPrivateCar.setState(8);
orderPrivateCar.setPayType(3);
- orderPrivateCar.setPayMoney(orderMoney);
//处理优惠券和红包
if (null != userCouponRecord) {
@@ -2877,6 +2819,8 @@
break;
}
if (i == querys.size() + 15) {
+ orderPrivateCar1.setState(10);
+ orderPrivateCarMapper.updateById(orderPrivateCar1);
pushUtil.pushEndPush(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1);
orderIds.remove(orderPrivateCar.getId());
}
--
Gitblit v1.7.1