From 8c1cf98149c48f3ccc6db8574d6bdb76ff541772 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 04 七月 2025 15:25:24 +0800
Subject: [PATCH] bug修改
---
DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
index 2665b81..7d0ed6a 100644
--- a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
+++ b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -229,9 +229,9 @@
driverService.updateById(driver);
Car car = carService.selectById(driver.getCarId());
// String s = MsgUtil.SendDriverPost(orderTaxi.getPassengersPhone(), car.getCarLicensePlate(),driver.getName(), driver.getPhone());
- String s = aLiSendSms.sendSms(orderTaxi.getPassengersPhone(), "SMS_476900230", "{\"code1\":\"" + driver.getName() + "\",\"code2\":\"" + driver.getPhone() + "\",\"code3\":\"" +car.getCarLicensePlate() + "\"}");
- System.err.println("====电话回调==="+s);
-
+// String s = aLiSendSms.sendSms(orderTaxi.getPassengersPhone(), "SMS_476900230", "{\"code1\":\"" + driver.getName() + "\",\"code2\":\"" + driver.getPhone() + "\",\"code3\":\"" +car.getCarLicensePlate() + "\"}");
+// System.err.println("====电话回调==="+s);
+ SMSUtil.send(orderTaxi.getPassengersPhone(), "您的订单已被司机" + driver.getName() + "接单，联系电话" + driver.getPhone() + "车牌号" + car.getCarLicensePlate() + "请耐心等待。", "2431012312845");
}
//调用移动的小号接口
@@ -304,7 +304,9 @@
//发送短信
try{
UserInfo userInfo = userInfoMapper.selectById(orderTaxi.getUserId());
- String sData = aLiSendSms.sendSms(userInfo.getPhone(), "SMS_476900230", "{\"code1\":\"" + driver.getName() + "\",\"code2\":\"" + driver.getPhone() + "\",\"code3\":\"" +carService.selectById(orderTaxi.getCarId()) .getCarLicensePlate() + "\"}");
+ Car car = carService.selectById(orderTaxi.getCarId());
+// String sData = aLiSendSms.sendSms(userInfo.getPhone(), "SMS_476900230", "{\"code1\":\"" + driver.getName() + "\",\"code2\":\"" + driver.getPhone() + "\",\"code3\":\"" + car.getCarLicensePlate() + "\"}");
+ SMSUtil.send(userInfo.getPhone(), "您的订单已被司机" + driver.getName() + "接单，联系电话" + driver.getPhone() + "车牌号" + car.getCarLicensePlate() + "请耐心等待。", "2431012312845");
}catch (Exception e){
@@ -395,7 +397,9 @@
//发送短信
try{
UserInfo userInfo = userInfoMapper.selectById(orderTaxi.getUserId());
- String sData = aLiSendSms.sendSms(userInfo.getPhone(), "SMS_476900230", "{\"code1\":\"" + driver.getName() + "\",\"code2\":\"" + driver.getPhone() + "\",\"code3\":\"" +carService.selectById(orderTaxi.getCarId()) .getCarLicensePlate() + "\"}");
+ Car car = carService.selectById(orderTaxi.getCarId());
+// String sData = aLiSendSms.sendSms(userInfo.getPhone(), "SMS_476900230", "{\"code1\":\"" + driver.getName() + "\",\"code2\":\"" + driver.getPhone() + "\",\"code3\":\"" + car.getCarLicensePlate() + "\"}");
+ SMSUtil.send(userInfo.getPhone(), "您的订单已被司机" + driver.getName() + "接单，联系电话" + driver.getPhone() + "车牌号" + car.getCarLicensePlate() + "请耐心等待。", "2431012312845");
}catch (Exception e){
@@ -493,8 +497,7 @@
@Override
public ResultUtil confirmFees(Integer orderId, Integer type, Double travelFee, Double parkingFee, Double crossingFee) throws Exception {
OrderTaxi orderTaxi = this.selectById(orderId);
- orderTaxi.setPayManner(type);
- if(orderTaxi.getPayManner()==3){
+ if(2 == type && orderTaxi.getPayManner()==3){
orderTaxi.setState(9);
Driver driver = driverService.selectById(orderTaxi.getDriverId());
@@ -518,7 +521,7 @@
driverService.updateById(driver);
}
//打表计费，直接订单完成支付，
- if(orderTaxi.getPayManner()==2){
+ if(2 == type && orderTaxi.getPayManner()==2){
orderTaxi = this.setMoney2(orderTaxi, parkingFee, crossingFee);
//在线上计费的基础上随机加0.01-1的金额
Double orderMoney = orderTaxi.getOrderMoney() + (new BigDecimal(Math.random()).setScale(2, BigDecimal.ROUND_DOWN).doubleValue());
@@ -555,7 +558,7 @@
driverService.updateById(driver);
}
//线上计费，计算费用后修改为待支付
- if(orderTaxi.getPayManner()==1){
+ if(1 == type && orderTaxi.getPayManner()==1){
orderTaxi = this.setMoney2(orderTaxi, crossingFee, crossingFee);
orderTaxi.setState(7);
}
--
Gitblit v1.7.1