From 5816ff2b23bbfe96291bb4cb3cc61d99d37fe986 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 19 二月 2024 10:01:51 +0800
Subject: [PATCH] 提交代码
---
DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 26
DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java | 28 -
DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 24 +
DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java | 24
DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java | 4
DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarMapper.xml | 5
DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/QrCodeUtil.java | 4
DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 14
DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 18
/dev/null | 284 ----------------
DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java | 6
DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java | 13
DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java | 10
DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java | 14
DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ChinaMobileUtil.java | 388 +++++++++++-----------
DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ALiApiUtil.java | 6
DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java | 106 +++--
17 files changed, 351 insertions(+), 623 deletions(-)
diff --git a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
index 661a089..6e56e07 100644
--- a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
+++ b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
@@ -12,7 +12,6 @@
import com.stylefeng.guns.modular.system.model.Income;
import com.stylefeng.guns.modular.system.model.OrderPosition;
import com.stylefeng.guns.modular.system.service.*;
-import com.stylefeng.guns.modular.system.util.ALiSendSms;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.util.qiniuyun.QNYAuth;
import com.stylefeng.guns.modular.system.warpper.*;
@@ -52,9 +51,6 @@
@Autowired
private ICarService carService;
-
- @Autowired
- private ALiSendSms aLiSendSms;
@Autowired
private IOrderTaxiService orderTaxiService;
diff --git a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 49e826a..88001f4 100644
--- a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -9,7 +9,7 @@
import com.stylefeng.guns.modular.system.service.IDriverService;
import com.stylefeng.guns.modular.system.service.IOrderService;
import com.stylefeng.guns.modular.system.service.IReassignService;
-import com.stylefeng.guns.modular.system.util.ChinaMobileUtil;
+//import com.stylefeng.guns.modular.system.util.ChinaMobileUtil;
import com.stylefeng.guns.modular.system.util.PushUtil;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.util.SystemException;
@@ -55,9 +55,9 @@
@Autowired
private PushUtil pushUtil;
- @Autowired
- private ChinaMobileUtil chinaMobileUtil;
-
+// @Autowired
+// private ChinaMobileUtil chinaMobileUtil;
+//
@Autowired
private IOrderLogisticsService orderLogisticsService;
@@ -546,8 +546,8 @@
@PostMapping("/base/order/test")
public String test(String phoneA, String phoneB){
try {
- Map<String, String> map = chinaMobileUtil.midAxbBindSend(phoneA, phoneB, 28);
- System.err.println(JSON.toJSONString(map));
+// Map<String, String> map = chinaMobileUtil.midAxbBindSend(phoneA, phoneB, 28);
+// System.err.println(JSON.toJSONString(map));
}catch (Exception e){
e.printStackTrace();
return "";
@@ -559,7 +559,7 @@
@PostMapping("/base/order/test_")
public String test(String bindId){
try {
- Map<String, String> map = chinaMobileUtil.midAxbUnBindSend(bindId,"");
+// Map<String, String> map = chinaMobileUtil.midAxbUnBindSend(bindId,"");
}catch (Exception e){
e.printStackTrace();
return "";
diff --git a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
index 0bc57af..c51ae9c 100644
--- a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
+++ b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -88,8 +88,8 @@
@Resource
private RegionMapper regionMapper;
- @Autowired
- private ChinaMobileUtil chinaMobileUtil;
+// @Autowired
+// private ChinaMobileUtil chinaMobileUtil;
/*@Autowired
private ICBCPayUtil icbcPayUtil;*/
@@ -448,11 +448,11 @@
//调用移动的小号接口
Map<String, String> geocode = gdMapGeocodingUtil.geocode(orderCrossCity.getStartLon().toString(), orderCrossCity.getStartLat().toString());
Region region = regionMapper.query(geocode.get("districtCode"));
- Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderCrossCity.getPassengersPhone(), driver.getPhone(), Integer.valueOf(region.getCitycode().substring(1)));
- if(String.valueOf(map.get("code")).equals("200")){
- orderCrossCity.setTelX(map.get("telX"));
- orderCrossCity.setBindId(map.get("bindId"));
- }
+// Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderCrossCity.getPassengersPhone(), driver.getPhone(), Integer.valueOf(region.getCitycode().substring(1)));
+// if(String.valueOf(map.get("code")).equals("200")){
+// orderCrossCity.setTelX(map.get("telX"));
+// orderCrossCity.setBindId(map.get("bindId"));
+// }
if(orderCrossCityWarpper.getTravelMode() == 2){//公务用车
orderCrossCity.setSeatNumber(lineShiftDriver.getLaveSeatNumber());
orderCrossCity.setPeopleNumber(lineShiftDriver.getLaveSeat());
diff --git a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
index b61fc1c..a848027 100644
--- a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
+++ b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -46,8 +46,8 @@
@Resource
private RegionMapper regionMapper;
- @Autowired
- private ChinaMobileUtil chinaMobileUtil;
+// @Autowired
+// private ChinaMobileUtil chinaMobileUtil;
@Autowired
private PushUtil pushUtil;
@@ -67,8 +67,8 @@
@Autowired
private IIncomeService incomeService;
- @Autowired
- private ALiSendSms aLiSendSms;
+// @Autowired
+// private ALiSendSms aLiSendSms;
@@ -119,11 +119,11 @@
//调用移动的小号接口
Map<String, String> geocode = gdMapGeocodingUtil.geocode(orderLogistics.getStartLon().toString(), orderLogistics.getStartLat().toString());
Region region = regionMapper.query(geocode.get("districtCode"));
- Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderLogistics.getRecipientPhone(), driver.getPhone(), Integer.valueOf(region.getCitycode().substring(1)));
- if(String.valueOf(map.get("code")).equals("200")){
- orderLogistics.setTelX(map.get("telX"));
- orderLogistics.setBindId(map.get("bindId"));
- }
+// Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderLogistics.getRecipientPhone(), driver.getPhone(), Integer.valueOf(region.getCitycode().substring(1)));
+// if(String.valueOf(map.get("code")).equals("200")){
+// orderLogistics.setTelX(map.get("telX"));
+// orderLogistics.setBindId(map.get("bindId"));
+// }
this.updateById(orderLogistics);
diff --git a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index e77c63e..b7ddc0c 100644
--- a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -50,8 +50,8 @@
@Autowired
private GDMapGeocodingUtil gdMapGeocodingUtil;
- @Autowired
- private ChinaMobileUtil chinaMobileUtil;
+// @Autowired
+// private ChinaMobileUtil chinaMobileUtil;
@Resource
private RegionMapper regionMapper;
@@ -186,12 +186,12 @@
//调用移动的小号接口
/*Map<String, String> geocode = gdMapGeocodingUtil.geocode(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
Region region = regionMapper.query(geocode.get("districtCode"));*/
- Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderPrivateCar.getPassengersPhone(), driver.getPhone(), null);
- if(String.valueOf(map.get("code")).equals("200")){
- orderPrivateCar.setTelX(map.get("telX"));
- orderPrivateCar.setBindId(map.get("bindId"));
- }
- System.out.println(map);
+// Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderPrivateCar.getPassengersPhone(), driver.getPhone(), null);
+// if(String.valueOf(map.get("code")).equals("200")){
+// orderPrivateCar.setTelX(map.get("telX"));
+// orderPrivateCar.setBindId(map.get("bindId"));
+// }
+// System.out.println(map);
this.updateById(orderPrivateCar);
//如果是预约单，则不修改司机为服务中
@@ -420,11 +420,11 @@
orderPrivateCar.setState(7);
}
- Map<String, String> map = chinaMobileUtil.midAxbUnBindSend(orderPrivateCar.getBindId(),orderPrivateCar.getTelX());
- if(String.valueOf(map.get("code")).equals("200")){
- orderPrivateCar.setTelX("");
- orderPrivateCar.setBindId("");
- }
+// Map<String, String> map = chinaMobileUtil.midAxbUnBindSend(orderPrivateCar.getBindId(),orderPrivateCar.getTelX());
+// if(String.valueOf(map.get("code")).equals("200")){
+// orderPrivateCar.setTelX("");
+// orderPrivateCar.setBindId("");
+// }
this.updateById(orderPrivateCar);
diff --git a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarMapper.xml b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarMapper.xml
index f425ce8..8336dc1 100644
--- a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarMapper.xml
+++ b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarMapper.xml
@@ -48,11 +48,12 @@
<select id="queryIdleDataByDriverId" resultType="map">
select
a.id as id,
- CONCAT(a.carLicensePlate, '-',c.`name`, b.`name`, ' ', a.carColor) as name
+ CONCAT(a.carLicensePlate, '-',c.`name`, b.`name`, ' ', a.carColor) as name,
+ a.authState
from t_car a
left join t_car_model b on (a.carModelId = b.id)
left join t_car_brand c on (b.brandId = c.id)
- where a.state = 1
+ where a.state = 1 and a.authState != 3
and a.driverId=#{driverId}
</select>
diff --git a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java
index c3f1920..8d520e2 100644
--- a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java
+++ b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java
@@ -128,23 +128,10 @@
String carPhoto, String insurancePhoto, Integer uid,Integer id) throws Exception {
Car query = carMapper.query(licensePlate);
- if(id==null){
- if(null != query){
- return ResultUtil.error("车牌号已经使用");
- }
- }else{
- if(null != query && !id.equals(query.getId())){
- return ResultUtil.error("车牌号已经使用");
- }
+ if(null != query){
+ return ResultUtil.error("车牌号已经使用");
}
-
Car car = new Car();
- car.setDriverId(uid);
- car = carMapper.selectOne(car);
- if(car==null){
- car = new Car();
- car.setId(id);
- }
car.setCarModelId(modelId);
CarModel carModel = carModelMapper.selectById(modelId);
car.setCarBrandId(carModel.getBrandId());
@@ -160,20 +147,15 @@
car.setFranchiseeId(driver.getFranchiseeId());
car.setInsertTime(new Date());
car.setState(1);
- car.setAuthState(1);
car.setAddType(1);
- car.setDriverId(uid);
+ car.setAuthState(1);
car.setAddObjectId(driver.getFranchiseeId() != null && driver.getFranchiseeId() != 0 ? driver.getFranchiseeId() : (
driver.getCompanyId() != null && driver.getCompanyId() != 0 ? driver.getCompanyId() : 1));
Company company = companyMapper.selectById(driver.getFranchiseeId() != null && driver.getFranchiseeId() != 0 ? driver.getFranchiseeId() : (
driver.getCompanyId() != null && driver.getCompanyId() != 0 ? driver.getCompanyId() : 1));
car.setIsPlatCar(company.getType() == 1 ? 1 : 2);
- this.insertOrUpdate(car);
- //判断司机是否已经关联车辆，未关联车辆默认关联当前车辆
- if(driver.getCarId()==null){
- driver.setCarId(car.getId());
- driverService.updateById(driver);
- }
+ car.setDriverId(uid);
+ this.insert(car);
return ResultUtil.success();
}
}
diff --git a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
index 0d7a614..af4dc2e 100644
--- a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
+++ b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -215,7 +215,7 @@
public ResultUtil registeredDriver(String phone, String code, String password, Integer uid, Integer type, Integer userType) throws Exception {
ResultUtil<LoginWarpper> result = this.registeredDriver(phone, code, password,uid,type);
if(result.getCode() == 200 && null != uid){
- /*if(type == 2){
+ if(type == 2){
Driver driver = driverMapper.selectById(uid);
List<Map<String, Object>> query = driverActivityRegisteredMapper.query(userType, driver.getCompanyId());
BigDecimal bigDecimal = new BigDecimal("0");
@@ -223,6 +223,18 @@
if(Double.valueOf(String.valueOf(map.get("money"))).compareTo(0D) > 0){
bigDecimal = bigDecimal.add(new BigDecimal(String.valueOf(map.get("money"))));
incomeService.saveData(2, driver.getId(), 1, Integer.valueOf(String.valueOf(map.get("id"))), null, Double.valueOf(String.valueOf(map.get("money"))));
+
+ DriverActivityHistory driverActivityHistory = new DriverActivityHistory();
+ driverActivityHistory.setActivityId(Integer.valueOf(String.valueOf(map.get("id"))));
+ driverActivityHistory.setCarryOut(2);
+ driverActivityHistory.setDay(new Date());
+ driverActivityHistory.setDriverId(driver.getId());
+ driverActivityHistory.setInsertTime(new Date());
+ driverActivityHistory.setMoney(Double.valueOf(String.valueOf(map.get("money"))));
+ driverActivityHistory.setType(1);
+ driverActivityHistoryMapper.insert(driverActivityHistory);
+
+
}
}
driver.setActivityMoney(bigDecimal.add(new BigDecimal(driver.getActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
@@ -255,7 +267,7 @@
userCouponRecordMapper.insert(userCouponRecord);
}
}
- }*/
+ }
}
return result;
}
@@ -466,9 +478,9 @@
if(null == driver){
return ResultUtil.error("账号未注册");
}
- /*if(driver.getAuthState() == 1){
+ if(driver.getAuthState() == 1){
return ResultUtil.error("账号正在审核中，请耐心等待");
- }*/
+ }
if(driver.getAuthState() == 3){
return ResultUtil.error("账号已被冻结，请联系管理员");
}
@@ -555,6 +567,10 @@
public ResultUtil work(Integer uid, String type) throws Exception {
DriverWork driverWork = driverWorkMapper.queryNewWork(uid, null, 1);
Driver driver = this.selectById(uid);
+ if(null == driver.getCarId()){
+ return ResultUtil.error("暂未绑定车辆");
+ }
+
if(null != driverWork){//作下班操作
//检测是否有未完成的订单
List<Map<String, Object>> list = orderService.queryOrderList(1, 1, 10, uid);
diff --git a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
index 20db5ba..d243e8f 100644
--- a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
+++ b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.common.constant.state.Order;
import com.stylefeng.guns.core.util.DateUtil;
@@ -58,9 +59,6 @@
@Autowired
private TaskUtil taskUtil;
-
- @Autowired
- private ChinaMobileUtil chinaMobileUtil;
@Autowired
private RedisUtil redisUtil;
@@ -749,10 +747,10 @@
public void taskMidAxbUnBindSend() throws Exception {
List<OrderTaxi> list = orderTaxiService.taskMidAxbUnBindSend();
for(OrderTaxi orderTaxi : list){
- Map<String, String> map = chinaMobileUtil.midAxbUnBindSend(orderTaxi.getBindId(),orderTaxi.getTelX());
- if(!String.valueOf(map.get("code")).equals("200")){
- System.err.println(String.valueOf(map.get("msg")));
- }
+// Map<String, String> map = chinaMobileUtil.midAxbUnBindSend(orderTaxi.getBindId(),orderTaxi.getTelX());
+// if(!String.valueOf(map.get("code")).equals("200")){
+// System.err.println(String.valueOf(map.get("msg")));
+// }
orderTaxi.setTelX("");
orderTaxi.setBindId("");
}
@@ -762,10 +760,10 @@
List<OrderPrivateCar> list1 = orderPrivateCarService.taskMidAxbUnBindSend();
for(OrderPrivateCar orderPrivateCar : list1){
- Map<String, String> map = chinaMobileUtil.midAxbUnBindSend(orderPrivateCar.getBindId(),orderPrivateCar.getTelX());
- if(!String.valueOf(map.get("code")).equals("200")){
- System.err.println(String.valueOf(map.get("msg")));
- }
+// Map<String, String> map = chinaMobileUtil.midAxbUnBindSend(orderPrivateCar.getBindId(),orderPrivateCar.getTelX());
+// if(!String.valueOf(map.get("code")).equals("200")){
+// System.err.println(String.valueOf(map.get("msg")));
+// }
orderPrivateCar.setTelX("");
orderPrivateCar.setBindId("");
}
@@ -787,57 +785,57 @@
case 1:
OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(orderId);
if(ToolUtil.isNotEmpty(orderPrivateCar.getBindId())){
- Map<String, String> map1 = chinaMobileUtil.midAxbUnBindSend(orderPrivateCar.getBindId(),orderPrivateCar.getTelX());
- if(!String.valueOf(map1.get("code")).equals("200")){
- System.err.println(String.valueOf(map1.get("msg")));
- }
+// Map<String, String> map1 = chinaMobileUtil.midAxbUnBindSend(orderPrivateCar.getBindId(),orderPrivateCar.getTelX());
+// if(!String.valueOf(map1.get("code")).equals("200")){
+// System.err.println(String.valueOf(map1.get("msg")));
+// }
//调用移动的小号接口
Map<String, String> geocode = gdMapGeocodingUtil.geocode(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
Region region = regionMapper.query(geocode.get("districtCode"));
Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
- Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderPrivateCar.getPassengersPhone(), driver.getPhone(), Integer.valueOf(region.getCitycode().substring(1)));
- if(String.valueOf(map.get("code")).equals("200")){
- orderPrivateCar.setTelX(map.get("telX"));
- orderPrivateCar.setBindId(map.get("bindId"));
- }
+// Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderPrivateCar.getPassengersPhone(), driver.getPhone(), Integer.valueOf(region.getCitycode().substring(1)));
+// if(String.valueOf(map.get("code")).equals("200")){
+// orderPrivateCar.setTelX(map.get("telX"));
+// orderPrivateCar.setBindId(map.get("bindId"));
+// }
orderPrivateCarService.updateById(orderPrivateCar);
}
break;
case 2:
OrderTaxi orderTaxi = orderTaxiService.selectById(orderId);
if(ToolUtil.isNotEmpty(orderTaxi.getBindId())){
- Map<String, String> map1 = chinaMobileUtil.midAxbUnBindSend(orderTaxi.getBindId(),orderTaxi.getTelX());
- if(!String.valueOf(map1.get("code")).equals("200")){
- System.err.println(String.valueOf(map1.get("msg")));
- }
+// Map<String, String> map1 = chinaMobileUtil.midAxbUnBindSend(orderTaxi.getBindId(),orderTaxi.getTelX());
+// if(!String.valueOf(map1.get("code")).equals("200")){
+// System.err.println(String.valueOf(map1.get("msg")));
+// }
//调用移动的小号接口
Map<String, String> geocode = gdMapGeocodingUtil.geocode(orderTaxi.getStartLon().toString(), orderTaxi.getStartLat().toString());
Region region = regionMapper.query(geocode.get("districtCode"));
Driver driver = driverService.selectById(orderTaxi.getDriverId());
- Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderTaxi.getPassengersPhone(), driver.getPhone(), Integer.valueOf(region.getCitycode().substring(1)));
- if(String.valueOf(map.get("code")).equals("200")){
- orderTaxi.setTelX(map.get("telX"));
- orderTaxi.setBindId(map.get("bindId"));
- }
+// Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderTaxi.getPassengersPhone(), driver.getPhone(), Integer.valueOf(region.getCitycode().substring(1)));
+// if(String.valueOf(map.get("code")).equals("200")){
+// orderTaxi.setTelX(map.get("telX"));
+// orderTaxi.setBindId(map.get("bindId"));
+// }
orderTaxiService.updateById(orderTaxi);
}
break;
case 3:
OrderCrossCity orderCrossCity = orderCrossCityService.selectById(orderId);
if(ToolUtil.isNotEmpty(orderCrossCity.getBindId())){
- Map<String, String> map1 = chinaMobileUtil.midAxbUnBindSend(orderCrossCity.getBindId(),orderCrossCity.getTelX());
- if(!String.valueOf(map1.get("code")).equals("200")){
- System.err.println(String.valueOf(map1.get("msg")));
- }
+// Map<String, String> map1 = chinaMobileUtil.midAxbUnBindSend(orderCrossCity.getBindId(),orderCrossCity.getTelX());
+// if(!String.valueOf(map1.get("code")).equals("200")){
+// System.err.println(String.valueOf(map1.get("msg")));
+// }
//调用移动的小号接口
Map<String, String> geocode = gdMapGeocodingUtil.geocode(orderCrossCity.getStartLon().toString(), orderCrossCity.getStartLat().toString());
Region region = regionMapper.query(geocode.get("districtCode"));
Driver driver = driverService.selectById(orderCrossCity.getDriverId());
- Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderCrossCity.getPassengersPhone(), driver.getPhone(), Integer.valueOf(region.getCitycode().substring(1)));
- if(String.valueOf(map.get("code")).equals("200")){
- orderCrossCity.setTelX(map.get("telX"));
- orderCrossCity.setBindId(map.get("bindId"));
- }
+// Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderCrossCity.getPassengersPhone(), driver.getPhone(), Integer.valueOf(region.getCitycode().substring(1)));
+// if(String.valueOf(map.get("code")).equals("200")){
+// orderCrossCity.setTelX(map.get("telX"));
+// orderCrossCity.setBindId(map.get("bindId"));
+// }
orderCrossCityService.updateById(orderCrossCity);
}
break;
@@ -1015,8 +1013,6 @@
@Autowired
private ISystemNoticeService systemNoticeService;
- @Autowired
- private ALiSendSms aLiSendSms;
/**
* 短信催收
@@ -1035,7 +1031,18 @@
order.setSmsTime(day);
//发送短信
if(order.getPassengersPhone()!=null){
- String sData = aLiSendSms.sendSms1(order.getPassengersPhone(), "SMS_215342869", "{\"time\":\"" + DateUtil.format(order.getGetoffTime(),"yyyy-MM-dd HH:mm:ss") + "\",\"money\":\"" + order.getOrderMoney() + "\"}");
+ //发送记录集合
+ JSONArray records = new JSONArray();
+ JSONObject record = new JSONObject();
+ //手机号
+ record.put("mobile", order.getPassengersPhone());
+ //替换变量
+ JSONObject param = new JSONObject();
+ param.put("date", DateUtil.format(order.getGetoffTime(),"yyyy-MM-dd HH:mm:ss"));
+ param.put("amount", order.getOrderMoney());
+ record.put("tpContent", param);
+ records.add(record);
+ SMSUtil.sendSmsTp(103448L, records);
}
//添加消息记录
systemNoticeService.addSystemNotice(1, "有一笔订单未付款，请前往支付！", order.getUserId());
@@ -1046,7 +1053,18 @@
order.setSmsTime(day);
//发送短信
if(order.getPassengersPhone()!=null){
- String sData = aLiSendSms.sendSms1(order.getPassengersPhone(), "SMS_215342869", "{\"time\":\"" + DateUtil.format(order.getGetoffTime(),"yyyy-MM-dd HH:mm:ss") + "\",\"money\":\"" + order.getOrderMoney() + "\"}");
+ //发送记录集合
+ JSONArray records = new JSONArray();
+ JSONObject record = new JSONObject();
+ //手机号
+ record.put("mobile", order.getPassengersPhone());
+ //替换变量
+ JSONObject param = new JSONObject();
+ param.put("date", DateUtil.format(order.getGetoffTime(),"yyyy-MM-dd HH:mm:ss"));
+ param.put("amount", order.getOrderMoney());
+ record.put("tpContent", param);
+ records.add(record);
+ SMSUtil.sendSmsTp(103448L, records);
}
//添加消息记录
@@ -1054,7 +1072,9 @@
}
}
}
- orderPrivateCarService.updateBatchById(orderList);
+ if(orderList.size() > 0){
+ orderPrivateCarService.updateBatchById(orderList);
+ }
}
}
diff --git a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
index 7d6f9f5..9e38e89 100644
--- a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
+++ b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
@@ -226,9 +226,9 @@
map.put("orderId", reassign.getOrderId().toString());
map.put("orderType", reassign.getOrderType().toString());
List<Dispatch> dispatches = dispatchMapper.queryDispatchs(driver.getFranchiseeId() == null ? driver.getCompanyId() : driver.getFranchiseeId(), 1);
- for(Dispatch dispatch : dispatches){
- jgPushUtil.push(2,"有新的改派订单需要处理，请及时处理！", "订单改派", map, "DISPATCH" + dispatch.getId());
- }
+// for(Dispatch dispatch : dispatches){
+// jgPushUtil.push(2,"有新的改派订单需要处理，请及时处理！", "订单改派", map, "DISPATCH" + dispatch.getId());
+// }
}
}
return resultUtil;
@@ -351,9 +351,9 @@
map.put("orderId", reassign.getOrderId().toString());
map.put("orderType", reassign.getOrderType().toString());
List<Dispatch> dispatches = dispatchMapper.queryDispatchs(driver.getFranchiseeId() == null ? driver.getCompanyId() : driver.getFranchiseeId(), 1);
- for(Dispatch dispatch : dispatches){
- jgPushUtil.push(2,"有新的改派订单需要处理，请及时处理！", "订单改派", map, "DISPATCH" + dispatch.getId());
- }
+// for(Dispatch dispatch : dispatches){
+// jgPushUtil.push(2,"有新的改派订单需要处理，请及时处理！", "订单改派", map, "DISPATCH" + dispatch.getId());
+// }
}
}
return resultUtil;
@@ -406,9 +406,9 @@
map.put("orderId", reassign.getOrderId().toString());
map.put("orderType", reassign.getOrderType().toString());
List<Dispatch> dispatches = dispatchMapper.queryDispatchs(driver.getFranchiseeId() == null ? driver.getCompanyId() : driver.getFranchiseeId(), 1);
- for(Dispatch dispatch : dispatches){
- jgPushUtil.push(2,"有新的改派订单需要处理，请及时处理！", "订单改派", map, "DISPATCH" + dispatch.getId());
- }
+// for(Dispatch dispatch : dispatches){
+// jgPushUtil.push(2,"有新的改派订单需要处理，请及时处理！", "订单改派", map, "DISPATCH" + dispatch.getId());
+// }
}
query.setState(2);
query.setCode(order_id);
@@ -498,9 +498,9 @@
map.put("orderId", reassign.getOrderId().toString());
map.put("orderType", reassign.getOrderType().toString());
List<Dispatch> dispatches = dispatchMapper.queryDispatchs(driver.getFranchiseeId() == null ? driver.getCompanyId() : driver.getFranchiseeId(), 1);
- for(Dispatch dispatch : dispatches){
- jgPushUtil.push(2,"有新的改派订单需要处理，请及时处理！", "订单改派", map, "DISPATCH" + dispatch.getId());
- }
+// for(Dispatch dispatch : dispatches){
+// jgPushUtil.push(2,"有新的改派订单需要处理，请及时处理！", "订单改派", map, "DISPATCH" + dispatch.getId());
+// }
}else{
System.err.println("预支付数据异常（orderId = " + id + ")");
}
diff --git a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ALiApiUtil.java b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ALiApiUtil.java
index f8b020f..4282db7 100644
--- a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ALiApiUtil.java
+++ b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ALiApiUtil.java
@@ -28,10 +28,10 @@
public boolean authentication(String name, String code){
String url = "https://safrvcert.market.alicloudapi.com/safrv_2meta_id_name/";
Map<String, String> header = new HashMap<>();
- header.put("Authorization", "APPCODE b7d32437d08149099457dcb50fb57df2");
+ header.put("Authorization", "APPCODE 1");
Map<String, Object> param = new HashMap<>();
- param.put("__userId", "1732960796168165");
- param.put("verifyKey", "IVO4js5kValcdt");
+ param.put("__userId", "1");
+ param.put("verifyKey", "1");
param.put("userName", name);
param.put("identifyNum", code);
String get = httpClientUtil.pushHttpRequset("GET", url, param, header, "form");
diff --git a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ALiSendSms.java b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ALiSendSms.java
deleted file mode 100644
index f40639c..0000000
--- a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ALiSendSms.java
+++ /dev/null
@@ -1,284 +0,0 @@
-package com.stylefeng.guns.modular.system.util;
-
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.aliyuncs.CommonRequest;
-import com.aliyuncs.CommonResponse;
-import com.aliyuncs.DefaultAcsClient;
-import com.aliyuncs.IAcsClient;
-import com.aliyuncs.exceptions.ClientException;
-import com.aliyuncs.profile.DefaultProfile;
-import com.google.gson.Gson;
-import com.stylefeng.guns.core.util.DateUtil;
-import org.springframework.stereotype.Component;
-
-import java.math.BigDecimal;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Map;
-
-/**
- * 阿里云短信工具类
- */
-@Component
-public class ALiSendSms {
-
- // 设置鉴权参数，初始化客户端
- private DefaultProfile profile = DefaultProfile.getProfile(
- "cn-hangzhou",// 地域ID
- "LTAI4G1BpRaihVRZp1RS8Stn",// 您的AccessKey ID
- "PDR7uUEGNf0wIPPVCPCVdySgTwCr90");// 您的AccessKey Secret
- private IAcsClient client = new DefaultAcsClient(profile);
-
- private static void log_print(String functionName, Object result) {
- Gson gson = new Gson();
- System.out.println("-------------------------------" + functionName + "-------------------------------");
- System.out.println(gson.toJson(result));
- }
-
- /**
- * 添加短信模板
- */
- public String addSmsTemplate() throws ClientException {
- CommonRequest addSmsTemplateRequest = new CommonRequest();
- addSmsTemplateRequest.setSysDomain("dysmsapi.aliyuncs.com");
- addSmsTemplateRequest.setSysAction("AddSmsTemplate");
- addSmsTemplateRequest.setSysVersion("2017-05-25");
- // 短信类型。0：验证码；1：短信通知；2：推广短信；3：国际/港澳台消息
- addSmsTemplateRequest.putQueryParameter("TemplateType", "0");
- // 模板名称，长度为1~30个字符
- addSmsTemplateRequest.putQueryParameter("TemplateName", "测试短信模板");
- // 模板内容，长度为1~500个字符
- addSmsTemplateRequest.putQueryParameter("TemplateContent", "您正在申请手机注册，验证码为：${code}，5分钟内有效！");
- // 短信模板申请说明
- addSmsTemplateRequest.putQueryParameter("Remark", "测试");
- CommonResponse addSmsTemplateResponse = client.getCommonResponse(addSmsTemplateRequest);
- String data = addSmsTemplateResponse.getData();
- // 消除返回文本中的反转义字符
- String sData = data.replaceAll("'\'", "");
- log_print("addSmsTemplate", sData);
- Gson gson = new Gson();
- // 将字符串转换为Map类型，取TemplateCode字段值
- Map map = gson.fromJson(sData, Map.class);
- Object templateCode = map.get("TemplateCode");
- return templateCode.toString();
- }
-
- /**
- * 发送短信
- */
- public String sendSms(String phone, String templateCode, String json) throws ClientException {
- CommonRequest request = new CommonRequest();
- request.setSysDomain("dysmsapi.aliyuncs.com");
- request.setSysVersion("2017-05-25");
- request.setSysAction("SendSms");
- // 接收短信的手机号码
- request.putQueryParameter("PhoneNumbers", phone);
- // 短信签名名称。请在控制台签名管理页面签名名称一列查看（必须是已添加、并通过审核的短信签名）。
- request.putQueryParameter("SignName", "道奇乐科技");
- // 短信模板ID
- request.putQueryParameter("TemplateCode", templateCode);
- // 短信模板变量对应的实际值，JSON格式。
- request.putQueryParameter("TemplateParam", json);
- CommonResponse commonResponse = client.getCommonResponse(request);
- String data = commonResponse.getData();
- String sData = data.replaceAll("'\'", "");
- log_print("sendSms", sData);
- return sData;
- }
- public String sendSms1(String phone, String templateCode, String json) throws ClientException {
- CommonRequest request = new CommonRequest();
- request.setSysDomain("dysmsapi.aliyuncs.com");
- request.setSysVersion("2017-05-25");
- request.setSysAction("SendSms");
- // 接收短信的手机号码
- request.putQueryParameter("PhoneNumbers", phone);
- // 短信签名名称。请在控制台签名管理页面签名名称一列查看（必须是已添加、并通过审核的短信签名）。
- request.putQueryParameter("SignName", "飞马打车");
- // 短信模板ID
- request.putQueryParameter("TemplateCode", templateCode);
- // 短信模板变量对应的实际值，JSON格式。
- request.putQueryParameter("TemplateParam", json);
- CommonResponse commonResponse = client.getCommonResponse(request);
- String data = commonResponse.getData();
- String sData = data.replaceAll("'\'", "");
- log_print("sendSms", sData);
- return sData;
- }
- /**
- * 查询发送详情
- */
- private void querySendDetails(String bizId) throws ClientException {
- CommonRequest request = new CommonRequest();
- request.setSysDomain("dysmsapi.aliyuncs.com");
- request.setSysVersion("2017-05-25");
- request.setSysAction("QuerySendDetails");
- // 接收短信的手机号码
- request.putQueryParameter("PhoneNumber", "156xxxxxxxx");
- // 短信发送日期，支持查询最近30天的记录。格式为yyyyMMdd，例如20191010。
- request.putQueryParameter("SendDate", "20191010");
- // 分页记录数量
- request.putQueryParameter("PageSize", "10");
- // 分页当前页码
- request.putQueryParameter("CurrentPage", "1");
- // 发送回执ID，即发送流水号。
- request.putQueryParameter("BizId", bizId);
- CommonResponse response = client.getCommonResponse(request);
- log_print("querySendDetails", response.getData());
- }
-
- public static void main(String[] args) {
- /*ALiSendSms sendSmsDemo = new ALiSendSms();
- try {
- // 创建短信模板
- String templateCode = sendSmsDemo.addSmsTemplate();
- // 使用刚创建的短信模板发送短信
- String sData = sendSmsDemo.sendSms("156xxxxxxxx", templateCode, "{\"code\":\"8888\"}");
- Gson gson = new Gson();
- Map map = gson.fromJson(sData, Map.class);
- String bizId = map.get("BizId").toString();
- // 根据短信发送流水号查询短信发送情况
- sendSmsDemo.querySendDetails(bizId);
- } catch (ClientException e) {
- e.printStackTrace();
- }*/
- //开始根据不同的方式计算金额
- try {
- ALiSendSms sendSmsDemo = new ALiSendSms();
- String sData = sendSmsDemo.sendSms1("18380476116", "SMS_215342869", "{\"time\":\"" + DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss") + "\",\"money\":\"" + 1 + "\"}");
- System.out.println(sData);
- } catch (ClientException e) {
- e.printStackTrace();
- }
- /*double amount = 0;
- JSONObject jsonObject = JSON.parseObject("{\"num1\":\"6.4\",\"num2\":\"2.5\",\"num3\":\"4\",\"num4\":\"1.8\",\"num5\":\"0.25\",\"num6\":\"2\",\"num7\":\"0.5\",\"num8\":\"4\",\"num9\":\"10\",\"num10\":\"1.00\",\"num11\":\"10\",\"num12\":\"20\",\"num13\":\"1.00\",\"num14\":\"20\",\"num15\":\"1.00\",\"num16\":\"22:00 - 23:59\",\"num17\":\"7\",\"num18\":\"2.3\",\"num19\":\"0.5\",\"num20\":\"1\",\"num21\":\"1\",\"num22\":\"1\",\"num23\":\"00:00 - 02:59\",\"num24\":\"03:00 - 07:00\",\"num25\":\"7\",\"num26\":\"2.3\",\"num27\":\"0.5\",\"num28\":\"1\",\"num29\":\"1\",\"num30\":\"1\"}");
- Double num1 = jsonObject.getDouble("num1");//起步价（元）
- Double num2 = jsonObject.getDouble("num2");//起步公里（公里）
- Double num3 = jsonObject.getDouble("num3");//起步时间（分钟）
- Double num4 = jsonObject.getDouble("num4");//里程费（元）
- Double num5 = jsonObject.getDouble("num5");//时长费（分钟）
- Double num6 = jsonObject.getDouble("num6");//等待费（分钟）
- Double num7 = jsonObject.getDouble("num7");//等待费（元）
- Double num8 = jsonObject.getDouble("num8");//远途费（公里）
- Double num9 = jsonObject.getDouble("num9");//远途费（公里）
- Double num10 = jsonObject.getDouble("num10");//远途费（元）
- Double num11 = jsonObject.getDouble("num11");//远途费（公里）
- Double num12 = jsonObject.getDouble("num12");//远途费（公里）
- Double num13 = jsonObject.getDouble("num13");//远途费（元）
- Double num14 = jsonObject.getDouble("num14");//远途费（公里）
- Double num15 = jsonObject.getDouble("num15");//远途费（元）
- String num16 = jsonObject.getString("num16");//夜间费（开始时间）
- Double num17 = jsonObject.getDouble("num17");//夜间费（元）
- Double num18 = jsonObject.getDouble("num18");//夜间费（元）
- Double num19 = jsonObject.getDouble("num19");//夜间费（元）
- Double num20 = jsonObject.getDouble("num20");//夜间费（元）
- Double num21 = jsonObject.getDouble("num21");//夜间费（元）
- Double num22 = jsonObject.getDouble("num22");//夜间费（元）
- String num23 = jsonObject.getString("num23");//高峰费（开始时间）
- String num24 = jsonObject.getString("num24");//高峰费（开始时间）
- Double num25 = jsonObject.getDouble("num25");//高峰费（元）
- Double num26 = jsonObject.getDouble("num26");//高峰费（元）
- Double num27 = jsonObject.getDouble("num27");//高峰费（元）
- Double num28 = jsonObject.getDouble("num28");//高峰费（元）
- Double num29 = jsonObject.getDouble("num29");//高峰费（元）
- Double num30 = jsonObject.getDouble("num30");//高峰费（元）
-
- Date date = DateUtil.parseTime("2021-03-31 23:07:29");
- double d = 3606d / 1000;//实际公里
- double d1 = (d - num2) < 0 ? 0 : d - num2;//超出起步里程的公里
- double yt1 = 0;//远途1段
- double yt2 = 0;//远途2段
- double yt3 = 0;//远途3段
-
-
- //夜间服务处理逻辑
- Calendar s = Calendar.getInstance();
- s.setTime(date);
- s.set(Calendar.HOUR_OF_DAY, Integer.valueOf(num16.split(" - ")[0].split(":")[0]));
- s.set(Calendar.MINUTE, Integer.valueOf(num16.split(" - ")[0].split(":")[1]));
-
- Calendar e = Calendar.getInstance();
- e.setTime(date);
- e.set(Calendar.HOUR_OF_DAY, Integer.valueOf(num16.split(" - ")[1].split(":")[0]));
- e.set(Calendar.MINUTE, Integer.valueOf(num16.split(" - ")[1].split(":")[1]));
-
- if(date.getTime() > s.getTimeInMillis() && date.getTime() < e.getTimeInMillis()){
- if(d > num8.doubleValue() && d <= num9.doubleValue()){
- yt1 = num20 * (d - num8);
- }
- if(d > num9.doubleValue()){
- yt1 = num20 * (num9 - num8);
- }
- if(d > num11.doubleValue() && d <= num12.doubleValue()){
- yt2 = num21 * (d - num11);
- }
- if(d > num12.doubleValue()){
- yt2 = num21 * (num12 - num11);
- }
- if(d > num14.doubleValue()){
- yt3 = num22 * (d - num14);
- }
- System.out.println(new BigDecimal(yt1 + yt2 + yt3).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- }
-
-
- //高峰时段处理逻辑
- Calendar s1 = Calendar.getInstance();
- s1.setTime(date);
- s1.set(Calendar.HOUR_OF_DAY, Integer.valueOf(num23.split(" - ")[0].split(":")[0]));
- s1.set(Calendar.MINUTE, Integer.valueOf(num23.split(" - ")[0].split(":")[1]));
-
- Calendar e1 = Calendar.getInstance();
- e1.setTime(date);
- e1.set(Calendar.HOUR_OF_DAY, Integer.valueOf(num23.split(" - ")[1].split(":")[0]));
- e1.set(Calendar.MINUTE, Integer.valueOf(num23.split(" - ")[1].split(":")[1]));
-
- Calendar s2 = Calendar.getInstance();
- s2.setTime(date);
- s2.set(Calendar.HOUR_OF_DAY, Integer.valueOf(num24.split(" - ")[0].split(":")[0]));
- s2.set(Calendar.MINUTE, Integer.valueOf(num24.split(" - ")[0].split(":")[1]));
-
- Calendar e2 = Calendar.getInstance();
- e2.setTime(date);
- e2.set(Calendar.HOUR_OF_DAY, Integer.valueOf(num24.split(" - ")[1].split(":")[0]));
- e2.set(Calendar.MINUTE, Integer.valueOf(num24.split(" - ")[1].split(":")[1]));
-
- if((date.getTime() > s1.getTimeInMillis() && date.getTime() < e1.getTimeInMillis()) || (date.getTime() > s2.getTimeInMillis() && date.getTime() < e2.getTimeInMillis())){
- if(d > num8.doubleValue() && d <= num9.doubleValue()){
- yt1 = num28 * (d - num8);
- }
- if(d > num9.doubleValue()){
- yt1 = num28 * (num9 - num8);
- }
- if(d > num11.doubleValue() && d <= num12.doubleValue()){
- yt2 = num29 * (d - num11);
- }
- if(d > num12.doubleValue()){
- yt2 = num29 * (num12 - num11);
- }
- if(d > num14.doubleValue()){
- yt3 = num30 * (d - num14);
- }
- System.out.println(new BigDecimal(yt1 + yt2 + yt3).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- }
-
- //其他时间段的计算
- if(d > num8.doubleValue() && d <= num9.doubleValue()){
- yt1 = num10 * (d - num8);
- }
- if(d > num9.doubleValue()){
- yt1 = num10 * (num9 - num8);
- }
- if(d > num11.doubleValue() && d <= num12.doubleValue()){
- yt2 = num13 * (d - num11);
- }
- if(d > num12.doubleValue()){
- yt2 = num13 * (num12 - num11);
- }
- if(d > num14.doubleValue()){
- yt3 = num15 * (d - num14);
- }
- System.out.println(new BigDecimal(yt1 + yt2 + yt3).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());*/
- }
-}
diff --git a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ChinaMobileUtil.java b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ChinaMobileUtil.java
index 4b0b25d..c02d8df 100644
--- a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ChinaMobileUtil.java
+++ b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ChinaMobileUtil.java
@@ -1,194 +1,194 @@
-package com.stylefeng.guns.modular.system.util;
-
-import com.alibaba.fastjson.JSONObject;
-import com.aliyuncs.CommonRequest;
-import com.aliyuncs.CommonResponse;
-import com.aliyuncs.DefaultAcsClient;
-import com.aliyuncs.IAcsClient;
-import com.aliyuncs.ecs.model.v20140526.DescribeInstancesRequest;
-import com.aliyuncs.exceptions.ClientException;
-import com.aliyuncs.exceptions.ServerException;
-import com.aliyuncs.http.MethodType;
-import com.aliyuncs.profile.DefaultProfile;
-import com.google.gson.Gson;
-import com.stylefeng.guns.core.qr.ImgQrTool;
-import com.stylefeng.guns.core.qr.QrImage;
-import com.stylefeng.guns.core.util.DateUtil;
-import com.stylefeng.guns.core.util.MD5Util;
-import org.apache.commons.codec.binary.Base64;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.io.IOException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 中国移动工具类
- */
-@Component
-public class ChinaMobileUtil {
-
- private static String APIKey = "LTAI4G1BpRaihVRZp1RS8Stn";
-
- private static String SecretKey = "PDR7uUEGNf0wIPPVCPCVdySgTwCr90";
-
- @Autowired
- private HttpClientUtil httpClientUtil;
-
-
- /**
- * 绑定小号
- * @param phoneA
- * @param phoneB
- * @param areaCode
- * @return
- * @throws Exception
- */
- public static Map<String, String> midAxbBindSend(String phoneA, String phoneB, Integer areaCode) throws Exception{
- Map<String, String> map1 = new HashMap<>();
- map1.put("code", "-1");
- map1.put("msg", "");
- map1.put("telX", "");
- map1.put("bindId", "");
- return map1;
- //暂时屏蔽-后期放开
- /*DefaultProfile profile = DefaultProfile.getProfile(
- "cn-hangzhou", // 地域ID
- APIKey, // 您的AccessKey ID
- SecretKey ); // 您的AccessKey Secret
- IAcsClient client = new DefaultAcsClient(profile);
-
- CommonRequest request = new CommonRequest();
- request.setMethod(MethodType.POST);
- request.setDomain("dyplsapi.aliyuncs.com");
- request.setVersion("2017-05-25");
- request.setAction("BindAxb");
- // 绑定关系的过期时间。必须晚于当前时间1分钟以上。
- request.putQueryParameter("Expiration", DateUtil.format(new Date(new Date().getTime()+7 * 24 * 60 * 60*1000L),"yyyy-MM-dd HH:mm:ss"));
- // 号码池Key
- request.putQueryParameter("PoolKey", "FC100000119206151");
- // AXB中的B号码
- request.putQueryParameter("PhoneNoB", phoneB);
- // AXB中的A号码
- request.putQueryParameter("PhoneNoA", phoneA);
- // 指定城市进行X号码的选号。
- request.putQueryParameter("ExpectCity", "北京");
- // 是否需要针对该绑定关系产生的所有通话录制通话录音。
- request.putQueryParameter("IsRecordingEnabled", "false");
- Map<String, String> map1 = new HashMap<>();
- try {
- CommonResponse response = client.getCommonResponse(request);
- // 处理请求结果
- System.out.println(response.getData());
- JSONObject jsonObject = JSONObject.parseObject(response.getData());
- if(jsonObject.getString("Code").equals("OK")){
- map1.put("code", "200");
- map1.put("msg", jsonObject.getString("Message"));
- map1.put("telX", jsonObject.getJSONObject("SecretBindDTO").getString("SecretNo"));
- map1.put("bindId", jsonObject.getJSONObject("SecretBindDTO").getString("SubsId"));
- }else{
- map1.put("code", jsonObject.getString("Code"));
- map1.put("msg", jsonObject.getString("Message"));
- }
- } catch (ServerException e) {
- e.printStackTrace();
- map1.put("code", "-1");
- map1.put("msg", e.getErrMsg());
- } catch (ClientException e) {
- System.out.println("ErrCode:" + e.getErrCode());
- System.out.println("ErrMsg:" + e.getErrMsg());
- System.out.println("RequestId:" + e.getRequestId());
- map1.put("code", "-1");
- map1.put("msg", e.getErrMsg());
- }
- return map1;*/
- }
-
-
- /**
- * 解绑小号关系
- * @param bindId 绑定关系id
- * @return
- * @throws Exception
- */
- public static Map<String, String> midAxbUnBindSend(String bindId,String secretNo) throws Exception{
- DefaultProfile profile = DefaultProfile.getProfile(
- "cn-hangzhou", // 地域ID
- APIKey, // 您的AccessKey ID
- SecretKey ); // 您的AccessKey Secret
- IAcsClient client = new DefaultAcsClient(profile);
-
- CommonRequest request = new CommonRequest();
- request.setMethod(MethodType.POST);
- request.setDomain("dyplsapi.aliyuncs.com");
- request.setVersion("2017-05-25");
- request.setAction("UnbindSubscription");
- // 绑定关系的过期时间。必须晚于当前时间1分钟以上。
- // 号码池Key
- request.putQueryParameter("PoolKey", "FC100000119206151");
- // 隐私号码。调用BindAXG等号码绑定接口时指定或自动分配的X号码。
- request.putQueryParameter("SecretNo", secretNo);
- // 绑定关系ID。
- //
- //可以在控制台的号码管理 > 号码详情中查看绑定关系ID，或者在调用BindAxb等号码绑定API时查看返回参数中的SubsId。
- request.putQueryParameter("SubsId", bindId);
- Map<String, String> map1 = new HashMap<>();
- try {
- CommonResponse response = client.getCommonResponse(request);
- // 处理请求结果
- System.out.println(response.getData());
- JSONObject jsonObject = JSONObject.parseObject(response.getData());
- if(jsonObject.getString("Code").equals("OK")){
- map1.put("code", "200");
- map1.put("msg", jsonObject.getString("Message"));
- }else{
- map1.put("code", jsonObject.getString("Code"));
- map1.put("msg", jsonObject.getString("Message"));
- }
- } catch (ServerException e) {
- e.printStackTrace();
- map1.put("code", "-1");
- map1.put("msg", e.getErrMsg());
- } catch (ClientException e) {
- System.out.println("ErrCode:" + e.getErrCode());
- System.out.println("ErrMsg:" + e.getErrMsg());
- System.out.println("RequestId:" + e.getRequestId());
- map1.put("code", "-1");
- map1.put("msg", e.getErrMsg());
- }
- return map1;
- }
-
- public static void main(String[] args) throws IOException {
- try{
- // System.out.println(midAxbBindSend("18380476116","13688394165",null));
- System.out.println(midAxbUnBindSend("1000031640138366","17150145472"));
- }catch (Exception e){
-
- }
-
- }
-
-
- public Map<String, String> HeaderUtils(String APIKey, String SecretKey) throws Exception{
- Map<String, String> header = new HashMap<>();
- long time = System.currentTimeMillis();
- String signStr = MD5Util.encrypt(APIKey + SecretKey + time);
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("apiKey", APIKey);
- jsonObject.put("time", time);
- jsonObject.put("sign", signStr);
- Base64 base64 = new Base64();
- String s = base64.encodeToString(jsonObject.toJSONString().getBytes("UTF-8"));
- header.put("header", s);
-
- jsonObject = new JSONObject();
- jsonObject.put("platformId", "");
- jsonObject.put("secret", "");
- s = base64.encodeToString(jsonObject.toJSONString().getBytes("UTF-8"));
- header.put("accessCode", s);
- return header;
- }
-}
+//package com.stylefeng.guns.modular.system.util;
+//
+//import com.alibaba.fastjson.JSONObject;
+//import com.aliyuncs.CommonRequest;
+//import com.aliyuncs.CommonResponse;
+//import com.aliyuncs.DefaultAcsClient;
+//import com.aliyuncs.IAcsClient;
+//import com.aliyuncs.ecs.model.v20140526.DescribeInstancesRequest;
+//import com.aliyuncs.exceptions.ClientException;
+//import com.aliyuncs.exceptions.ServerException;
+//import com.aliyuncs.http.MethodType;
+//import com.aliyuncs.profile.DefaultProfile;
+//import com.google.gson.Gson;
+//import com.stylefeng.guns.core.qr.ImgQrTool;
+//import com.stylefeng.guns.core.qr.QrImage;
+//import com.stylefeng.guns.core.util.DateUtil;
+//import com.stylefeng.guns.core.util.MD5Util;
+//import org.apache.commons.codec.binary.Base64;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Component;
+//
+//import java.io.IOException;
+//import java.util.Date;
+//import java.util.HashMap;
+//import java.util.Map;
+//
+///**
+// * 中国移动工具类
+// */
+//@Component
+//public class ChinaMobileUtil {
+//
+// private static String APIKey = "1";
+//
+// private static String SecretKey = "1";
+//
+// @Autowired
+// private HttpClientUtil httpClientUtil;
+//
+//
+// /**
+// * 绑定小号
+// * @param phoneA
+// * @param phoneB
+// * @param areaCode
+// * @return
+// * @throws Exception
+// */
+// public static Map<String, String> midAxbBindSend(String phoneA, String phoneB, Integer areaCode) throws Exception{
+// Map<String, String> map1 = new HashMap<>();
+// map1.put("code", "-1");
+// map1.put("msg", "");
+// map1.put("telX", "");
+// map1.put("bindId", "");
+// return map1;
+// //暂时屏蔽-后期放开
+// /*DefaultProfile profile = DefaultProfile.getProfile(
+// "cn-hangzhou", // 地域ID
+// APIKey, // 您的AccessKey ID
+// SecretKey ); // 您的AccessKey Secret
+// IAcsClient client = new DefaultAcsClient(profile);
+//
+// CommonRequest request = new CommonRequest();
+// request.setMethod(MethodType.POST);
+// request.setDomain("dyplsapi.aliyuncs.com");
+// request.setVersion("2017-05-25");
+// request.setAction("BindAxb");
+// // 绑定关系的过期时间。必须晚于当前时间1分钟以上。
+// request.putQueryParameter("Expiration", DateUtil.format(new Date(new Date().getTime()+7 * 24 * 60 * 60*1000L),"yyyy-MM-dd HH:mm:ss"));
+// // 号码池Key
+// request.putQueryParameter("PoolKey", "FC100000119206151");
+// // AXB中的B号码
+// request.putQueryParameter("PhoneNoB", phoneB);
+// // AXB中的A号码
+// request.putQueryParameter("PhoneNoA", phoneA);
+// // 指定城市进行X号码的选号。
+// request.putQueryParameter("ExpectCity", "北京");
+// // 是否需要针对该绑定关系产生的所有通话录制通话录音。
+// request.putQueryParameter("IsRecordingEnabled", "false");
+// Map<String, String> map1 = new HashMap<>();
+// try {
+// CommonResponse response = client.getCommonResponse(request);
+// // 处理请求结果
+// System.out.println(response.getData());
+// JSONObject jsonObject = JSONObject.parseObject(response.getData());
+// if(jsonObject.getString("Code").equals("OK")){
+// map1.put("code", "200");
+// map1.put("msg", jsonObject.getString("Message"));
+// map1.put("telX", jsonObject.getJSONObject("SecretBindDTO").getString("SecretNo"));
+// map1.put("bindId", jsonObject.getJSONObject("SecretBindDTO").getString("SubsId"));
+// }else{
+// map1.put("code", jsonObject.getString("Code"));
+// map1.put("msg", jsonObject.getString("Message"));
+// }
+// } catch (ServerException e) {
+// e.printStackTrace();
+// map1.put("code", "-1");
+// map1.put("msg", e.getErrMsg());
+// } catch (ClientException e) {
+// System.out.println("ErrCode:" + e.getErrCode());
+// System.out.println("ErrMsg:" + e.getErrMsg());
+// System.out.println("RequestId:" + e.getRequestId());
+// map1.put("code", "-1");
+// map1.put("msg", e.getErrMsg());
+// }
+// return map1;*/
+// }
+//
+//
+// /**
+// * 解绑小号关系
+// * @param bindId 绑定关系id
+// * @return
+// * @throws Exception
+// */
+// public static Map<String, String> midAxbUnBindSend(String bindId,String secretNo) throws Exception{
+// DefaultProfile profile = DefaultProfile.getProfile(
+// "cn-hangzhou", // 地域ID
+// APIKey, // 您的AccessKey ID
+// SecretKey ); // 您的AccessKey Secret
+// IAcsClient client = new DefaultAcsClient(profile);
+//
+// CommonRequest request = new CommonRequest();
+// request.setMethod(MethodType.POST);
+// request.setDomain("dyplsapi.aliyuncs.com");
+// request.setVersion("2017-05-25");
+// request.setAction("UnbindSubscription");
+// // 绑定关系的过期时间。必须晚于当前时间1分钟以上。
+// // 号码池Key
+// request.putQueryParameter("PoolKey", "FC100000119206151");
+// // 隐私号码。调用BindAXG等号码绑定接口时指定或自动分配的X号码。
+// request.putQueryParameter("SecretNo", secretNo);
+// // 绑定关系ID。
+// //
+// //可以在控制台的号码管理 > 号码详情中查看绑定关系ID，或者在调用BindAxb等号码绑定API时查看返回参数中的SubsId。
+// request.putQueryParameter("SubsId", bindId);
+// Map<String, String> map1 = new HashMap<>();
+// try {
+// CommonResponse response = client.getCommonResponse(request);
+// // 处理请求结果
+// System.out.println(response.getData());
+// JSONObject jsonObject = JSONObject.parseObject(response.getData());
+// if(jsonObject.getString("Code").equals("OK")){
+// map1.put("code", "200");
+// map1.put("msg", jsonObject.getString("Message"));
+// }else{
+// map1.put("code", jsonObject.getString("Code"));
+// map1.put("msg", jsonObject.getString("Message"));
+// }
+// } catch (ServerException e) {
+// e.printStackTrace();
+// map1.put("code", "-1");
+// map1.put("msg", e.getErrMsg());
+// } catch (ClientException e) {
+// System.out.println("ErrCode:" + e.getErrCode());
+// System.out.println("ErrMsg:" + e.getErrMsg());
+// System.out.println("RequestId:" + e.getRequestId());
+// map1.put("code", "-1");
+// map1.put("msg", e.getErrMsg());
+// }
+// return map1;
+// }
+//
+// public static void main(String[] args) throws IOException {
+// try{
+// // System.out.println(midAxbBindSend("18380476116","13688394165",null));
+// System.out.println(midAxbUnBindSend("1000031640138366","17150145472"));
+// }catch (Exception e){
+//
+// }
+//
+// }
+//
+//
+// public Map<String, String> HeaderUtils(String APIKey, String SecretKey) throws Exception{
+// Map<String, String> header = new HashMap<>();
+// long time = System.currentTimeMillis();
+// String signStr = MD5Util.encrypt(APIKey + SecretKey + time);
+// JSONObject jsonObject = new JSONObject();
+// jsonObject.put("apiKey", APIKey);
+// jsonObject.put("time", time);
+// jsonObject.put("sign", signStr);
+// Base64 base64 = new Base64();
+// String s = base64.encodeToString(jsonObject.toJSONString().getBytes("UTF-8"));
+// header.put("header", s);
+//
+// jsonObject = new JSONObject();
+// jsonObject.put("platformId", "");
+// jsonObject.put("secret", "");
+// s = base64.encodeToString(jsonObject.toJSONString().getBytes("UTF-8"));
+// header.put("accessCode", s);
+// return header;
+// }
+//}
diff --git a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java
index cbc9280..fd966af 100644
--- a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java
+++ b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java
@@ -12,9 +12,9 @@
public class OssUploadUtil {
//OSS图片访问域名
public static String oss_domain = "https://feimachuxing.oss-cn-beijing.aliyuncs.com/";
- public static String accessKeyId = "LTAI4G1BpRaihVRZp1RS8Stn";
- public static String accessKeySecret = "PDR7uUEGNf0wIPPVCPCVdySgTwCr90";
- public static String bucketName="feimachuxing";
+ public static String accessKeyId = "1";
+ public static String accessKeySecret = "1";
+ public static String bucketName="1";
public static String endpoint = "oss-cn-beijing.aliyuncs.com";
public static OSSClient ossClient = new OSSClient(endpoint, accessKeyId,accessKeySecret);
diff --git a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/QrCodeUtil.java b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/QrCodeUtil.java
index 361acd0..9bc4dbf 100644
--- a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/QrCodeUtil.java
+++ b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/QrCodeUtil.java
@@ -28,8 +28,8 @@
}
public static String getQrCode(Integer uid){
- String appid="wx94a1a55229c933ac";//应用ID
- String appSecret="cbd89baf017146c1d56c00f1d2a59df6";//(应用密钥)
+ String appid="1";//应用ID
+ String appSecret="1";//(应用密钥)
String urlToken ="https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid="+appid+"&secret="+appSecret+"";
String backData=sendGet(urlToken, "utf-8", 10000);
String accessToken = JSONObject.parseObject(backData).getString("access_token");
diff --git a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
index 0e16953..e2ee4a6 100644
--- a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
+++ b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
@@ -40,10 +40,10 @@
driverService.taskMinute();
//处于预约单
orderService.reservationOrder();
- //处理车载端断电后的自动下班
- driverService.taskOffWork();
- //处理结束订单后30分钟解绑小号功能
- orderService.taskMidAxbUnBindSend();
+// 处理车载端断电后的自动下班
+// driverService.taskOffWork();
+// 处理结束订单后30分钟解绑小号功能
+// orderService.taskMidAxbUnBindSend();
} catch (Exception e) {
e.printStackTrace();
}
@@ -60,7 +60,7 @@
//处理未支付订单发送短信通知
orderService.taskSmsSend();
for (Integer id: driverIds){
- jgPushUtil.push(1, "您的预约订单出行时间就要到了，请尽快前往预约地点接乘客", "DRIVER" + id);
+// jgPushUtil.push(1, "您的预约订单出行时间就要到了，请尽快前往预约地点接乘客", "DRIVER" + id);
}
this.driverIds.clear();
} catch (Exception e) {
diff --git a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
index 2221ebb..7013224 100644
--- a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
+++ b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -58,9 +58,6 @@
@Autowired
private ISystemNoticeService systemNoticeService;
- @Autowired
- private ChinaMobileUtil chinaMobileUtil;
-
@Resource
private RegionMapper regionMapper;
@@ -183,11 +180,11 @@
//调用移动的小号接口
Map<String, String> geocode = gdMapGeocodingUtil.geocode(orderTaxi.getStartLon().toString(), orderTaxi.getStartLat().toString());
Region region = regionMapper.query(geocode.get("districtCode"));
- Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderTaxi.getPassengersPhone(), driver.getPhone(), Integer.valueOf(region.getCitycode().substring(1)));
- if(String.valueOf(map.get("code")).equals("200")){
- orderTaxi.setTelX(map.get("telX"));
- orderTaxi.setBindId(map.get("bindId"));
- }
+// Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderTaxi.getPassengersPhone(), driver.getPhone(), Integer.valueOf(region.getCitycode().substring(1)));
+// if(String.valueOf(map.get("code")).equals("200")){
+// orderTaxi.setTelX(map.get("telX"));
+// orderTaxi.setBindId(map.get("bindId"));
+// }
this.updateById(orderTaxi);
--
Gitblit v1.7.1