From 42490ec10cb18dd38deba7b400935dd91c976065 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 25 四月 2025 16:36:15 +0800
Subject: [PATCH] 修改bug
---
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
index ee538fd..90c24ec 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -353,8 +353,8 @@
if(null == query){
return ResultUtil.error("获取企业失败");
}
- Map<String, String> distance = gdMapElectricFenceUtil.getDistance(warpper.getStartLon() + "," + warpper.getStartLat(),
- warpper.getEndLon() + "," + warpper.getEndLat(), 1);
+ Map<String, String> distance = gdMapElectricFenceUtil.getDistance(warpper.getStartLat() + "," + warpper.getStartLon() ,
+ warpper.getEndLat() + "," + warpper.getEndLon(), 1);
if(null == distance){
return ResultUtil.error("计算行驶距离失败");
}
@@ -923,7 +923,7 @@
}else{
appletsOpenId = userInfo.getAppletsOpenId();
}
- Map<String, String> map = icbcPayUtil.placeAnOrder(orderId + ",2", 9, 5, uid.toString(), "完成订单", orderMoney, callbackPath + "/base/wxPayOrderTaxi", "", type, appletsOpenId);
+// Map<String, String> map = icbcPayUtil.placeAnOrder(orderId + ",2", 9, 5, uid.toString(), "完成订单", orderMoney, callbackPath + "/base/wxPayOrderTaxi", "", type, appletsOpenId);
String app = type == 1 ? "APP" : "JSAPI";
resultUtil = payMoneyUtil.weixinpay("完成订单", "", orderId + "_2_" + UUIDUtil.getRandomCode(5), orderMoney.toString(), "/base/wxPayOrderTaxi", app, userInfo.getAppletsOpenId());
paymentRecordService.saveData(1, orderTaxi.getUserId(), 1, orderId, 2, 1, orderMoney, "", 1);//添加预支付数据
@@ -1039,6 +1039,7 @@
public void run() {
pushUtil.pushOrderState(1, orderTaxi.getUserId(), orderTaxi.getId(), 2, orderTaxi.getState(), 0);
pushUtil.pushOrderState(2, orderTaxi.getDriverId(), orderTaxi.getId(), 2, orderTaxi.getState(), 0);
+ pushUtil.pushSystemMessage(2, orderTaxi.getDriverId(), "用户已线上完成支付");
}
}).start();
@@ -1055,6 +1056,8 @@
redisUtil.setStrValue("VEHICLE", jsonArray.toJSONString());
}
systemNoticeService.addSystemNotice(1, "您已使用余额成功完成出行订单支付，谢谢使用！", uid, 1);
+ //添加司机消息提醒
+ systemNoticeService.addSystemNotice(2, "用户已线上完成支付", driver.getId(), 1);
}
this.updateAllColumnById(orderTaxi);
@@ -1517,6 +1520,7 @@
public void run() {
pushUtil.pushOrderState(1, orderTaxi.getUserId(), orderTaxi.getId(), 2, orderTaxi.getState(), 0);
pushUtil.pushOrderState(2, orderTaxi.getDriverId(), orderTaxi.getId(), 2, orderTaxi.getState(), 0);
+ pushUtil.pushSystemMessage(2, orderTaxi.getDriverId(), "用户已线上完成支付");
}
}).start();
@@ -1537,8 +1541,6 @@
systemNoticeService.addSystemNotice(1, "您已使用" + (type == 1 ? "微信" : "支付宝") + "成功完成出行订单支付，谢谢使用！", orderTaxi.getUserId(), 1);
//添加司机消息提醒
systemNoticeService.addSystemNotice(2, "用户已线上完成支付", driver.getId(), 1);
- //推送状态，让司机端播报语音
- pushUtil.pushOrderState(2, orderTaxi.getDriverId(), orderTaxi.getId(), 2, orderTaxi.getState(), 0);
}else{
System.err.println("预支付数据异常（orderId = " + id + ")");
}
--
Gitblit v1.7.1