From 2f2b4c7ed80ee5132718523e0c7e7e2956aaf27d Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 15 八月 2025 17:54:25 +0800
Subject: [PATCH] 未接单取消
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 be7a82d..b825c53 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
@@ -1726,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() {
@@ -1759,8 +1762,10 @@
resultUtil = appOrderController.placeAnOrder(new BigDecimal(orderMoney), 4, orderId, 9, integer);
}
-
- this.updateAllColumnById(orderTaxi);
+ if(payType!=3){
+ this.updateAllColumnById(orderTaxi);
+ }
+
return resultUtil;
}
@@ -2485,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