From 5e674f8c6c213db478f9e45460cf2fcfecc65eb9 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 31 十二月 2024 18:24:57 +0800
Subject: [PATCH] 修改
---
DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ALiSendSms.java | 6 ++++--
DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 14 +++++++-------
DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java | 6 +++---
DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 2 +-
4 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 363b7fc..aac2be5 100644
--- a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -266,7 +266,7 @@
try{
UserInfo userInfo = userInfoMapper.selectById(orderPrivateCar.getUserId());
- String sData = aLiSendSms.sendSms(orderPrivateCar.getPassengersPhone(), "SMS_476900230", "{\"name\":\"" + driver.getName() + "\",\"phone\":\"" + driver.getPhone() + "\",\"carInfo\":\"" +carService.selectById(orderPrivateCar.getCarId()) .getCarLicensePlate() + "\",}");
+ String sData = aLiSendSms.sendSms(orderPrivateCar.getPassengersPhone(), "SMS_476900230", "{\"code1\":\"" + driver.getName() + "\",\"code2\":\"" + driver.getPhone() + "\",\"code3\":\"" +carService.selectById(orderPrivateCar.getCarId()) .getCarLicensePlate() + "\"}");
}catch (Exception e){
}
diff --git a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
index bd7fff7..b5d83a3 100644
--- a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
+++ b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -336,7 +336,7 @@
Driver driver = this.selectById(uid);
driver.setName(registeredWarpper.getName());
driver.setSex(registeredWarpper.getSex());
-// driver.setIdCard(registeredWarpper.getIdCard());
+ driver.setIdCard(registeredWarpper.getIdCard());
// String code = registeredWarpper.getPlaceOfEmployment();
// Company query = companyCityService.query(code);
@@ -366,20 +366,20 @@
driver.setFranchiseeId(company.getId());
}
driver.setHeadImgUrl(registeredWarpper.getHeadImgUrl());
-// driver.setIdCardImgUrl1(registeredWarpper.getIdCardImgUrl1());
-// driver.setIdCardImgUrl2(registeredWarpper.getIdCardImgUrl2());
+ driver.setIdCardImgUrl1(registeredWarpper.getIdCardImgUrl1());
+ driver.setIdCardImgUrl2(registeredWarpper.getIdCardImgUrl2());
// driver.setPlaceOfEmployment(registeredWarpper.getPlaceOfEmployment());
-// driver.setDriverAddress(registeredWarpper.getDriverContactAddress());
+ driver.setDriverAddress(registeredWarpper.getDriverContactAddress());
// driver.setDriverContactAddress(registeredWarpper.getDriverContactAddress());
// driver.setDriverContactAddress_(registeredWarpper.getDriverContactAddress_());
driver.setPlaceOfPractice(registeredWarpper.getPlaceOfPractice());
Calendar calendar = Calendar.getInstance();
-// calendar.setTime(registeredWarpper.getGetDriverLicenseDate());
+ calendar.setTime(registeredWarpper.getGetDriverLicenseDate());
Calendar now = Calendar.getInstance();
now.setTime(new Date());
-// driver.setDriverAge(now.get(Calendar.YEAR) - calendar.get(Calendar.YEAR));
-// driver.setDriveCardImgUrl(registeredWarpper.getDriveCardImgUrl());
+ driver.setDriverAge(now.get(Calendar.YEAR) - calendar.get(Calendar.YEAR));
+ driver.setDriveCardImgUrl(registeredWarpper.getDriveCardImgUrl());
// driver.setGetDriverLicenseDate(registeredWarpper.getGetDriverLicenseDate());
// driver.setTaxiAptitudeCard(registeredWarpper.getTaxiAptitudeCard());
// driver.setNetworkCarlssueImg(registeredWarpper.getNetworkCarlssueImg());
diff --git a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ALiSendSms.java b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ALiSendSms.java
index ebd7e57..05ea010 100644
--- a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ALiSendSms.java
+++ b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ALiSendSms.java
@@ -39,7 +39,7 @@
addSmsTemplateRequest.setSysAction("AddSmsTemplate");
addSmsTemplateRequest.setSysVersion("2017-05-25");
// 短信类型。0：验证码；1：短信通知；2：推广短信；3：国际/港澳台消息
- addSmsTemplateRequest.putQueryParameter("TemplateType", "0");
+ addSmsTemplateRequest.putQueryParameter("TemplateType", "1");
// 模板名称，长度为1~30个字符
addSmsTemplateRequest.putQueryParameter("TemplateName", "测试短信模板");
// 模板内容，长度为1~500个字符
@@ -62,12 +62,14 @@
* 发送短信
*/
public String sendSms(String phone, String templateCode, String json) throws ClientException {
+ System.out.println("=====》"+json);
CommonRequest request = new CommonRequest();
request.setSysDomain("dysmsapi.aliyuncs.com");
request.setSysVersion("2017-05-25");
request.setSysAction("SendSms");
// 接收短信的手机号码
request.putQueryParameter("PhoneNumbers", phone);
+ request.putQueryParameter("TemplateType", "1");
// 短信签名名称。请在控制台签名管理页面签名名称一列查看（必须是已添加、并通过审核的短信签名）。
request.putQueryParameter("SignName", "咸宁95128");
// 短信模板ID
@@ -109,7 +111,7 @@
// 创建短信模板
String templateCode = sendSmsDemo.addSmsTemplate();
// 使用刚创建的短信模板发送短信
- String sData = sendSmsDemo.sendSms("156xxxxxxxx", templateCode, "{\"code\":\"8888\"}");
+ String sData = sendSmsDemo.sendSms("18398968484", "SMS_476900230", "{\"code1\":\"乐乐\",\"code2\":\"15102879064\",\"code3\":\"冀A88888\"}");
Gson gson = new Gson();
Map map = gson.fromJson(sData, Map.class);
String bizId = map.get("BizId").toString();
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 6a15f26..b2d5e2e 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
@@ -202,7 +202,7 @@
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() + "\",}");
+ String s = aLiSendSms.sendSms(orderTaxi.getPassengersPhone(), "SMS_476900230", "{\"code1\":\"" + driver.getName() + "\",\"code2\":\"" + driver.getPhone() + "\",\"code3\":\"" +car.getCarLicensePlate() + "\"}");
System.err.println("====电话回调==="+s);
}
@@ -277,7 +277,7 @@
//发送短信
try{
UserInfo userInfo = userInfoMapper.selectById(orderTaxi.getUserId());
- String sData = aLiSendSms.sendSms(userInfo.getPhone(), "SMS_476900230", "{\"name\":\"" + driver.getName() + "\",\"phone\":\"" + driver.getPhone() + "\",\"carInfo\":\"" +carService.selectById(orderTaxi.getCarId()) .getCarLicensePlate() + "\",}");
+ String sData = aLiSendSms.sendSms(userInfo.getPhone(), "SMS_476900230", "{\"code1\":\"" + driver.getName() + "\",\"code2\":\"" + driver.getPhone() + "\",\"code3\":\"" +carService.selectById(orderTaxi.getCarId()) .getCarLicensePlate() + "\"}");
}catch (Exception e){
@@ -368,7 +368,7 @@
//发送短信
try{
UserInfo userInfo = userInfoMapper.selectById(orderTaxi.getUserId());
- String sData = aLiSendSms.sendSms(userInfo.getPhone(), "SMS_476900230", "{\"name\":\"" + driver.getName() + "\",\"phone\":\"" + driver.getPhone() + "\",\"carInfo\":\"" +carService.selectById(orderTaxi.getCarId()) .getCarLicensePlate() + "\",}");
+ String sData = aLiSendSms.sendSms(userInfo.getPhone(), "SMS_476900230", "{\"code1\":\"" + driver.getName() + "\",\"code2\":\"" + driver.getPhone() + "\",\"code3\":\"" +carService.selectById(orderTaxi.getCarId()) .getCarLicensePlate() + "\"}");
}catch (Exception e){
--
Gitblit v1.7.1