From 8522e469e00e1cf6c0410165b0f76c806c13ca83 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 16 八月 2025 09:17:04 +0800
Subject: [PATCH] 合并代码
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
index e586502..9b5da04 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -170,9 +170,7 @@
@Autowired
private ITaxiCardService taxiCardService;
- @Autowired
- private ITaxiCardPaymentService taxiCardPaymentService;
-
+
@Autowired
private IUserUserService userUserService;
@@ -1728,6 +1726,9 @@
//添加收入
Map<String, Object> map = incomeService.saveIncome(orderTaxi.getId(), 2, orderTaxi.getOrderMoney());
orderTaxi.setSplitAllocation(JSON.toJSONString(map));
+
+ this.updateAllColumnById(orderTaxi);
+ promotion(orderTaxi.getId());
// TODO: 2020/5/24 这里需要给司机和用户推送订单状态
new Thread(new Runnable() {
@@ -1761,8 +1762,10 @@
resultUtil = appOrderController.placeAnOrder(new BigDecimal(orderMoney), 4, orderId, 9, integer);
}
-
- this.updateAllColumnById(orderTaxi);
+ if(payType!=3){
+ this.updateAllColumnById(orderTaxi);
+ }
+
return resultUtil;
}
@@ -1926,7 +1929,7 @@
OpenCity openCity = openCityService.openCity1(orderTaxi.getStartLon().toString(), orderTaxi.getStartLat().toString());
List<PushOrder> querys = pushOrderService.querys(null, 2, openCity.getId());//获取需要推送的次数
int time = 0;
- for (int i = 1; i <= querys.size() + 5; i++) {
+ for (int i = 1; i <= querys.size() + 15; i++) {
int finalI = i;
PushOrder pushOrder = querys.stream().filter(s -> s.getType() == (finalI <= 3 ? finalI : 3)).findFirst().orElse(null);
time += pushOrder.getPushTime() * 1000;
@@ -1959,7 +1962,7 @@
//计算预计距离和剩余时间
String value = null;
if (null != orderTaxi.getDriverId()) {
- value = (String) redisTemplate.opsForValue().get("DRIVER" + orderTaxi.getDriverId());
+ value = (String) redisTemplate.opsForValue().get("dache_DRIVER" + orderTaxi.getDriverId());
if (null == value || "".equals(value)) {
System.err.println("司机没有上传位置信息");
@@ -2310,7 +2313,7 @@
OpenCity openCity = openCityService.openCity1(orderTaxi.getStartLon().toString(), orderTaxi.getStartLat().toString());
List<PushOrder> querys = pushOrderService.querys(null, 2, openCity.getId());//获取需要推送的次数
//整轮派单结束，若无司机接单，系统自动增加派单5轮，若增加5轮后任无司机接单，则系统结束派单，乘客端显示无司机接单、是否再次打车
- for (int i = 1; i <= querys.size() + 5; i++) {
+ for (int i = 1; i <= querys.size() + 15; i++) {
int finalI = i;
PushOrder pushOrder = querys.stream().filter(s -> s.getType() == (finalI <= 3 ? finalI : 3)).findFirst().orElse(null);
System.out.println("pushOrder:" + pushOrder);
@@ -2337,12 +2340,12 @@
}
}
Thread.sleep(pushOrder.getPushTime() * 1000);//设置等待时间
- OrderTaxi orderTaxi1 = OrderTaxiServiceImpl.this.selectById(orderTaxi.getId());
+ OrderPrivateCar orderTaxi1 = orderPrivateCarService.selectById(orderTaxi.getId());
Integer state = orderTaxi1.getState();
if (state != 1) {
break;
}
- if (i == querys.size() + 5 && state == 1) {
+ if (i == querys.size() + 15 && state == 1) {
pushUtil.pushEndPush(1, orderTaxi.getUserId(), orderTaxi.getId(), 2);
orderIds.remove(orderTaxi.getId());
}
@@ -2487,13 +2490,14 @@
UserInfo userInfo = userInfoService.selectById(orderTaxi.getUserId());
if (orderTaxi.getPromotionDriverId() != null) {
String registAreaCode = userInfo.getRegistAreaCode();
- TDriverPromotionActivity tDriverPromotionActivity = driverPromotionActivityService.selectOne(new EntityWrapper<TDriverPromotionActivity>().eq("districtCode", registAreaCode).ge("startTime", new Date()).lt("endTime", new Date()).last("AND FIND_IN_SET(" + 2 + ", bizType) limit 1"));
+ TDriverPromotionActivity tDriverPromotionActivity = driverPromotionActivityService.selectOne(new EntityWrapper<TDriverPromotionActivity>().eq("districtCode", registAreaCode).le("startTime", new Date()).ge("endTime", new Date()).last("AND FIND_IN_SET(" + 2 + ", bizType) limit 1"));
if (tDriverPromotionActivity != null) {
Double payMoney = orderTaxi.getPayMoney();
BigDecimal bigDecimal = tDriverPromotionActivity.getCommissionRatio().divide(new BigDecimal(100), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(payMoney)).setScale(2, RoundingMode.HALF_UP);
orderTaxi.setPromotionDriverId(userInfo.getBindDriverId());
orderTaxi.setPromotionMoney(bigDecimal);
orderTaxi.setPromotionActivityId(tDriverPromotionActivity.getId());
+ orderTaxi.setSuccessTime(new Date());
this.baseMapper.updateById(orderTaxi);
}
}
--
Gitblit v1.7.1