java/IgoTravel.git

			@@ -30,6 +30,8 @@
			import com.stylefeng.guns.modular.system.util.Tingg.model.Results;
			import com.stylefeng.guns.modular.system.util.itextpdf.HtmlToPdfUtils;
			import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
			import com.stylefeng.guns.modular.system.warpper.EndPushWarpper;
			import com.stylefeng.guns.modular.system.warpper.OrderServerWarpper;
			import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
			import com.stylefeng.guns.modular.taxi.model.PaymentRecord;
			import com.stylefeng.guns.modular.taxi.service.IPaymentRecordService;
			@@ -39,21 +41,22 @@
			import org.jsoup.nodes.Element;
			import org.jsoup.nodes.FormElement;
			import org.jsoup.select.Elements;
			import org.slf4j.Logger;
			import org.slf4j.LoggerFactory;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.beans.factory.annotation.Value;
			import org.springframework.http.HttpEntity;
			import org.springframework.http.HttpHeaders;
			import org.springframework.http.MediaType;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.util.LinkedMultiValueMap;
			import org.springframework.util.MultiValueMap;
			import org.springframework.util.StringUtils;
			import org.springframework.web.client.RestTemplate;

			import javax.annotation.Resource;
			import java.io.File;
			import java.io.FileInputStream;
			import java.io.FileOutputStream;
			import java.io.FileWriter;
			import java.io.*;
			import java.math.BigDecimal;
			import java.math.MathContext;
			import java.math.RoundingMode;
			@@ -63,6 +66,8 @@

			@Service
			public class OrderLogisticsServiceImpl extends ServiceImpl<OrderLogisticsMapper, OrderLogistics> implements IOrderLogisticsService {

			private Logger log = LoggerFactory.getLogger(OrderLogisticsServiceImpl.class);

			@Resource
			private SystemPriceMapper systemPriceMapper;
			@@ -198,6 +203,22 @@

			@Autowired
			private IUserActivityRedenvelopeService userActivityRedenvelopeService;

			@Autowired
			private FleetEngineUtil fleetEngineUtil;

			@Resource
			private CarModelMapper carModelMapper;

			@Autowired
			private ICarService carService;

			@Resource
			private IDriverWorkService driverWorkService;


			@Value("${filePath}")
			private String filePath;



			@@ -238,7 +259,7 @@
			String[] split = endLonLat.split(",");
			Double lng = Double.valueOf(split[0]);
			Double lat = Double.valueOf(split[1]);
			ResultUtil<Map<String, Object>> price = this.getPrice1(type, startLonLat.split(",")[0], startLonLat.split(",")[1], lng.toString(), lat.toString(), language);
			ResultUtil<Map<String, Object>> price = this.getPrice1(uid, type, startLonLat.split(",")[0], startLonLat.split(",")[1], lng.toString(), lat.toString(), language);
			if(price.getCode() != 200){
			return price;
			}
			@@ -257,11 +278,11 @@
			* @return
			* @throws Exception
			*/
			public ResultUtil queryPayMoney(Integer number, Integer type, String startLonLat, String endLonLat, String endAddress, Integer language) throws Exception{
			public ResultUtil queryPayMoney(Integer uid, Integer number, Integer type, String startLonLat, String endLonLat, String endAddress, Integer language) throws Exception{
			String[] split = endLonLat.split(",");
			Double lng = Double.valueOf(split[0]);
			Double lat = Double.valueOf(split[1]);
			ResultUtil<Map<String, Object>> price = this.getPrice1(type, startLonLat.split(",")[0], startLonLat.split(",")[1], lng.toString(), lat.toString(), language);
			ResultUtil<Map<String, Object>> price = this.getPrice1(uid, type, startLonLat.split(",")[0], startLonLat.split(",")[1], lng.toString(), lat.toString(), language);
			if(price.getCode() == 200 && type == 5){
			Map<String, Object> data = price.getData();
			Double ordinary = Double.valueOf(data.get("ordinary").toString());
			@@ -311,7 +332,7 @@
			endAddress = endAddress.replaceAll("& #40;", "(");
			endAddress = endAddress.replaceAll("& #41;", ")");
			OrderLogistics orderLogistics = new OrderLogistics();
			Company query = companyCityService.query1(placementLon, placementLat);
			Company query = companyCityService.query1(uid, placementLon, placementLat);
			if(null == query){
			return ResultUtil.error(language == 1 ? "该地点暂无企业服务" : language == 2 ? "No service yet at this area" : "Pas encore de service dans cette zone");
			}
			@@ -324,7 +345,8 @@
			orderLogistics.setRemark(remark);
			orderLogistics.setPlacementLon(Double.valueOf(placementLon));
			orderLogistics.setPlacementLat(Double.valueOf(placementLat));
			ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(Double.valueOf(placementLat), Double.valueOf(placementLon));
			String tripId = redisUtil.getValue("trip" + uid);
			ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(Double.valueOf(placementLat), Double.valueOf(placementLon), tripId);
			if(null == reverseGeocode){
			return ResultUtil.error(language == 1 ? "解析地址出错" : language == 2 ? "Address resolution error" : "Erreur de résolution d’adresse");
			}
			@@ -347,7 +369,7 @@
			orderLogistics.setMileage(0D);
			orderLogistics.setIsReassign(1);
			orderLogistics.setReassignNotice(0);
			ResultUtil<Map<String, Object>> price = this.getPrice1(type, String.valueOf(startLon), String.valueOf(startLat), lng.toString(), lat.toString(), language);
			ResultUtil<Map<String, Object>> price = this.getPrice1(uid, type, String.valueOf(startLon), String.valueOf(startLat), lng.toString(), lat.toString(), language);
			if(price.getCode() != 200){
			return price;
			}
			@@ -396,8 +418,8 @@
			* @return
			* @throws Exception
			*/
			public ResultUtil<Map<String, Double>> getPrice(Integer type, String startLon, String startLat, String endLon, String endLat) throws Exception{
			Company query = companyCityService.query1(startLon, startLat);
			public ResultUtil<Map<String, Double>> getPrice(Integer uid, Integer type, String startLon, String startLat, String endLon, String endLat) throws Exception{
			Company query = companyCityService.query1(uid, startLon, startLat);
			if(null == query){
			return ResultUtil.error("预约取货点暂无企业服务");
			}
			@@ -440,8 +462,8 @@



			public ResultUtil<Map<String, Object>> getPrice1(Integer type, String startLon, String startLat, String endLon, String endLat, Integer language) throws Exception{
			Company query = companyCityService.query1(startLon, startLat);
			public ResultUtil<Map<String, Object>> getPrice1(Integer uid, Integer type, String startLon, String startLat, String endLon, String endLat, Integer language) throws Exception{
			Company query = companyCityService.query1(uid, startLon, startLat);
			if(null == query){
			return ResultUtil.error(language == 1 ? "预约取货点暂无企业服务" : language == 2 ?
			"No service yet at the reserved pickup point." : "Les points de ramassage prévus ne sont pas disponibles pour le moment.");
			@@ -453,7 +475,8 @@
			Integer activityId = null;
			if(type == 4){//同城
			Map<String, Object> query1 = systemPriceMapper.query(query.getId(), type, null);
			DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(Double.valueOf(startLat), Double.valueOf(startLon), Double.valueOf(endLat), Double.valueOf(endLon));
			String tripId = redisUtil.getValue("trip" + uid);
			DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(Double.valueOf(startLat), Double.valueOf(startLon), Double.valueOf(endLat), Double.valueOf(endLon), tripId);
			if(null == distancematrix){
			return ResultUtil.error(language == 1 ? "计算距离出错" : language == 2 ? "Errors in computing distance" : "Erreurs dans le calcul de la distance");
			}
			@@ -524,12 +547,12 @@
			if(ToolUtil.isNotEmpty(vehicle)){
			integers = JSON.parseArray(vehicle).toJavaList(Integer.class);
			}
			Company query = companyCityService.query1(String.valueOf(orderLogistics.getStartLon()), String.valueOf(orderLogistics.getStartLat()));//获取起点所属分公司
			Company query = companyCityService.query1(orderLogistics.getUserId(), String.valueOf(orderLogistics.getStartLon()), String.valueOf(orderLogistics.getStartLat()));//获取起点所属分公司
			List<PushOrder> querys = pushOrderService.querys(null, 1, query.getId());//用专车的推单配置
			for(int i = 1; i <= querys.size(); i++){
			PushOrder pushOrder = pushOrderService.querys(i, 1, query.getId()).get(0);
			//获取空闲司机
			List<Driver> list = driverService.queryIdleDriver(orderLogistics.getType(), orderLogistics.getServerCarModelId(), orderLogistics.getStartLon(), orderLogistics.getStartLat(), pushOrder.getPushDistance(), null);//所有附近空闲司机
			List<Driver> list = driverService.queryIdleDriver(orderLogistics.getUserId(), orderLogistics.getType(), orderLogistics.getServerCarModelId(), orderLogistics.getStartLon(), orderLogistics.getStartLat(), pushOrder.getPushDistance(), null);//所有附近空闲司机
			System.err.println("【" + orderLogistics.getId() + "】空闲司机：" + JSON.toJSONString(list));
			if(list.size() > 0){
			double driverProportion = pushOrder.getDriverProportion() / 100;//推送占比计算成小数
			@@ -546,7 +569,57 @@
			if(bo){
			continue;
			}
			pushUtil.pushOrderState(2, driver.getId(), orderLogistics.getId(), orderLogistics.getType(), orderLogistics.getState(), pushOrder.getPushTime());

			Driver driver1 = driverService.selectById(driver.getId());
			DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", driver1.getId())
			.eq("state", 1).like("type", "4"));
			if(null == driverWork \|\| driver1.getState() != 2){
			continue;
			}
			String text = "";
			Integer language1 = driver.getLanguage();
			switch (language1){
			case 1:
			text = "收到新的包裹订单，从" + orderLogistics.getStartAddress() + "出发，全程约" + orderLogistics.getEstimatedMileage() + "公里";
			break;
			case 2:
			text = "Received a new delivery order, starting from " + orderLogistics.getStartAddress() + ", the whole journey is about " + orderLogistics.getEstimatedMileage() + "kilometre";
			break;
			case 3:
			text = "J'ai reçu une nouvelle commande de livraison, à partir de " + orderLogistics.getStartAddress() + ", le trajet complet est d’environ " + orderLogistics.getEstimatedMileage() + "kilométrage";
			break;

			}
			String audioUrl = "";
			String fileName = "pushOrder" + orderLogistics.getDriverId() + UUIDUtil.getRandomCode(5) + ".mp3";
			try {
			audioUrl = TextToSpeechUtil.create(language1 == 1 ? "cmn-CN" : language1 == 2 ? "en-US" : "fr-FR", text, fileName);
			} catch (Exception e) {
			throw new RuntimeException(e);
			}
			//定时任务删除语音文件
			new Timer().schedule(new TimerTask() {
			@Override
			public void run() {
			try {
			// 使用Runtime执行命令
			Process process = Runtime.getRuntime().exec("sudo rm -rf /home/igotechgh/nginx/html/files/audio/" + fileName);
			// 读取命令的输出
			BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
			String line;
			while ((line = reader.readLine()) != null) {
			System.out.println(line);
			}
			// 等待命令执行完成
			process.waitFor();
			// 关闭流
			reader.close();
			} catch (IOException \| InterruptedException e) {
			e.printStackTrace();
			}
			}
			}, 30000);
			pushUtil.pushOrderState(2, driver.getId(), orderLogistics.getId(), orderLogistics.getType(), orderLogistics.getState(), pushOrder.getPushTime(), audioUrl);
			}
			}
			Thread.sleep(pushOrder.getPushTime() * 1000);//设置等待时间
			@@ -595,12 +668,12 @@
			* 1.下了即时单就不能下预约单和即时单
			* 2.下了预约单和再下一张即时单不能再下预约单
			*/
			List<OrderPrivateCar> orderPrivateCars = orderPrivateCarMapper.queryByState(uid, 1, 1, 1, 2, 3, 4, 5, 6, 11);
			List<OrderPrivateCar> orderPrivateCars = orderPrivateCarMapper.queryByState(uid, 1, 1, 1, 2, 3, 4, 5, 6, 7, 11, 12);
			if(orderPrivateCars.size() > 0){
			return ResultUtil.error(language == 1 ? "有未完成的订单" : language == 2 ? "Uncompleted order(s)" : "Commande(s) non complétée(s)");
			}
			int selectCount = this.selectCount(new EntityWrapper<OrderLogistics>().eq("userId", uid).eq("isDelete", 1)
			.in("state", Arrays.asList(1, 2, 3, 4, 5, 7, 11, 12)));
			.in("state", Arrays.asList(1, 2, 3, 4, 5, 6, 7, 11, 12)));
			if(0 < selectCount){
			return ResultUtil.error(language == 1 ? "有未完成的订单" : language == 2 ? "Uncompleted order(s)" : "Commande(s) non complétée(s)");
			}
			@@ -623,7 +696,8 @@
			orderLogistics.setUrgent(1);
			orderLogistics.setCargoNumber(1);

			ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(Double.valueOf(placementLat), Double.valueOf(placementLon));
			String tripId = redisUtil.getValue("trip" + uid);
			ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(Double.valueOf(placementLat), Double.valueOf(placementLon), tripId);
			orderLogistics.setPlacementAddress(reverseGeocode.getAddress());
			orderLogistics.setStartLon(Double.valueOf(startLon));
			orderLogistics.setStartLat(Double.valueOf(startLat));
			@@ -637,6 +711,7 @@
			orderLogistics.setInsertTime(new Date());
			orderLogistics.setTravelTime(new Date());
			orderLogistics.setOrderSource(orderSource);
			orderLogistics.setRemark(remark);
			if(orderSource == 2){//扫码下单
			Driver driver = driverService.selectById(driverId);
			if(null == driver){
			@@ -674,21 +749,151 @@
			CarService query1 = carServiceMapper.query(1, driver.getCarId());
			orderLogistics.setServerCarModelId(query1.getServerCarModelId());
			orderLogistics.setSnatchOrderTime(new Date());

			String value = redisUtil.getValue("DRIVER" + driver.getId());
			if(ToolUtil.isNotEmpty(value)) {
			String[] split = value.split(",");
			DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(orderLogistics.getStartLat(), orderLogistics.getStartLon(), Double.valueOf(split[1]), Double.valueOf(split[0]), tripId);
			//超时时间
			long timeOut = System.currentTimeMillis() + (distancematrix.getDuration() * 1000);
			orderLogistics.setEstimateArriveTime(new Date(timeOut));
			orderLogistics.setEstimateArriveMileage(distancematrix.getDistance());
			}
			driver.setState(3);
			driverService.updateById(driver);
			}

			orderLogistics.setIsReassign(1);
			orderLogistics.setIsDelete(1);
			orderLogistics.setTripId(tripId);
			DistancematrixVo distancematrix1 = GoogleMapUtil.getDistancematrix(orderLogistics.getStartLat(), orderLogistics.getStartLon(), orderLogistics.getEndLat(), orderLogistics.getEndLon(), tripId);
			Long distance1 = distancematrix1.getDistance();
			orderLogistics.setEstimatedMileage(new BigDecimal(distance1).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
			this.insert(orderLogistics);

			UserInfo userInfo = userInfoService.selectById(uid);
			userInfo.setLanguage(language);
			userInfoService.updateById(userInfo);

			//google创建车辆信息
			String vehicleId = null;
			if(null != orderLogistics.getDriverId()){
			Driver driver = driverService.selectById(orderLogistics.getDriverId());
			Car car = carMapper.selectById(driver.getCarId());
			if(!StringUtils.hasLength(car.getVehicleId())){
			car.setVehicleId(UUIDUtil.getRandomCode());
			carMapper.updateById(car);
			}
			//查询车辆信息，没有则创建信息
			String vehicles = fleetEngineUtil.getVehicles(car.getVehicleId());
			if(ToolUtil.isEmpty(vehicles)){
			CarModel carModel = carModelMapper.selectById(car.getCarModelId());
			boolean createVehicles = fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
			if(!createVehicles){
			for (int i = 0; i < 5; i++) {
			createVehicles = fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
			if(createVehicles){
			break;
			}
			Thread.sleep(5000L);
			}
			}
			boolean updateVehicles = fleetEngineUtil.updateVehicles("ONLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
			if(!updateVehicles){
			for (int i = 0; i < 5; i++) {
			updateVehicles = fleetEngineUtil.updateVehicles("ONLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
			if(updateVehicles){
			break;
			}
			Thread.sleep(5000L);
			}
			}
			}
			}

			//创建行程数据
			String trip = fleetEngineUtil.getTrip(orderLogistics.getTripId());
			int count = this.selectCount(new EntityWrapper<OrderLogistics>().eq("tripId", orderLogistics.getTripId()));
			int count1 = orderPrivateCarService.selectCount(new EntityWrapper<OrderPrivateCar>().eq("tripId", orderLogistics.getTripId()));
			if(ToolUtil.isNotEmpty(trip) \|\| (count + count1) > 0){
			String randomCode = UUIDUtil.getRandomCode();
			redisUtil.setStrValue("trip" + orderLogistics.getUserId(), randomCode);
			OrderLogistics orderLogistics1 = new OrderLogistics();
			orderLogistics1.setId(orderLogistics.getId());
			orderLogistics1.setTripId(randomCode);
			this.updateById(orderLogistics1);
			orderLogistics.setTripId(randomCode);
			}
			JSONObject createTrip = fleetEngineUtil.createTrip(vehicleId, 1, orderLogistics.getTripId(),
			orderLogistics.getStartLat().toString(), orderLogistics.getStartLon().toString(), orderLogistics.getEndLat().toString(), orderLogistics.getEndLon().toString());
			JSONObject error = createTrip.getJSONObject("error");
			if(null != error){
			for (int i = 0; i < 5; i++) {
			createTrip = fleetEngineUtil.createTrip(vehicleId, 1, orderLogistics.getTripId(),
			orderLogistics.getStartLat().toString(), orderLogistics.getStartLon().toString(), orderLogistics.getEndLat().toString(), orderLogistics.getEndLon().toString());
			error = createTrip.getJSONObject("error");
			String tripStatus = createTrip.getString("tripStatus");
			if(null == error && "NEW".equals(tripStatus)){
			break;
			}
			try {
			Thread.sleep(3000L);
			} catch (InterruptedException e) {
			throw new RuntimeException(e);
			}
			}
			}

			if(orderSource == 2){//扫码下单
			Driver driver = driverService.selectById(orderLogistics.getDriverId());
			String text = "";
			Integer language1 = driver.getLanguage();
			switch (language1){
			case 1:
			text = "收到新的包裹订单，从" + orderLogistics.getStartAddress() + "出发，全程约" + orderLogistics.getEstimatedMileage() + "公里";
			break;
			case 2:
			text = "Received a new delivery order, starting from " + orderLogistics.getStartAddress() + ", the whole journey is about " + orderLogistics.getEstimatedMileage() + "kilometre";
			break;
			case 3:
			text = "J'ai reçu une nouvelle commande de livraison, à partir de " + orderLogistics.getStartAddress() + ", le trajet complet est d’environ " + orderLogistics.getEstimatedMileage() + "kilométrage";
			break;

			}
			String audioUrl = "";
			String fileName = "pushOrder" + orderLogistics.getDriverId() + UUIDUtil.getRandomCode(5) + ".mp3";
			try {
			audioUrl = TextToSpeechUtil.create(language1 == 1 ? "cmn-CN" : language1 == 2 ? "en-US" : "fr-FR", text, fileName);
			} catch (Exception e) {
			throw new RuntimeException(e);
			}
			//定时任务删除语音文件
			new Timer().schedule(new TimerTask() {
			@Override
			public void run() {
			try {
			// 使用Runtime执行命令
			Process process = Runtime.getRuntime().exec("sudo rm -rf /home/igotechgh/nginx/html/files/audio/" + fileName);
			// 读取命令的输出
			BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
			String line;
			while ((line = reader.readLine()) != null) {
			System.out.println(line);
			}
			// 等待命令执行完成
			process.waitFor();
			// 关闭流
			reader.close();
			} catch (IOException \| InterruptedException e) {
			e.printStackTrace();
			}
			}
			}, 30000);
			String finalAudioUrl = audioUrl;
			new Thread(new Runnable() {
			@Override
			public void run() {
			pushUtil.pushOrderState(1, uid, orderLogistics.getId(), 4, 2, 0);
			pushUtil.pushOrderState(2, orderLogistics.getDriverId(), orderLogistics.getId(), 4, 2, 0);
			pushUtil.pushOrderState(1, uid, orderLogistics.getId(), 4, 2, 0, "");
			pushUtil.pushOrderState(2, orderLogistics.getDriverId(), orderLogistics.getId(), 4, 2, 0, finalAudioUrl);
			}
			}).start();
			}
			@@ -696,14 +901,14 @@

			// TODO: 2021/5/11 修改，根据后台设定的派单范围查询范围内有无司机，将单子指派给距离最近的司机（距离相同随机取），范围内没有司机再进行推单流程
			if(orderLogistics.getState() == 1){
			Company query = companyCityService.query1(orderLogistics.getStartLon().toString(), orderLogistics.getStartLat().toString());
			Company query = companyCityService.query1(uid, orderLogistics.getStartLon().toString(), orderLogistics.getStartLat().toString());
			if(null == query){
			return ResultUtil.error(language == 1 ? "起点暂未企业提供服务" : language == 2 ? "Starting point no enterprise to provide services" : "Point de départ pas encore disponible pour les entreprises");
			}
			AssignOrder assignOrder = assignOrderService.selectOne(new EntityWrapper<AssignOrder>().eq("companyId", query.getId()).eq("type", 1));
			if(null != assignOrder && assignOrder.getPeople() > 0){//配置了指派规则才处理
			//获取空闲司机
			List<Driver> drivers = driverService.queryIdleDriver(4, orderLogistics.getServerCarModelId(), orderLogistics.getStartLon(), orderLogistics.getStartLat(), assignOrder.getDistance(), null);//获取范围内空闲司机
			List<Driver> drivers = driverService.queryIdleDriver(uid, 4, orderLogistics.getServerCarModelId(), orderLogistics.getStartLon(), orderLogistics.getStartLat(), assignOrder.getDistance(), null);//获取范围内空闲司机
			if(drivers.size() > 0){//有司机，直接指派给司机
			Driver dr = null;
			if(drivers.size() > 1){
			@@ -716,7 +921,7 @@
			String value = redisUtil.getValue("DRIVER" + drivers.get(j).getId());
			if(null != value){
			String[] split = value.split(",");
			DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(orderLogistics.getStartLat(), orderLogistics.getStartLon(), Double.valueOf(split[1]), Double.valueOf(split[0]));
			DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(orderLogistics.getStartLat(), orderLogistics.getStartLon(), Double.valueOf(split[1]), Double.valueOf(split[0]), tripId);
			Long distance = distancematrix.getDistance();
			if((0 == m && null == driver) \|\| (distance < m)){
			driver = drivers.get(j);
			@@ -735,7 +940,7 @@
			String value = redisUtil.getValue("DRIVER" + driver.getId());
			if(null != value){
			String[] split = value.split(",");
			DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(orderLogistics.getStartLat(), orderLogistics.getStartLon(), Double.valueOf(split[1]), Double.valueOf(split[0]));
			DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(orderLogistics.getStartLat(), orderLogistics.getStartLon(), Double.valueOf(split[1]), Double.valueOf(split[0]), tripId);
			Long d = distancematrix.getDistance();
			if((0 == m && null == dr) \|\| (d.intValue() < m.intValue())){
			dr = driver;
			@@ -747,26 +952,75 @@
			dr = drivers.get(0);
			}

			orderLogistics.setDriverId(dr.getId());
			orderLogistics.setCompanyId(dr.getFranchiseeId() != null && dr.getFranchiseeId() != 0 ? dr.getFranchiseeId() : (
			dr.getCompanyId() != null && dr.getCompanyId() != 0 ? dr.getCompanyId() : 1));
			orderLogistics.setState(2);
			orderLogistics.setCarId(dr.getCarId());
			CarService query1 = carServiceMapper.query(1, dr.getCarId());
			orderLogistics.setServerCarModelId(query1.getServerCarModelId());
			orderLogistics.setSnatchOrderTime(new Date());

			dr.setState(3);
			driverService.updateById(dr);
			this.updateById(orderLogistics);

			new Thread(new Runnable() {
			@Override
			public void run() {
			pushUtil.pushOrderState(1, uid, orderLogistics.getId(), 4, 2, 0);
			pushUtil.pushOrderState(2, orderLogistics.getDriverId(), orderLogistics.getId(), 4, 2, 0);
			Driver driver1 = driverService.selectById(dr.getId());
			DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", driver1.getId())
			.eq("state", 1).like("type", "4"));
			if(driver1.getState() == 2 \|\| null != driverWork){
			orderLogistics.setDriverId(dr.getId());
			orderLogistics.setCompanyId(dr.getFranchiseeId() != null && dr.getFranchiseeId() != 0 ? dr.getFranchiseeId() : (
			dr.getCompanyId() != null && dr.getCompanyId() != 0 ? dr.getCompanyId() : 1));
			orderLogistics.setState(2);
			orderLogistics.setCarId(dr.getCarId());
			CarService query1 = carServiceMapper.query(1, dr.getCarId());
			orderLogistics.setServerCarModelId(query1.getServerCarModelId());
			orderLogistics.setSnatchOrderTime(new Date());

			dr.setState(3);
			driverService.updateById(dr);
			this.updateById(orderLogistics);

			String text = "";
			Integer language1 = dr.getLanguage();
			switch (language1){
			case 1:
			text = "收到新的包裹订单，从" + orderLogistics.getStartAddress() + "出发，全程约" + orderLogistics.getEstimatedMileage() + "公里";
			break;
			case 2:
			text = "Received a new delivery order, starting from " + orderLogistics.getStartAddress() + ", the whole journey is about " + orderLogistics.getEstimatedMileage() + "kilometre";
			break;
			case 3:
			text = "J'ai reçu une nouvelle commande de livraison, à partir de " + orderLogistics.getStartAddress() + ", le trajet complet est d’environ " + orderLogistics.getEstimatedMileage() + "kilométrage";
			break;

			}
			}).start();
			String audioUrl = "";
			String fileName = "pushOrder" + orderLogistics.getDriverId() + UUIDUtil.getRandomCode(5) + ".mp3";
			try {
			audioUrl = TextToSpeechUtil.create(language1 == 1 ? "cmn-CN" : language1 == 2 ? "en-US" : "fr-FR", text, fileName);
			} catch (Exception e) {
			throw new RuntimeException(e);
			}
			//定时任务删除语音文件
			new Timer().schedule(new TimerTask() {
			@Override
			public void run() {
			try {
			// 使用Runtime执行命令
			Process process = Runtime.getRuntime().exec("sudo rm -rf /home/igotechgh/nginx/html/files/audio/" + fileName);
			// 读取命令的输出
			BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
			String line;
			while ((line = reader.readLine()) != null) {
			System.out.println(line);
			}
			// 等待命令执行完成
			process.waitFor();
			// 关闭流
			reader.close();
			} catch (IOException \| InterruptedException e) {
			e.printStackTrace();
			}
			}
			}, 30000);
			String finalAudioUrl = audioUrl;
			new Thread(new Runnable() {
			@Override
			public void run() {
			pushUtil.pushOrderState(1, uid, orderLogistics.getId(), 4, 2, 0, "");
			pushUtil.pushOrderState(2, orderLogistics.getDriverId(), orderLogistics.getId(), 4, 2, 0, finalAudioUrl);
			}
			}).start();
			}
			}
			}
			}
			@@ -775,22 +1029,6 @@
			//推单操作
			if(orderLogistics.getState() == 1){
			this.pushOrder(orderLogistics);
			}else{
			// //接单后定时任务判断司机是否去接乘客，没有则推送提醒
			// CancleOrder cancleOrder = cancleOrderService.query(orderLogistics.getCompanyId());
			// if(null != cancleOrder){
			// JSONObject object = JSON.parseObject(cancleOrder.getContent());
			// long time = object.getInteger("driverTimeout") * 60000L;
			// new Timer().schedule(new TimerTask() {
			// @Override
			// public void run() {
			// OrderLogistics orderLogistics1 = OrderLogisticsServiceImpl.this.selectById(orderLogistics.getId());
			// if(orderLogistics1.getState() == 2){
			// pushUtil.pushDriverTimeOut(1, orderLogistics1.getUserId(), orderLogistics1.getId(), 4);
			// }
			// }
			// }, time);
			// }
			}


			@@ -802,6 +1040,7 @@
			BaseWarpper baseWarpper = new BaseWarpper();
			baseWarpper.setState(orderLogistics.getState());
			baseWarpper.setId(orderLogistics.getId());
			baseWarpper.setContent(orderLogistics.getTripId());
			return ResultUtil.success(baseWarpper);
			}

			@@ -814,29 +1053,45 @@
			* @throws Exception
			*/
			@Override
			@Transactional
			public ResultUtil payLogisticsOrder(Integer payType, Integer bankCardId, Integer orderId,Integer couponId, Integer redDeduction, Integer type, Integer language) throws Exception {
			OrderLogistics orderLogistics = this.selectById(orderId);
			if(orderLogistics.getState() != 7){
			if(orderLogistics.getState() == 8 \|\| orderLogistics.getState() == 9){
			return ResultUtil.error(language == 1 ? "订单已完成支付，不允许重复支付" : language == 2 ? "The order has been paid, recurring payments is not allowed." : "La commande a été payée, les paiements récurrents ne sont pas autorisés.", "");
			}
			if(orderLogistics.getState() != 7){
			return ResultUtil.error(language == 1 ? "订单不在待支付状态，不允许支付" : language == 2 ? "The order is no longer with Pending Payment, making payments is not allowed." : "La commande n’est plus en attente de paiement, il n’est pas permis d’effectuer des paiements.", "");
			}
			Integer uid = orderLogistics.getUserId();
			Double orderMoney = orderLogistics.getOrderMoney();
			BigDecimal orderMoney = new BigDecimal(orderLogistics.getOrderMoney());
			if(orderLogistics.getUrgent() == 2){
			// orderMoney += null != orderLogistics.getTipMoney() ? orderLogistics.getTipMoney() : 0;
			}
			UserInfo userInfo = userInfoService.selectById(uid);
			ResultUtil resultUtil = ResultUtil.success("");
			//折扣
			if(null != orderLogistics.getActivityId()){
			orderMoney = orderMoney - orderLogistics.getDiscountMoney();
			//计算折扣
			UserActivityDiscount1 query2 = userActivityDiscount1Mapper.query(orderLogistics.getCompanyId());
			if(null != query2){
			Integer orderNum=this.selectCount(new EntityWrapper<OrderLogistics>().eq("userId",orderLogistics.getUserId()).eq("activityId",query2.getId()).last(" and to_days(getoffTime) = to_days(now())"));
			if(query2.getDistance()*1000>orderLogistics.getMileage() && query2.getOrderNum()>orderNum){
			Double special = query2.getLogistics();
			if(null != special){
			orderLogistics.setDiscount(special);
			BigDecimal v = orderMoney.multiply(new BigDecimal(special / 10)).setScale(2, BigDecimal.ROUND_HALF_EVEN);
			if(orderMoney.compareTo(v) > 0){
			orderLogistics.setDiscountMoney(orderMoney.subtract(v).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			orderLogistics.setActivityId(query2.getId());
			orderMoney = v;
			}
			}
			}
			}

			//计算优惠券
			UserCouponRecord userCouponRecord = null;
			if(null != couponId){
			//TODO 待翻译
			if(null != redDeduction && 1 == redDeduction){
			return ResultUtil.error(language == 1 ? "优惠券和红包不能同时使用" : language == 2 ? "" : "", "");
			return ResultUtil.error(language == 1 ? "优惠券和红包不能同时使用" : language == 2 ? "Coupons and lucky-promo cannot be used at the same time." : "Les coupons et les bonus ne peuvent pas être utilisés en même temps", "");
			}
			userCouponRecord = userCouponRecordService.selectById(couponId);
			if(userCouponRecord.getCompanyId() != orderLogistics.getCompanyId()){
			@@ -851,73 +1106,79 @@
			if(userCouponRecord.getCouponUseType() != 0 && userCouponRecord.getCouponUseType() != 4){
			return ResultUtil.error(language == 1 ? "优惠券不能用于此订单" : language == 2 ? "Coupon cannot be used for this order." : "Le coupon ne peut pas être utilisé pour cette commande.", "");
			}
			if(userCouponRecord.getCouponType() == 2 && orderMoney.compareTo(userCouponRecord.getFullMoney()) < 0){
			if(userCouponRecord.getCouponType() == 2 && orderMoney.compareTo(new BigDecimal(userCouponRecord.getFullMoney())) < 0){
			return ResultUtil.error(language == 1 ? "优惠券不能用于此订单" : language == 2 ? "Coupon cannot be used for this order." : "Le coupon ne peut pas être utilisé pour cette commande.", "");
			}
			orderMoney = orderMoney - userCouponRecord.getMoney();
			orderMoney = orderMoney.subtract(new BigDecimal(userCouponRecord.getMoney())).setScale(2, RoundingMode.HALF_EVEN);
			orderLogistics.setCouponMoney(userCouponRecord.getMoney());
			orderLogistics.setCouponId(couponId);
			}

			//计算红包
			if(null != redDeduction && 1 == redDeduction){
			if(null != redDeduction && 1 == redDeduction && null == orderLogistics.getRedPacketId()){
			RedEnvelopePaymentSettings redEnvelopePaymentSettings = redEnvelopePaymentSettingsService.getRedEnvelopePaymentSettings();
			if(null != redEnvelopePaymentSettings){
			Double total = userRedPacketRecordService.queryRemainingAmount(uid);
			List<UserRedPacketRecord> userRedPacketRecords = userRedPacketRecordService.selectList(new EntityWrapper<UserRedPacketRecord>().eq("userId", uid)
			.eq("state", 1).eq("companyId", orderLogistics.getCompanyId()).gt("remainingAmount", 0).orderBy("insertTime", false));
			if(total.compareTo(orderMoney) >= 0){
			BigDecimal deductionRatio = redEnvelopePaymentSettings.getDeductionRatio();
			BigDecimal multiply = new BigDecimal(orderMoney).multiply(deductionRatio.divide(new BigDecimal(100)));
			orderLogistics.setRedPacketMoney(multiply.doubleValue());
			orderMoney = orderMoney - multiply.doubleValue();

			BigDecimal deductionRatio = redEnvelopePaymentSettings.getDeductionRatio();
			BigDecimal multiply1 = orderMoney.multiply(deductionRatio.divide(new BigDecimal(100))).setScale(2, RoundingMode.HALF_EVEN);
			if(total > 0 && multiply1.doubleValue() > 0 && total.compareTo(multiply1.doubleValue()) >= 0){
			orderLogistics.setRedPacketMoney(multiply1.doubleValue());
			orderMoney = orderMoney.subtract(multiply1).setScale(2, RoundingMode.HALF_EVEN);

			//获取红包id
			JSONArray jsonArray = new JSONArray();
			for (UserRedPacketRecord userRedPacketRecord : userRedPacketRecords) {
			if(multiply1.compareTo(BigDecimal.ZERO) == 0){
			break;
			}
			JSONObject jsonObject = new JSONObject();
			jsonObject.put("id", userRedPacketRecord.getId());
			BigDecimal remainingAmount = new BigDecimal(userRedPacketRecord.getRemainingAmount());
			if(multiply.compareTo(remainingAmount) >= 0){
			multiply = multiply.subtract(remainingAmount);
			jsonObject.put("money", remainingAmount);
			if(multiply1.compareTo(remainingAmount) >= 0){
			userRedPacketRecord.setRemainingAmount(0D);
			userRedPacketRecord.setEndTime(new Date());
			userRedPacketRecord.setState(2);
			multiply1 = multiply1.subtract(remainingAmount).setScale(2, RoundingMode.HALF_EVEN);
			jsonObject.put("money", remainingAmount.setScale(2, RoundingMode.HALF_EVEN));
			jsonArray.add(jsonObject);
			}else{
			userRedPacketRecord.setRemainingAmount(remainingAmount.subtract(multiply).doubleValue());
			jsonObject.put("money", multiply);
			}else if(remainingAmount.compareTo(multiply1) > 0){
			userRedPacketRecord.setRemainingAmount(remainingAmount.subtract(multiply1).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
			jsonObject.put("money", multiply1.setScale(2, RoundingMode.HALF_EVEN));
			jsonArray.add(jsonObject);
			break;
			multiply1 = BigDecimal.ZERO;
			}
			}
			if(userRedPacketRecords.size() > 0){
			userRedPacketRecordService.updateBatchById(userRedPacketRecords);
			}
			orderLogistics.setRedPacketId(jsonArray.toJSONString());
			}else{
			}
			if(total > 0 && total.compareTo(multiply1.doubleValue()) < 0){
			orderLogistics.setRedPacketMoney(total);
			orderMoney = orderMoney - total;
			orderMoney = orderMoney.subtract(new BigDecimal(total)).setScale(2, RoundingMode.HALF_EVEN);
			//获取红包id
			JSONArray jsonArray = new JSONArray();
			BigDecimal multiply = new BigDecimal(total);
			for (UserRedPacketRecord userRedPacketRecord : userRedPacketRecords) {
			JSONObject jsonObject = new JSONObject();
			jsonObject.put("id", userRedPacketRecord.getId());
			BigDecimal remainingAmount = new BigDecimal(userRedPacketRecord.getRemainingAmount());
			if(multiply.compareTo(remainingAmount) >= 0){
			multiply = multiply.subtract(remainingAmount);
			jsonObject.put("money", remainingAmount);
			jsonArray.add(jsonObject);
			}else{
			userRedPacketRecord.setRemainingAmount(remainingAmount.subtract(multiply).doubleValue());
			jsonObject.put("money", multiply);
			jsonArray.add(jsonObject);
			break;
			}
			jsonObject.put("money", userRedPacketRecord.getRemainingAmount());
			jsonArray.add(jsonObject);

			userRedPacketRecord.setRemainingAmount(0D);
			userRedPacketRecord.setEndTime(new Date());
			userRedPacketRecord.setState(2);
			}
			if(userRedPacketRecords.size() > 0){
			userRedPacketRecordService.updateBatchById(userRedPacketRecords);
			}
			orderLogistics.setRedPacketId(jsonArray.toJSONString());
			}
			}
			}

			orderMoney=new BigDecimal(orderMoney).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();

			if(payType == 1) {//手机支付
			SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
			String merchantTransactionId = sdf.format(new Date()) + "4" + language + orderId;
			@@ -927,20 +1188,20 @@
			checkoutRequest.setAccountNumber(userInfo.getPhone());
			checkoutRequest.setCustomerFirstName(userInfo.getFirstName());
			checkoutRequest.setCustomerLastName(userInfo.getLastName());
			checkoutRequest.setRequestAmount(orderMoney);
			checkoutRequest.setRequestAmount(orderMoney.setScale(2, RoundingMode.HALF_EVEN).doubleValue());
			checkoutRequest.setMerchantTransactionId(merchantTransactionId);
			checkoutRequest.setRequestDescription("Travel completion payment");
			checkoutRequest.setCallbackUrl(callbackPath + "/base/wxPayOrderTaxi");
			checkoutRequest.setPendingRedirectUrl("");
			checkoutRequest.setSuccessRedirectUrl("http://182.160.16.251:81/payMoney/pages/success.html");
			checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html");
			checkoutRequest.setSuccessRedirectUrl("https://igo.i-go.group/payMoney/pages/success.html");
			checkoutRequest.setFailRedirectUrl("https://igo.i-go.group/payMoney/pages/fail.html");
			resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest);
			if(resultUtil.getCode()==200){
			paymentRecordService.saveData(1, null, null, orderId, 4, 1, orderMoney, null, 1);//添加预支付数据
			paymentRecordService.saveData(1, null, null, orderId, 4, 1,
			orderMoney.setScale(2, RoundingMode.HALF_EVEN).doubleValue(), null, 1);//添加预支付数据
			}else{
			resultUtil = ResultUtil.error(language == 1 ? "支付失败" : language == 2 ? "Payment failure" : "Paiement échoué", "");
			}
			return resultUtil;
			}

			if(payType == 2) {//银行卡支付
			@@ -953,29 +1214,30 @@
			checkoutRequest.setAccountNumber(bankCard.getCode());
			checkoutRequest.setCustomerFirstName(bankCard.getFirstName());
			checkoutRequest.setCustomerLastName(bankCard.getLastName());
			checkoutRequest.setRequestAmount(orderMoney);
			checkoutRequest.setRequestAmount(orderMoney.setScale(2, RoundingMode.HALF_EVEN).doubleValue());
			checkoutRequest.setMerchantTransactionId(merchantTransactionId);
			checkoutRequest.setRequestDescription("Travel completion payment");
			checkoutRequest.setCallbackUrl(callbackPath + "/base/wxPayOrderTaxi");
			checkoutRequest.setPendingRedirectUrl("");
			checkoutRequest.setSuccessRedirectUrl("http://182.160.16.251:81/payMoney/pages/success.html");
			checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html");
			checkoutRequest.setSuccessRedirectUrl("https://igo.i-go.group/payMoney/pages/success.html");
			checkoutRequest.setFailRedirectUrl("https://igo.i-go.group/payMoney/pages/fail.html");
			resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest);

			if(resultUtil.getCode()==200){
			paymentRecordService.saveData(1, null, null, orderId, 4, 2, orderMoney, null, 1);//添加预支付数据
			this.updateById(orderLogistics);
			paymentRecordService.saveData(1, null, null, orderId, 4, 2,
			orderMoney.setScale(2, RoundingMode.HALF_EVEN).doubleValue(), null, 1);//添加预支付数据
			}else{
			resultUtil = ResultUtil.error(language == 1 ? "支付失败" : language == 2 ? "Payment failure" : "Paiement échoué", "");
			}
			return resultUtil;
			}

			if(payType == 3){//余额支付
			if(userInfo.getBalance() == null \|\| userInfo.getBalance() < orderMoney){
			if(userInfo.getBalance() == null \|\| new BigDecimal(userInfo.getBalance()).compareTo(orderMoney) < 0){
			return ResultUtil.error(language == 1 ? "账户余额不足" : language == 2 ? "Insufficient balance" : "Solde insuffisant", "");
			}

			userInfo.setBalance(new BigDecimal(userInfo.getBalance()).subtract(new BigDecimal(orderMoney)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			userInfo.setBalance(new BigDecimal(userInfo.getBalance()).subtract(orderMoney).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());

			SysIntegral query1 = sysIntegralMapper.query(orderLogistics.getCompanyId());
			userInfo.setIntegral(userInfo.getIntegral() + (orderMoney.intValue() * query1.getIntegral()));//积分
			@@ -986,30 +1248,15 @@
			userCouponRecord.setEndTime(new Date());
			userCouponRecordService.updateById(userCouponRecord);
			}
			if(null != orderLogistics.getRedPacketId()){
			JSONArray jsonArray = JSON.parseArray(orderLogistics.getRedPacketId());
			for (int i = 0; i < jsonArray.size(); i++) {
			JSONObject jsonObject = jsonArray.getJSONObject(i);
			Integer id1 = jsonObject.getInteger("id");
			Double money = jsonObject.getDouble("money");
			UserRedPacketRecord userRedPacketRecord = userRedPacketRecordService.selectById(id1);
			userRedPacketRecord.setRemainingAmount(userRedPacketRecord.getRemainingAmount() - money);
			if(0 == userRedPacketRecord.getRemainingAmount()){
			userRedPacketRecord.setState(2);
			userRedPacketRecord.setEndTime(new Date());
			}
			userRedPacketRecordService.updateById(userRedPacketRecord);
			}
			}

			//添加交易明细
			transactionDetailsService.saveData(uid, "包裹下单支付", orderMoney, 2, 1, 1, 4, orderId);
			transactionDetailsService.saveData(uid, "包裹下单支付",
			orderMoney.setScale(2, RoundingMode.HALF_EVEN).doubleValue(), 2, 1, 1, 4, orderId);
			userInfoService.updateById(userInfo);

			orderLogistics.setState(8);
			orderLogistics.setPayType(3);
			orderLogistics.setPayMoney(orderMoney);
			orderLogistics.setOrderMoney(orderLogistics.getOrderMoney()+orderLogistics.getFreeMoney().doubleValue());
			orderLogistics.setPayMoney(orderMoney.setScale(2, RoundingMode.HALF_EVEN).doubleValue());

			//处理优惠券和红包
			if(null != userCouponRecord){
			@@ -1033,35 +1280,34 @@
			}
			}

			if(orderLogistics.getIsplatPay()==1){
			//添加已收入明细
			Company company = companyService.selectById(orderLogistics.getCompanyId());
			Double speMoney = company.getSpeMoney();
			BigDecimal d = null;//企业收入
			BigDecimal c = null;//司机收入
			if(company.getIsSpeFixedOrProportional() == 2){//固定
			d = new BigDecimal(speMoney);
			c = new BigDecimal(orderLogistics.getOrderMoney()).subtract(d);//只有出行金额参与抽成，其余归属司机
			}
			if(company.getIsSpeFixedOrProportional() == 1){//比例
			Double price = orderLogistics.getStartMoney() + orderLogistics.getMileageMoney() + orderLogistics.getWaitMoney() + orderLogistics.getDurationMoney() + orderLogistics.getLongDistanceMoney();
			d = new BigDecimal(price).multiply(new BigDecimal(speMoney).divide(new BigDecimal(100), new MathContext(2, RoundingMode.HALF_EVEN)));
			c = new BigDecimal(orderLogistics.getOrderMoney()).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
			}
			incomeService.saveData(1, orderLogistics.getCompanyId(), 2, orderLogistics.getId(), 4, d.doubleValue());
			incomeService.saveData(2, orderLogistics.getDriverId(), 2, orderLogistics.getId(), 4, c.doubleValue());
			Driver driver = driverService.selectById(orderLogistics.getDriverId());
			driver.setBusinessMoney(new BigDecimal(null != driver.getBusinessMoney() ? driver.getBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driver.setLaveBusinessMoney(new BigDecimal(null != driver.getLaveBusinessMoney() ? driver.getLaveBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driverService.updateById(driver);
			//添加已收入明细
			Company company = companyService.selectById(orderLogistics.getCompanyId());
			Double speMoney = company.getSpeMoney();
			BigDecimal d = null;//企业收入
			BigDecimal c = null;//司机收入
			if(company.getIsSpeFixedOrProportional() == 2){//固定
			d = new BigDecimal(speMoney);
			c = new BigDecimal(orderLogistics.getOrderMoney()).subtract(d);//只有出行金额参与抽成，其余归属司机
			}
			if(company.getIsSpeFixedOrProportional() == 1){//比例
			Double price = orderLogistics.getStartMoney() + orderLogistics.getMileageMoney() + orderLogistics.getWaitMoney() + orderLogistics.getDurationMoney() + orderLogistics.getLongDistanceMoney();
			d = new BigDecimal(price).multiply(new BigDecimal(speMoney).divide(new BigDecimal(100), new MathContext(2, RoundingMode.HALF_EVEN)));
			c = new BigDecimal(orderLogistics.getOrderMoney()).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
			}
			incomeService.saveData(1, orderLogistics.getCompanyId(), 2, orderLogistics.getId(), 4, d.doubleValue());
			incomeService.saveData(2, orderLogistics.getDriverId(), 2, orderLogistics.getId(), 4, c.doubleValue());
			Driver driver = driverService.selectById(orderLogistics.getDriverId());
			driver.setBusinessMoney(new BigDecimal(null != driver.getBusinessMoney() ? driver.getBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driver.setLaveBusinessMoney(new BigDecimal(null != driver.getLaveBusinessMoney() ? driver.getLaveBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driverService.updateById(driver);

			// TODO: 2020/5/24 这里需要给司机和用户推送订单状态
			new Thread(new Runnable() {
			@Override
			public void run() {
			pushUtil.pushOrderState(1, orderLogistics.getUserId(), orderLogistics.getId(), orderLogistics.getType(), orderLogistics.getState(), 0);
			pushUtil.pushOrderState(1, orderLogistics.getUserId(), orderLogistics.getId(), orderLogistics.getType(), orderLogistics.getState(), 0, "");
			pushUtil.pushOrderState(2, orderLogistics.getDriverId(), orderLogistics.getId(), orderLogistics.getType(), orderLogistics.getState(), 0, "");
			}
			}).start();

			@@ -1072,21 +1318,13 @@


			language = userInfo.getLanguage();
			String payTypeChinese = "";
			String payTypeEnglish = "";
			String payTypeFrench = "";
			if(orderLogistics.getPayType() == 3){
			payTypeChinese = "余额支付";
			payTypeEnglish = "I-GO Wallet";
			payTypeFrench = "Portefeuille I-GO";
			}

			if(ToolUtil.isNotEmpty(userInfo.getEmail())){
			String path = templatePath + "user/receiptLogistics.html";
			Document document = Jsoup.parse(new File(path), "UTF-8");
			SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
			SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
			Driver driver = driverService.selectById(orderLogistics.getDriverId());
			driver = driverService.selectById(orderLogistics.getDriverId());
			Car car = carMapper.selectById(orderLogistics.getCarId());
			Double aDouble = 0D;
			if(null != orderLogistics.getDriverId()){
			@@ -1095,11 +1333,53 @@
			if(1 == language){
			document.getElementById("english").remove();
			document.getElementById("french").remove();
			document.getElementsByTag("title").get(0).text("I-GO电子收据");
			document.getElementsByTag("title").get(0).text("包裹收据");
			Element title_chinese = document.getElementById("title_chinese");
			title_chinese.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，您在I-GO此订单消费GHS " + orderLogistics.getPayMoney());
			Element xcf_chinese = document.getElementById("xcf_chinese");
			xcf_chinese.text("GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element qbj_chinese = document.getElementById("qbj_chinese");
			qbj_chinese.text("GHS " + new BigDecimal(orderLogistics.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element scf_chinese = document.getElementById("scf_chinese");
			if(null != orderLogistics.getDurationMoney() && orderLogistics.getDurationMoney() > 0){
			scf_chinese.text("GHS " + new BigDecimal(orderLogistics.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element scf_chinese_div = document.getElementById("scf_chinese_div");
			scf_chinese_div.remove();
			}
			Element lcf_chinese = document.getElementById("lcf_chinese");
			if(null != orderLogistics.getMileageMoney() && orderLogistics.getMileageMoney() > 0){
			lcf_chinese.text("GHS " + new BigDecimal(orderLogistics.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element lcf_chinese_div = document.getElementById("lcf_chinese_div");
			lcf_chinese_div.remove();
			}
			Element ddf_chinese = document.getElementById("ddf_chinese");
			if(null != orderLogistics.getWaitMoney() && orderLogistics.getWaitMoney() > 0){
			ddf_chinese.text("GHS " + new BigDecimal(orderLogistics.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element ddf_chinese_div = document.getElementById("ddf_chinese_div");
			ddf_chinese_div.remove();
			}
			Element glf_chinese = document.getElementById("glf_chinese");
			if(null != orderLogistics.getRoadTollMoney() && orderLogistics.getRoadTollMoney() > 0){
			glf_chinese.text("GHS " + new BigDecimal(orderLogistics.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element glf_chinese_div = document.getElementById("glf_chinese_div");
			glf_chinese_div.remove();
			}
			Element tcf_chinese = document.getElementById("tcf_chinese");
			if(null != orderLogistics.getParkMoney() && orderLogistics.getParkMoney() > 0){
			tcf_chinese.text("GHS " + new BigDecimal(orderLogistics.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element tcf_chinese_div = document.getElementById("tcf_chinese_div");
			tcf_chinese_div.remove();
			}
			Element bcj_chinese = document.getElementById("bcj_chinese");
			if(null != orderLogistics.getPriceDifference() && orderLogistics.getPriceDifference() > 0){
			bcj_chinese.text("GHS " + new BigDecimal(orderLogistics.getPriceDifference()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element bcj_chinese_div = document.getElementById("bcj_chinese_div");
			bcj_chinese_div.remove();
			}
			if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
			Element yhq_chinese = document.getElementById("yhq_chinese");
			yhq_chinese.text("GHS -" + new BigDecimal(orderLogistics.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
			@@ -1124,15 +1404,21 @@
			Element xj_chinese = document.getElementById("xj_chinese");
			xj_chinese.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element pay_type_chinese = document.getElementById("pay_type_chinese");
			pay_type_chinese.text(payTypeChinese);
			pay_type_chinese.text("余额支付");
			Element pay_money_chinese = document.getElementById("pay_money_chinese");
			pay_money_chinese.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element dispute_chinese = document.getElementById("dispute_chinese");
			if(null != orderLogistics.getIsDispute() && orderLogistics.getIsDispute() == 1){
			dispute_chinese.text("（注意: 争议订单，经过三方协商，平台最终定价为 GHS" + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN) + "）");
			}else{
			dispute_chinese.remove();
			}
			Element pdf_chinese = document.getElementById("pdf_chinese");
			pdf_chinese.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
			pdf_chinese.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
			Element lost_item_chinese = document.getElementById("lost_item_chinese");
			lost_item_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
			lost_item_chinese.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
			// Element track_chinese = document.getElementById("track_chinese");
			// track_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
			// track_chinese.attr("href", "https://igo.i-go.group/mailbox/user/location.html");
			Element pay_time_chinese = document.getElementById("pay_time_chinese");
			pay_time_chinese.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
			Elements driver_chinese = document.getElementsByClass("driver_chinese");
			@@ -1155,11 +1441,53 @@
			if(2 == language){
			document.getElementById("chinese").remove();
			document.getElementById("french").remove();
			document.getElementsByTag("title").get(0).text("Receipt");
			document.getElementsByTag("title").get(0).text("Delivery receipt");
			Element title_english = document.getElementById("title_english");
			title_english.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
			Element xcf_english = document.getElementById("xcf_english");
			xcf_english.text("GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element qbj_english = document.getElementById("qbj_english");
			qbj_english.text("GHS " + new BigDecimal(orderLogistics.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element scf_english = document.getElementById("scf_english");
			if(null != orderLogistics.getDurationMoney() && orderLogistics.getDurationMoney() > 0){
			scf_english.text("GHS " + new BigDecimal(orderLogistics.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element scf_english_div = document.getElementById("scf_english_div");
			scf_english_div.remove();
			}
			Element lcf_english = document.getElementById("lcf_english");
			if(null != orderLogistics.getMileageMoney() && orderLogistics.getMileageMoney() > 0){
			lcf_english.text("GHS " + new BigDecimal(orderLogistics.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element lcf_english_div = document.getElementById("lcf_english_div");
			lcf_english_div.remove();
			}
			Element ddf_english = document.getElementById("ddf_english");
			if(null != orderLogistics.getWaitMoney() && orderLogistics.getWaitMoney() > 0){
			ddf_english.text("GHS " + new BigDecimal(orderLogistics.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element ddf_english_div = document.getElementById("ddf_english_div");
			ddf_english_div.remove();
			}
			Element glf_english = document.getElementById("glf_english");
			if(null != orderLogistics.getRoadTollMoney() && orderLogistics.getRoadTollMoney() > 0){
			glf_english.text("GHS " + new BigDecimal(orderLogistics.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element glf_english_div = document.getElementById("glf_english_div");
			glf_english_div.remove();
			}
			Element tcf_english = document.getElementById("tcf_english");
			if(null != orderLogistics.getParkMoney() && orderLogistics.getParkMoney() > 0){
			tcf_english.text("GHS " + new BigDecimal(orderLogistics.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element tcf_english_div = document.getElementById("tcf_english_div");
			tcf_english_div.remove();
			}
			Element bcj_english = document.getElementById("bcj_english");
			if(null != orderLogistics.getPriceDifference() && orderLogistics.getPriceDifference() > 0){
			bcj_english.text("GHS " + new BigDecimal(orderLogistics.getPriceDifference()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element bcj_english_div = document.getElementById("bcj_english_div");
			bcj_english_div.remove();
			}
			if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
			Element yhq_english = document.getElementById("yhq_english");
			yhq_english.text("GHS -" + new BigDecimal(orderLogistics.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
			@@ -1184,15 +1512,21 @@
			Element xj_english = document.getElementById("xj_english");
			xj_english.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element pay_type_english = document.getElementById("pay_type_english");
			pay_type_english.text(payTypeEnglish);
			pay_type_english.text("I-GO Wallet");
			Element pay_money_english = document.getElementById("pay_money_english");
			pay_money_english.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element dispute_english = document.getElementById("dispute_english");
			if(null != orderLogistics.getIsDispute() && orderLogistics.getIsDispute() == 1){
			dispute_english.text("（Note: Disputed order, after tripartite negotiation, the final pricing of the platform is GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN) + "）");
			}else{
			dispute_english.remove();
			}
			Element pdf_english = document.getElementById("pdf_english");
			pdf_english.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
			pdf_english.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
			Element lost_item_english = document.getElementById("lost_item_english");
			lost_item_english.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
			lost_item_english.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
			// Element track_english = document.getElementById("track_english");
			// track_english.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
			// track_english.attr("href", "https://igo.i-go.group/mailbox/user/location.html");
			Element pay_time_english = document.getElementById("pay_time_english");
			pay_time_english.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
			Elements driver_english = document.getElementsByClass("driver_english");
			@@ -1215,11 +1549,53 @@
			if(3 == language){
			document.getElementById("chinese").remove();
			document.getElementById("english").remove();
			document.getElementsByTag("title").get(0).text("Reçu");
			document.getElementsByTag("title").get(0).text("Reçu de livraison");
			Element title_french = document.getElementById("title_french");
			title_french.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande i-go1 le ");
			Element xcf_french = document.getElementById("xcf_french");
			xcf_french.text("GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
			title_french.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande I-GO ");
			Element qbj_french = document.getElementById("qbj_french");
			qbj_french.text("GHS " + new BigDecimal(orderLogistics.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element scf_french = document.getElementById("scf_french");
			if(null != orderLogistics.getDurationMoney() && orderLogistics.getDurationMoney() > 0){
			scf_french.text("GHS " + new BigDecimal(orderLogistics.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element scf_french_div = document.getElementById("scf_french_div");
			scf_french_div.remove();
			}
			Element lcf_french = document.getElementById("lcf_french");
			if(null != orderLogistics.getMileageMoney() && orderLogistics.getMileageMoney() > 0){
			lcf_french.text("GHS " + new BigDecimal(orderLogistics.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element lcf_french_div = document.getElementById("lcf_french_div");
			lcf_french_div.remove();
			}
			Element ddf_french = document.getElementById("ddf_french");
			if(null != orderLogistics.getWaitMoney() && orderLogistics.getWaitMoney() > 0){
			ddf_french.text("GHS " + new BigDecimal(orderLogistics.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element ddf_french_div = document.getElementById("ddf_french_div");
			ddf_french_div.remove();
			}
			Element glf_french = document.getElementById("glf_french");
			if(null != orderLogistics.getRoadTollMoney() && orderLogistics.getRoadTollMoney() > 0){
			glf_french.text("GHS " + new BigDecimal(orderLogistics.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element glf_french_div = document.getElementById("glf_french_div");
			glf_french_div.remove();
			}
			Element tcf_french = document.getElementById("tcf_french");
			if(null != orderLogistics.getParkMoney() && orderLogistics.getParkMoney() > 0){
			tcf_french.text("GHS " + new BigDecimal(orderLogistics.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element tcf_french_div = document.getElementById("tcf_french_div");
			tcf_french_div.remove();
			}
			Element bcj_french = document.getElementById("bcj_french");
			if(null != orderLogistics.getPriceDifference() && orderLogistics.getPriceDifference() > 0){
			bcj_french.text("GHS " + new BigDecimal(orderLogistics.getPriceDifference()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element bcj_french_div = document.getElementById("bcj_french_div");
			bcj_french_div.remove();
			}
			if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
			Element yhq_french = document.getElementById("yhq_french");
			yhq_french.text("GHS -" + new BigDecimal(orderLogistics.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
			@@ -1244,15 +1620,21 @@
			Element xj_french = document.getElementById("xj_french");
			xj_french.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element pay_type_french = document.getElementById("pay_type_french");
			pay_type_french.text(payTypeFrench);
			pay_type_french.text("Portefeuille I-GO");
			Element pay_money_french = document.getElementById("pay_money_french");
			pay_money_french.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element dispute_french = document.getElementById("dispute_french");
			if(null != orderLogistics.getIsDispute() && orderLogistics.getIsDispute() == 1){
			dispute_french.text("（Remarque: Il s’agit d’une commande contestée, et après des négociations entre trois parties, la plateforme l’a finalement tarifée à GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN) + "）");
			}else{
			dispute_french.remove();
			}
			Element pdf_french = document.getElementById("pdf_french");
			pdf_french.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
			pdf_french.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
			Element lost_item_french = document.getElementById("lost_item_french");
			lost_item_french.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
			lost_item_french.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
			// Element track_french = document.getElementById("track_french");
			// track_french.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
			// track_french.attr("href", "https://igo.i-go.group/mailbox/user/location.html");
			Element pay_time_french = document.getElementById("pay_time_french");
			pay_time_french.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
			Elements driver_french = document.getElementsByClass("driver_french");
			@@ -1273,14 +1655,14 @@
			server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
			}

			EmailUtil.send(userInfo.getEmail(), language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu", document.html());
			EmailUtil.send(userInfo.getEmail(), language == 1 ? "包裹收据" : language == 2 ? "Delivery receipt" : "Reçu de livraison", document.html());

			//开始生成pdf收据和html收据
			File file = new File("/usr/local/nginx/html/files/html/");
			File file = new File("/home/igotechgh/nginx/html/files/html/");
			if(!file.exists()){
			file.mkdirs();
			}
			file = new File("/usr/local/nginx/html/files/html/parcel_receipt_" + orderId + ".html");
			file = new File("/home/igotechgh/nginx/html/files/html/parcel_receipt_" + orderId + ".html");
			if(!file.exists()){
			file.createNewFile();
			}
			@@ -1289,28 +1671,28 @@
			fileWriter.flush();
			fileWriter.close();

			File file1 = new File("/usr/local/nginx/html/files/pdf/");
			File file1 = new File("/home/igotechgh/nginx/html/files/pdf/");
			if(!file1.exists()){
			file1.mkdirs();
			}
			file1 = new File("/usr/local/nginx/html/files/pdf/parcel_receipt_" + orderId + ".pdf");
			file1 = new File("/home/igotechgh/nginx/html/files/pdf/parcel_receipt_" + orderId + ".pdf");
			if(!file1.exists()){
			file1.createNewFile();
			}
			try{
			FileOutputStream fileOutputStream = new FileOutputStream(file1);
			HtmlToPdfUtils.convertToPdf("/usr/local/nginx/html/files/html/parcel_receipt_" + orderId + ".html", "I-GO", fileOutputStream);
			HtmlToPdfUtils.convertToPdf("/home/igotechgh/nginx/html/files/html/parcel_receipt_" + orderId + ".html", "I-GO", fileOutputStream);
			}catch (Exception e){
			e.printStackTrace();
			System.out.println("html转pdf异常");
			}

			String link ="http://182.160.16.251:81/files/html/parcel_receipt_" + orderId + ".html";
			String link ="https://igo.i-go.group/files/html/parcel_receipt_" + orderId + ".html";
			TEmail tEmail = new TEmail();
			tEmail.setLink(link);
			tEmail.setUserId(userInfo.getId());
			tEmail.setType(1);
			tEmail.setName(language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu");
			tEmail.setName(language == 1 ? "包裹收据" : language == 2 ? "Delivery receipt" : "Reçu de livraison");
			tEmail.setOrderId(orderId);
			tEmail.setCreateTime(new Date());
			int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
			@@ -1333,14 +1715,14 @@
			userInfo.setIntegral(userInfo.getIntegral() + (orderMoney.intValue() * query1.getIntegral()));//积分

			//添加交易明细
			transactionDetailsService.saveData(uid, "包裹下单支付", orderMoney, 2, 1, 1, 4, orderId);
			transactionDetailsService.saveData(uid, "包裹下单支付",
			orderMoney.setScale(2, RoundingMode.HALF_EVEN).doubleValue(), 2, 1, 1, 4, orderId);
			userInfoService.updateById(userInfo);

			orderLogistics.setState(1);//小件物流先支付后司机抢单
			orderLogistics.setState(8);//小件物流先支付后司机抢单
			orderLogistics.setDriverPay(1);
			orderLogistics.setPayType(4);
			orderLogistics.setPayMoney(orderMoney);
			orderLogistics.setOrderMoney(orderLogistics.getOrderMoney()+orderLogistics.getFreeMoney().doubleValue());
			orderLogistics.setPayMoney(orderMoney.setScale(2, RoundingMode.HALF_EVEN).doubleValue());

			//处理优惠券和红包
			if(null != userCouponRecord){
			@@ -1356,19 +1738,6 @@
			driverService.updateById(driver);
			}
			if(null != orderLogistics.getRedPacketId()){
			JSONArray jsonArray = JSON.parseArray(orderLogistics.getRedPacketId());
			for (int i = 0; i < jsonArray.size(); i++) {
			JSONObject jsonObject = jsonArray.getJSONObject(i);
			Integer id1 = jsonObject.getInteger("id");
			Double money = jsonObject.getDouble("money");
			UserRedPacketRecord userRedPacketRecord = userRedPacketRecordService.selectById(id1);
			userRedPacketRecord.setRemainingAmount(userRedPacketRecord.getRemainingAmount() - money);
			if(0 == userRedPacketRecord.getRemainingAmount()){
			userRedPacketRecord.setState(2);
			userRedPacketRecord.setEndTime(new Date());
			}
			userRedPacketRecordService.updateById(userRedPacketRecord);
			}
			Double money = orderLogistics.getRedPacketMoney();
			incomeService.saveData(2, orderLogistics.getDriverId(), 7, orderLogistics.getId(), 4, money);
			driver.setBusinessMoney(new BigDecimal(null != driver.getBusinessMoney() ? driver.getBusinessMoney() : 0).add(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			@@ -1387,21 +1756,20 @@
			}


			if(orderLogistics.getIsplatPay()==1){
			//添加已收入明细
			Company company = companyService.selectById(orderLogistics.getCompanyId());
			Double speMoney = company.getSpeMoney();
			BigDecimal d = null;//企业收入
			BigDecimal c = null;//司机收入
			if(company.getIsSpeFixedOrProportional() == 2){//固定
			d = new BigDecimal(speMoney);
			c = new BigDecimal(orderLogistics.getOrderMoney()).subtract(d);//只有出行金额参与抽成，其余归属司机
			}
			if(company.getIsSpeFixedOrProportional() == 1){//比例
			Double price = orderLogistics.getStartMoney() + orderLogistics.getMileageMoney() + orderLogistics.getWaitMoney() + orderLogistics.getDurationMoney() + orderLogistics.getLongDistanceMoney();
			d = new BigDecimal(price).multiply(new BigDecimal(speMoney).divide(new BigDecimal(100), new MathContext(2, RoundingMode.HALF_EVEN)));
			c = new BigDecimal(orderLogistics.getOrderMoney()).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
			}
			//添加已收入明细
			Company company = companyService.selectById(orderLogistics.getCompanyId());
			Double speMoney = company.getSpeMoney();
			BigDecimal d = null;//企业收入
			BigDecimal c = null;//司机收入
			if(company.getIsSpeFixedOrProportional() == 2){//固定
			d = new BigDecimal(speMoney);
			c = new BigDecimal(orderLogistics.getOrderMoney()).subtract(d);//只有出行金额参与抽成，其余归属司机
			}
			if(company.getIsSpeFixedOrProportional() == 1){//比例
			Double price = orderLogistics.getStartMoney() + orderLogistics.getMileageMoney() + orderLogistics.getWaitMoney() + orderLogistics.getDurationMoney() + orderLogistics.getLongDistanceMoney();
			d = new BigDecimal(price).multiply(new BigDecimal(speMoney).divide(new BigDecimal(100), new MathContext(2, RoundingMode.HALF_EVEN)));
			c = new BigDecimal(orderLogistics.getOrderMoney()).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
			}
			// incomeService.saveData(1, orderPrivateCar.getCompanyId(), 2, orderPrivateCar.getId(), 1, d.doubleValue());
			// incomeService.saveData(2, orderPrivateCar.getDriverId(), 2, orderPrivateCar.getId(), 1, c.doubleValue());

			@@ -1409,50 +1777,109 @@
			// driver.setLaveBusinessMoney(new BigDecimal(null != driver.getLaveBusinessMoney() ? driver.getLaveBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			// driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			// driverService.updateById(driver);


			//记录司机待结算金额
			if(d.compareTo(new BigDecimal(0)) > 0){
			SettlementDetail settlementDetail = new SettlementDetail();
			settlementDetail.setOrderId(orderId);
			settlementDetail.setOrderType(4);
			settlementDetail.setDriverId(driver.getId());
			settlementDetail.setOrderMoney(orderLogistics.getOrderMoney());
			settlementDetail.setPrice(d.doubleValue());
			settlementDetail.setCreateTime(new Date());
			settlementDetailService.insert(settlementDetail);


			//记录司机待结算金额
			if(d.compareTo(new BigDecimal(0)) > 0){
			SettlementDetail settlementDetail = new SettlementDetail();
			settlementDetail.setOrderId(orderId);
			settlementDetail.setOrderType(1);
			settlementDetail.setDriverId(driver.getId());
			settlementDetail.setOrderMoney(orderLogistics.getOrderMoney());
			settlementDetail.setPrice(d.doubleValue());
			settlementDetail.setCreateTime(new Date());
			settlementDetailService.insert(settlementDetail);

			SettlementAllocation settlementAllocation = settlementAllocationService.selectOne(null);
			if(null != settlementAllocation){
			JSONObject jsonObject = JSON.parseObject(settlementAllocation.getContent());
			Double maxPrice = jsonObject.getDouble("maxPrice");
			Integer type1 = jsonObject.getInteger("type");
			if(1 == type1){
			List<SettlementDetail> settlementDetailList = settlementDetailService.selectList(new EntityWrapper<SettlementDetail>().eq("driverId", driver.getId()).isNull("settlementRecordId").last(" and DATE_FORMAT(now(), '%Y-%m-%d') = DATE_FORMAT(createTime, '%Y-%m-%d')"));
			BigDecimal total = new BigDecimal(0);
			for (SettlementDetail detail : settlementDetailList) {
			total = total.add(new BigDecimal(detail.getPrice()));
			SettlementAllocation settlementAllocation = settlementAllocationService.selectOne(null);
			if(null != settlementAllocation){
			JSONObject jsonObject = JSON.parseObject(settlementAllocation.getContent());
			Double maxPrice = jsonObject.getDouble("maxPrice");
			Integer type1 = jsonObject.getInteger("type");
			if(null != maxPrice){
			List<SettlementDetail> settlementDetailList = settlementDetailService.selectList(new EntityWrapper<SettlementDetail>().eq("driverId", driver.getId())
			.isNull("settlementRecordId").last(" and DATE_FORMAT(now(), '%Y-%m-%d') = DATE_FORMAT(createTime, '%Y-%m-%d')"));
			BigDecimal total = new BigDecimal(0);
			for (SettlementDetail detail : settlementDetailList) {
			total = total.add(new BigDecimal(detail.getPrice()));
			}
			//日结算
			if(maxPrice.compareTo(total.doubleValue()) <= 0){
			SettlementRecord settlementRecord = settlementRecordService.selectOne(new EntityWrapper<SettlementRecord>().eq("driverId", orderLogistics.getDriverId())
			.eq("type", type1).eq("paymentStatus", 1).last(" and day = DATE_FORMAT(now(), '%Y-%m-%d')"));
			if(null == settlementRecord){
			settlementRecord = new SettlementRecord();
			settlementRecord.setDay(new Date());
			settlementRecord.setDriverId(orderLogistics.getDriverId());
			settlementRecord.setType(type1);
			settlementRecord.setPaymentStatus(1);
			settlementRecord.setPayMoney(total.doubleValue());
			settlementRecord.setInsertTime(new Date());
			settlementRecordService.insert(settlementRecord);
			}else{
			settlementRecord.setPayMoney(settlementRecord.getPayMoney() + total.doubleValue());
			settlementRecordService.updateById(settlementRecord);
			}
			if(maxPrice.compareTo(total.doubleValue()) <= 0){
			SettlementRecord settlementRecord = settlementRecordService.selectOne(new EntityWrapper<SettlementRecord>().eq("driverId", orderLogistics.getDriverId())
			.eq("type", type1).eq("paymentStatus", 1).last(" and day = DATE_FORMAT(now(), '%Y-%m-%d')"));
			if(null == settlementRecord){
			settlementRecord = new SettlementRecord();
			settlementRecord.setDay(new Date());
			settlementRecord.setDriverId(orderLogistics.getDriverId());
			settlementRecord.setType(type1);
			settlementRecord.setPaymentStatus(1);
			settlementRecord.setPayMoney(total.doubleValue());
			settlementRecord.setInsertTime(new Date());
			settlementRecordService.insert(settlementRecord);
			}else{
			settlementRecord.setPayMoney(total.doubleValue());
			settlementRecordService.updateById(settlementRecord);
			for (SettlementDetail detail : settlementDetailList) {
			detail.setSettlementRecordId(settlementRecord.getId());
			settlementDetailService.updateById(detail);
			}
			//强制司机下班
			DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>()
			.eq("driverId", orderLogistics.getDriverId()).eq("state", 1));
			if(null != driverWork){
			driverWork.setEndTime(new Date());
			driverWork.setState(2);
			driverWorkService.updateById(driverWork);
			driver.setState(1);
			driverService.updateById(driver);
			Car car = carService.selectById(driver.getCarId());
			if(!org.apache.shiro.util.StringUtils.hasLength(car.getVehicleId())){
			car.setVehicleId(UUIDUtil.getRandomCode());
			carService.updateById(car);
			}
			for (SettlementDetail detail : settlementDetailList) {
			detail.setSettlementRecordId(settlementRecord.getId());
			settlementDetailService.updateById(detail);
			}

			//司机下班，修改谷歌上的车辆信息
			new Thread(()->{
			try {
			CarModel carModel = carModelMapper.selectById(car.getCarModelId());
			String vehicles = fleetEngineUtil.getVehicles(car.getVehicleId());
			if(ToolUtil.isEmpty(vehicles)){
			boolean createVehicles = fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
			if(!createVehicles){
			for (int i = 0; i < 5; i++) {
			createVehicles = fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
			if(createVehicles){
			break;
			}
			Thread.sleep(5000L);
			}
			}
			boolean updateVehicles = fleetEngineUtil.updateVehicles("OFFLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
			if(!updateVehicles){
			for (int i = 0; i < 5; i++) {
			updateVehicles = fleetEngineUtil.updateVehicles("OFFLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
			if(updateVehicles){
			break;
			}
			Thread.sleep(5000L);
			}
			}
			}else{
			boolean updateVehicles = fleetEngineUtil.updateVehicles("OFFLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
			if(!updateVehicles){
			for (int i = 0; i < 5; i++) {
			updateVehicles = fleetEngineUtil.updateVehicles("OFFLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
			if(updateVehicles){
			break;
			}
			Thread.sleep(5000L);
			}
			}
			}
			}catch (Exception e){
			e.printStackTrace();
			}
			}).start();
			}
			}
			}
			@@ -1466,8 +1893,52 @@
			new Thread(new Runnable() {
			@Override
			public void run() {
			pushUtil.pushOrderState(1, orderLogistics.getUserId(), orderLogistics.getId(), orderLogistics.getType(), orderLogistics.getState(), 0);
			pushUtil.pushOfflinePayment(2, orderLogistics.getDriverId(), orderLogistics.getId(), 4);
			pushUtil.pushOrderState(1, orderLogistics.getUserId(), orderLogistics.getId(), orderLogistics.getType(), orderLogistics.getState(), 0, "");
			pushUtil.pushOrderState(2, orderLogistics.getDriverId(), orderLogistics.getId(), orderLogistics.getType(), orderLogistics.getState(), 0, "");
			Integer language1 = driver.getLanguage();
			String text = "";
			switch (language1){
			case 1:
			text = "客户已选择支付现金，因此您必须收款。确定您已收到此订单费用：现金GHS " + orderLogistics.getPayMoney();
			break;
			case 2:
			text = "The client chose to pay in cash, so you must collect the payment.Confirm if you received the charge for this order: Cash GHS " + orderLogistics.getPayMoney();
			break;
			case 3:
			text = "Le client a choisi de payer en espèces, vous devez donc encaisser le paiement.Confirmez si vous avez reçu les frais pour cette commande : Espèces GHS " + orderLogistics.getPayMoney();
			break;

			}
			String audioUrl = "";
			String fileName = "offlinePayment" + orderLogistics.getDriverId() + UUIDUtil.getRandomCode(5) + ".mp3";
			try {
			audioUrl = TextToSpeechUtil.create(language1 == 1 ? "cmn-CN" : language1 == 2 ? "en-US" : "fr-FR", text, fileName);
			} catch (Exception e) {
			throw new RuntimeException(e);
			}
			//定时任务删除语音文件
			new Timer().schedule(new TimerTask() {
			@Override
			public void run() {
			try {
			// 使用Runtime执行命令
			Process process = Runtime.getRuntime().exec("sudo rm -rf /home/igotechgh/nginx/html/files/audio/" + fileName);
			// 读取命令的输出
			BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
			String line;
			while ((line = reader.readLine()) != null) {
			System.out.println(line);
			}
			// 等待命令执行完成
			process.waitFor();
			// 关闭流
			reader.close();
			} catch (IOException \| InterruptedException e) {
			e.printStackTrace();
			}
			}
			}, 30000);
			pushUtil.pushOfflinePayment(2, orderLogistics.getDriverId(), orderLogistics.getId(), 4, orderLogistics.getPayMoney(), audioUrl);
			}
			}).start();

			@@ -1476,15 +1947,6 @@
			"Vous avez payé la commande de livraison avec succès, merci d’utiliser I-GO", uid, 1);

			language = userInfo.getLanguage();
			String payTypeChinese = "";
			String payTypeEnglish = "";
			String payTypeFrench = "";
			if(orderLogistics.getPayType() == 3){
			payTypeChinese = "现金";
			payTypeEnglish = "Cash";
			payTypeFrench = "En espèces";
			}

			if(ToolUtil.isNotEmpty(userInfo.getEmail())){
			String path = templatePath + "user/receiptLogistics.html";
			Document document = Jsoup.parse(new File(path), "UTF-8");
			@@ -1498,11 +1960,53 @@
			if(1 == language){
			document.getElementById("english").remove();
			document.getElementById("french").remove();
			document.getElementsByTag("title").get(0).text("I-GO电子收据");
			document.getElementsByTag("title").get(0).text("包裹收据");
			Element title_chinese = document.getElementById("title_chinese");
			title_chinese.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，您在I-GO此订单消费GHS " + orderLogistics.getPayMoney());
			Element xcf_chinese = document.getElementById("xcf_chinese");
			xcf_chinese.text("GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element qbj_chinese = document.getElementById("qbj_chinese");
			qbj_chinese.text("GHS " + new BigDecimal(orderLogistics.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element scf_chinese = document.getElementById("scf_chinese");
			if(null != orderLogistics.getDurationMoney() && orderLogistics.getDurationMoney() > 0){
			scf_chinese.text("GHS " + new BigDecimal(orderLogistics.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element scf_chinese_div = document.getElementById("scf_chinese_div");
			scf_chinese_div.remove();
			}
			Element lcf_chinese = document.getElementById("lcf_chinese");
			if(null != orderLogistics.getMileageMoney() && orderLogistics.getMileageMoney() > 0){
			lcf_chinese.text("GHS " + new BigDecimal(orderLogistics.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element lcf_chinese_div = document.getElementById("lcf_chinese_div");
			lcf_chinese_div.remove();
			}
			Element ddf_chinese = document.getElementById("ddf_chinese");
			if(null != orderLogistics.getWaitMoney() && orderLogistics.getWaitMoney() > 0){
			ddf_chinese.text("GHS " + new BigDecimal(orderLogistics.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element ddf_chinese_div = document.getElementById("ddf_chinese_div");
			ddf_chinese_div.remove();
			}
			Element glf_chinese = document.getElementById("glf_chinese");
			if(null != orderLogistics.getRoadTollMoney() && orderLogistics.getRoadTollMoney() > 0){
			glf_chinese.text("GHS " + new BigDecimal(orderLogistics.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element glf_chinese_div = document.getElementById("glf_chinese_div");
			glf_chinese_div.remove();
			}
			Element tcf_chinese = document.getElementById("tcf_chinese");
			if(null != orderLogistics.getParkMoney() && orderLogistics.getParkMoney() > 0){
			tcf_chinese.text("GHS " + new BigDecimal(orderLogistics.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element tcf_chinese_div = document.getElementById("tcf_chinese_div");
			tcf_chinese_div.remove();
			}
			Element bcj_chinese = document.getElementById("bcj_chinese");
			if(null != orderLogistics.getPriceDifference() && orderLogistics.getPriceDifference() > 0){
			bcj_chinese.text("GHS " + new BigDecimal(orderLogistics.getPriceDifference()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element bcj_chinese_div = document.getElementById("bcj_chinese_div");
			bcj_chinese_div.remove();
			}
			if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
			Element yhq_chinese = document.getElementById("yhq_chinese");
			yhq_chinese.text("GHS -" + new BigDecimal(orderLogistics.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
			@@ -1527,15 +2031,21 @@
			Element xj_chinese = document.getElementById("xj_chinese");
			xj_chinese.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element pay_type_chinese = document.getElementById("pay_type_chinese");
			pay_type_chinese.text(payTypeChinese);
			pay_type_chinese.text("现金");
			Element pay_money_chinese = document.getElementById("pay_money_chinese");
			pay_money_chinese.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element dispute_chinese = document.getElementById("dispute_chinese");
			if(null != orderLogistics.getIsDispute() && orderLogistics.getIsDispute() == 1){
			dispute_chinese.text("（注意: 争议订单，经过三方协商，平台最终定价为 GHS" + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN) + "）");
			}else{
			dispute_chinese.remove();
			}
			Element pdf_chinese = document.getElementById("pdf_chinese");
			pdf_chinese.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
			pdf_chinese.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
			Element lost_item_chinese = document.getElementById("lost_item_chinese");
			lost_item_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
			lost_item_chinese.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
			// Element track_chinese = document.getElementById("track_chinese");
			// track_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
			// track_chinese.attr("href", "https://igo.i-go.group/mailbox/user/location.html");
			Element pay_time_chinese = document.getElementById("pay_time_chinese");
			pay_time_chinese.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
			Elements driver_chinese = document.getElementsByClass("driver_chinese");
			@@ -1558,11 +2068,53 @@
			if(2 == language){
			document.getElementById("chinese").remove();
			document.getElementById("french").remove();
			document.getElementsByTag("title").get(0).text("Receipt");
			document.getElementsByTag("title").get(0).text("Delivery receipt");
			Element title_english = document.getElementById("title_english");
			title_english.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
			Element xcf_english = document.getElementById("xcf_english");
			xcf_english.text("GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element qbj_english = document.getElementById("qbj_english");
			qbj_english.text("GHS " + new BigDecimal(orderLogistics.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element scf_english = document.getElementById("scf_english");
			if(null != orderLogistics.getDurationMoney() && orderLogistics.getDurationMoney() > 0){
			scf_english.text("GHS " + new BigDecimal(orderLogistics.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element scf_english_div = document.getElementById("scf_english_div");
			scf_english_div.remove();
			}
			Element lcf_english = document.getElementById("lcf_english");
			if(null != orderLogistics.getMileageMoney() && orderLogistics.getMileageMoney() > 0){
			lcf_english.text("GHS " + new BigDecimal(orderLogistics.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element lcf_english_div = document.getElementById("lcf_english_div");
			lcf_english_div.remove();
			}
			Element ddf_english = document.getElementById("ddf_english");
			if(null != orderLogistics.getWaitMoney() && orderLogistics.getWaitMoney() > 0){
			ddf_english.text("GHS " + new BigDecimal(orderLogistics.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element ddf_english_div = document.getElementById("ddf_english_div");
			ddf_english_div.remove();
			}
			Element glf_english = document.getElementById("glf_english");
			if(null != orderLogistics.getRoadTollMoney() && orderLogistics.getRoadTollMoney() > 0){
			glf_english.text("GHS " + new BigDecimal(orderLogistics.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element glf_english_div = document.getElementById("glf_english_div");
			glf_english_div.remove();
			}
			Element tcf_english = document.getElementById("tcf_english");
			if(null != orderLogistics.getParkMoney() && orderLogistics.getParkMoney() > 0){
			tcf_english.text("GHS " + new BigDecimal(orderLogistics.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element tcf_english_div = document.getElementById("tcf_english_div");
			tcf_english_div.remove();
			}
			Element bcj_english = document.getElementById("bcj_english");
			if(null != orderLogistics.getPriceDifference() && orderLogistics.getPriceDifference() > 0){
			bcj_english.text("GHS " + new BigDecimal(orderLogistics.getPriceDifference()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element bcj_english_div = document.getElementById("bcj_english_div");
			bcj_english_div.remove();
			}
			if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
			Element yhq_english = document.getElementById("yhq_english");
			yhq_english.text("GHS -" + new BigDecimal(orderLogistics.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
			@@ -1587,15 +2139,21 @@
			Element xj_english = document.getElementById("xj_english");
			xj_english.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element pay_type_english = document.getElementById("pay_type_english");
			pay_type_english.text(payTypeEnglish);
			pay_type_english.text("Cash");
			Element pay_money_english = document.getElementById("pay_money_english");
			pay_money_english.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element dispute_english = document.getElementById("dispute_english");
			if(null != orderLogistics.getIsDispute() && orderLogistics.getIsDispute() == 1){
			dispute_english.text("（Note: Disputed order, after tripartite negotiation, the final pricing of the platform is GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN) + "）");
			}else{
			dispute_english.remove();
			}
			Element pdf_english = document.getElementById("pdf_english");
			pdf_english.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
			pdf_english.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
			Element lost_item_english = document.getElementById("lost_item_english");
			lost_item_english.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
			lost_item_english.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
			// Element track_english = document.getElementById("track_english");
			// track_english.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
			// track_english.attr("href", "https://igo.i-go.group/mailbox/user/location.html");
			Element pay_time_english = document.getElementById("pay_time_english");
			pay_time_english.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
			Elements driver_english = document.getElementsByClass("driver_english");
			@@ -1618,11 +2176,53 @@
			if(3 == language){
			document.getElementById("chinese").remove();
			document.getElementById("english").remove();
			document.getElementsByTag("title").get(0).text("Reçu");
			document.getElementsByTag("title").get(0).text("Reçu de livraison");
			Element title_french = document.getElementById("title_french");
			title_french.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande i-go1 le ");
			Element xcf_french = document.getElementById("xcf_french");
			xcf_french.text("GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
			title_french.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande I-GO ");
			Element qbj_french = document.getElementById("qbj_french");
			qbj_french.text("GHS " + new BigDecimal(orderLogistics.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element scf_french = document.getElementById("scf_french");
			if(null != orderLogistics.getDurationMoney() && orderLogistics.getDurationMoney() > 0){
			scf_french.text("GHS " + new BigDecimal(orderLogistics.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element scf_french_div = document.getElementById("scf_french_div");
			scf_french_div.remove();
			}
			Element lcf_french = document.getElementById("lcf_french");
			if(null != orderLogistics.getMileageMoney() && orderLogistics.getMileageMoney() > 0){
			lcf_french.text("GHS " + new BigDecimal(orderLogistics.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element lcf_french_div = document.getElementById("lcf_french_div");
			lcf_french_div.remove();
			}
			Element ddf_french = document.getElementById("ddf_french");
			if(null != orderLogistics.getWaitMoney() && orderLogistics.getWaitMoney() > 0){
			ddf_french.text("GHS " + new BigDecimal(orderLogistics.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element ddf_french_div = document.getElementById("ddf_french_div");
			ddf_french_div.remove();
			}
			Element glf_french = document.getElementById("glf_french");
			if(null != orderLogistics.getRoadTollMoney() && orderLogistics.getRoadTollMoney() > 0){
			glf_french.text("GHS " + new BigDecimal(orderLogistics.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element glf_french_div = document.getElementById("glf_french_div");
			glf_french_div.remove();
			}
			Element tcf_french = document.getElementById("tcf_french");
			if(null != orderLogistics.getParkMoney() && orderLogistics.getParkMoney() > 0){
			tcf_french.text("GHS " + new BigDecimal(orderLogistics.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element tcf_french_div = document.getElementById("tcf_french_div");
			tcf_french_div.remove();
			}
			Element bcj_french = document.getElementById("bcj_french");
			if(null != orderLogistics.getPriceDifference() && orderLogistics.getPriceDifference() > 0){
			bcj_french.text("GHS " + new BigDecimal(orderLogistics.getPriceDifference()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element bcj_french_div = document.getElementById("bcj_french_div");
			bcj_french_div.remove();
			}
			if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
			Element yhq_french = document.getElementById("yhq_french");
			yhq_french.text("GHS -" + new BigDecimal(orderLogistics.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
			@@ -1647,15 +2247,21 @@
			Element xj_french = document.getElementById("xj_french");
			xj_french.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element pay_type_french = document.getElementById("pay_type_french");
			pay_type_french.text(payTypeFrench);
			pay_type_french.text("En espèces");
			Element pay_money_french = document.getElementById("pay_money_french");
			pay_money_french.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element dispute_french = document.getElementById("dispute_french");
			if(null != orderLogistics.getIsDispute() && orderLogistics.getIsDispute() == 1){
			dispute_french.text("（Remarque: Il s’agit d’une commande contestée, et après des négociations entre trois parties, la plateforme l’a finalement tarifée à GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN) + "）");
			}else{
			dispute_french.remove();
			}
			Element pdf_french = document.getElementById("pdf_french");
			pdf_french.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
			pdf_french.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
			Element lost_item_french = document.getElementById("lost_item_french");
			lost_item_french.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
			lost_item_french.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
			// Element track_french = document.getElementById("track_french");
			// track_french.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
			// track_french.attr("href", "https://igo.i-go.group/mailbox/user/location.html");
			Element pay_time_french = document.getElementById("pay_time_french");
			pay_time_french.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
			Elements driver_french = document.getElementsByClass("driver_french");
			@@ -1676,14 +2282,14 @@
			server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
			}

			EmailUtil.send(userInfo.getEmail(), language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu", document.html());
			EmailUtil.send(userInfo.getEmail(), language == 1 ? "包裹收据" : language == 2 ? "Delivery receipt" : "Reçu de livraison", document.html());

			//开始生成pdf收据和html收据
			File file = new File("/usr/local/nginx/html/files/html/");
			File file = new File("/home/igotechgh/nginx/html/files/html/");
			if(!file.exists()){
			file.mkdirs();
			}
			file = new File("/usr/local/nginx/html/files/html/parcel_receipt_" + orderId + ".html");
			file = new File("/home/igotechgh/nginx/html/files/html/parcel_receipt_" + orderId + ".html");
			if(!file.exists()){
			file.createNewFile();
			}
			@@ -1692,28 +2298,28 @@
			fileWriter.flush();
			fileWriter.close();

			File file1 = new File("/usr/local/nginx/html/files/pdf/");
			File file1 = new File("/home/igotechgh/nginx/html/files/pdf/");
			if(!file1.exists()){
			file1.mkdirs();
			}
			file1 = new File("/usr/local/nginx/html/files/pdf/parcel_receipt_" + orderId + ".pdf");
			file1 = new File("/home/igotechgh/nginx/html/files/pdf/parcel_receipt_" + orderId + ".pdf");
			if(!file1.exists()){
			file1.createNewFile();
			}
			try{
			FileOutputStream fileOutputStream = new FileOutputStream(file1);
			HtmlToPdfUtils.convertToPdf("/usr/local/nginx/html/files/html/parcel_receipt_" + orderId + ".html", "I-GO", fileOutputStream);
			HtmlToPdfUtils.convertToPdf("/home/igotechgh/nginx/html/files/html/parcel_receipt_" + orderId + ".html", "I-GO", fileOutputStream);
			}catch (Exception e){
			e.printStackTrace();
			System.out.println("html转pdf异常");
			}

			String link ="http://182.160.16.251:81/files/html/parcel_receipt_" + orderId + ".html";
			String link ="https://igo.i-go.group/files/html/parcel_receipt_" + orderId + ".html";
			TEmail tEmail = new TEmail();
			tEmail.setLink(link);
			tEmail.setUserId(userInfo.getId());
			tEmail.setType(1);
			tEmail.setName(language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu");
			tEmail.setName(language == 1 ? "包裹收据" : language == 2 ? "Delivery receipt" : "Reçu de livraison");
			tEmail.setOrderId(orderId);
			tEmail.setCreateTime(new Date());
			int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
			@@ -1729,7 +2335,7 @@
			}
			}

			this.updateById(orderLogistics);
			this.updateAllColumnById(orderLogistics);
			return resultUtil;
			}

			@@ -1766,8 +2372,8 @@
			checkoutRequest.setRequestDescription("Travel completion payment");
			checkoutRequest.setCallbackUrl(callbackPath + "/base/wxPayOrderLogisticsSpread");
			checkoutRequest.setPendingRedirectUrl("");
			checkoutRequest.setSuccessRedirectUrl("http://182.160.16.251:81/payMoney/pages/success.html");
			checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html");
			checkoutRequest.setSuccessRedirectUrl("https://igo.i-go.group/payMoney/pages/success.html");
			checkoutRequest.setFailRedirectUrl("https://igo.i-go.group/payMoney/pages/fail.html");
			return TinggPayUtil.checkoutRequest(checkoutRequest);
			}
			if(payType == 2){//银行卡支付
			@@ -1785,8 +2391,8 @@
			checkoutRequest.setRequestDescription("Travel completion payment");
			checkoutRequest.setCallbackUrl(callbackPath + "/base/wxPayOrderLogisticsSpread");
			checkoutRequest.setPendingRedirectUrl("");
			checkoutRequest.setSuccessRedirectUrl("http://182.160.16.251:81/payMoney/pages/success.html");
			checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html");
			checkoutRequest.setSuccessRedirectUrl("https://igo.i-go.group/payMoney/pages/success.html");
			checkoutRequest.setFailRedirectUrl("https://igo.i-go.group/payMoney/pages/fail.html");
			return TinggPayUtil.checkoutRequest(checkoutRequest);
			}

			@@ -1842,8 +2448,8 @@
			new Thread(new Runnable() {
			@Override
			public void run() {
			pushUtil.pushOrderState(1, orderLogistics.getUserId(), orderLogistics.getId(), orderLogistics.getType(), orderLogistics.getState(), 0);
			pushUtil.pushOrderState(2, orderLogistics.getDriverId(), orderLogistics.getId(), orderLogistics.getType(), orderLogistics.getState(), 0);
			pushUtil.pushOrderState(1, orderLogistics.getUserId(), orderLogistics.getId(), orderLogistics.getType(), orderLogistics.getState(), 0, "");
			pushUtil.pushOrderState(2, orderLogistics.getDriverId(), orderLogistics.getId(), orderLogistics.getType(), orderLogistics.getState(), 0, "");
			}
			}).start();

			@@ -1900,8 +2506,8 @@
			new Thread(new Runnable() {
			@Override
			public void run() {
			pushUtil.pushOrderState(1, orderLogistics.getUserId(), orderLogistics.getId(), orderLogistics.getType(), orderLogistics.getState(), 0);
			pushUtil.pushOrderState(2, orderLogistics.getDriverId(), orderLogistics.getId(), orderLogistics.getType(), orderLogistics.getState(), 0);
			pushUtil.pushOrderState(1, orderLogistics.getUserId(), orderLogistics.getId(), orderLogistics.getType(), orderLogistics.getState(), 0, "");
			pushUtil.pushOrderState(2, orderLogistics.getDriverId(), orderLogistics.getId(), orderLogistics.getType(), orderLogistics.getState(), 0, "");
			}
			}).start();

			@@ -1941,31 +2547,39 @@
			userCouponRecord.setEndTime(new Date());
			userCouponRecordService.updateById(userCouponRecord);
			}
			if(null != orderLogistics.getRedPacketId()){
			JSONArray jsonArray = JSON.parseArray(orderLogistics.getRedPacketId());
			for (int i = 0; i < jsonArray.size(); i++) {
			JSONObject jsonObject = jsonArray.getJSONObject(i);
			Integer id1 = jsonObject.getInteger("id");
			Double money = jsonObject.getDouble("money");
			UserRedPacketRecord userRedPacketRecord = userRedPacketRecordService.selectById(id1);
			userRedPacketRecord.setRemainingAmount(userRedPacketRecord.getRemainingAmount() - money);
			if(0 == userRedPacketRecord.getRemainingAmount()){
			userRedPacketRecord.setState(2);
			userRedPacketRecord.setEndTime(new Date());
			}
			userRedPacketRecordService.updateById(userRedPacketRecord);
			}
			}

			query.setState(2);
			query.setCode(order_id);
			paymentRecordService.updateById(query);

			//添加已收入明细
			Company company = companyService.selectById(orderLogistics.getCompanyId());
			Double speMoney = company.getSpeMoney();
			BigDecimal d = null;//企业收入
			BigDecimal c = null;//司机收入
			if(company.getIsSpeFixedOrProportional() == 2){//固定
			d = new BigDecimal(speMoney);
			c = new BigDecimal(orderLogistics.getOrderMoney()).subtract(d);//只有出行金额参与抽成，其余归属司机
			}
			if(company.getIsSpeFixedOrProportional() == 1){//比例
			Double price = orderLogistics.getStartMoney() + orderLogistics.getMileageMoney() + orderLogistics.getWaitMoney() + orderLogistics.getDurationMoney() + orderLogistics.getLongDistanceMoney();
			d = new BigDecimal(price).multiply(new BigDecimal(speMoney).divide(new BigDecimal(100), new MathContext(2, RoundingMode.HALF_EVEN)));
			c = new BigDecimal(orderLogistics.getOrderMoney()).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
			}
			incomeService.saveData(1, orderLogistics.getCompanyId(), 2, orderLogistics.getId(), 4, d.doubleValue());
			incomeService.saveData(2, orderLogistics.getDriverId(), 2, orderLogistics.getId(), 4, c.doubleValue());
			Driver driver = driverService.selectById(orderLogistics.getDriverId());
			driver.setBusinessMoney(new BigDecimal(null != driver.getBusinessMoney() ? driver.getBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driver.setLaveBusinessMoney(new BigDecimal(null != driver.getLaveBusinessMoney() ? driver.getLaveBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driverService.updateById(driver);

			// TODO: 2020/5/24 这里需要给司机和用户推送订单状态
			new Thread(new Runnable() {
			@Override
			public void run() {
			pushUtil.pushOrderState(1, orderLogistics.getUserId(), orderLogistics.getId(), orderLogistics.getType(), orderLogistics.getState(), 0);
			pushUtil.pushOrderState(1, orderLogistics.getUserId(), orderLogistics.getId(), orderLogistics.getType(), orderLogistics.getState(), 0, "");
			pushUtil.pushOrderState(2, orderLogistics.getDriverId(), orderLogistics.getId(), orderLogistics.getType(), orderLogistics.getState(), 0, "");
			}
			}).start();

			@@ -1975,26 +2589,12 @@
			"Vous avez payé la commande de livraison avec succès, merci d’utiliser I-GO", orderLogistics.getUserId(), 1);

			language = userInfo.getLanguage();
			String payTypeChinese = "";
			String payTypeEnglish = "";
			String payTypeFrench = "";
			if(orderLogistics.getPayType() == 1){
			payTypeChinese = "手机支付";
			payTypeEnglish = "Mobile money";
			payTypeFrench = "Argent mobile";
			}
			if(orderLogistics.getPayType() == 2){
			payTypeChinese = "银行卡支付";
			payTypeEnglish = "Bank card";
			payTypeFrench = "Carte bancaire";
			}

			if(ToolUtil.isNotEmpty(userInfo.getEmail())){
			String path = templatePath + "user/receiptLogistics.html";
			Document document = Jsoup.parse(new File(path), "UTF-8");
			SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
			SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
			Driver driver = driverService.selectById(orderLogistics.getDriverId());
			driver = driverService.selectById(orderLogistics.getDriverId());
			Car car = carMapper.selectById(orderLogistics.getCarId());
			Double aDouble = 0D;
			if(null != orderLogistics.getDriverId()){
			@@ -2003,11 +2603,53 @@
			if(1 == language){
			document.getElementById("english").remove();
			document.getElementById("french").remove();
			document.getElementsByTag("title").get(0).text("I-GO电子收据");
			document.getElementsByTag("title").get(0).text("包裹收据");
			Element title_chinese = document.getElementById("title_chinese");
			title_chinese.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，您在I-GO此订单消费GHS " + orderLogistics.getPayMoney());
			Element xcf_chinese = document.getElementById("xcf_chinese");
			xcf_chinese.text("GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element qbj_chinese = document.getElementById("qbj_chinese");
			qbj_chinese.text("GHS " + new BigDecimal(orderLogistics.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element scf_chinese = document.getElementById("scf_chinese");
			if(null != orderLogistics.getDurationMoney() && orderLogistics.getDurationMoney() > 0){
			scf_chinese.text("GHS " + new BigDecimal(orderLogistics.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element scf_chinese_div = document.getElementById("scf_chinese_div");
			scf_chinese_div.remove();
			}
			Element lcf_chinese = document.getElementById("lcf_chinese");
			if(null != orderLogistics.getMileageMoney() && orderLogistics.getMileageMoney() > 0){
			lcf_chinese.text("GHS " + new BigDecimal(orderLogistics.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element lcf_chinese_div = document.getElementById("lcf_chinese_div");
			lcf_chinese_div.remove();
			}
			Element ddf_chinese = document.getElementById("ddf_chinese");
			if(null != orderLogistics.getWaitMoney() && orderLogistics.getWaitMoney() > 0){
			ddf_chinese.text("GHS " + new BigDecimal(orderLogistics.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element ddf_chinese_div = document.getElementById("ddf_chinese_div");
			ddf_chinese_div.remove();
			}
			Element glf_chinese = document.getElementById("glf_chinese");
			if(null != orderLogistics.getRoadTollMoney() && orderLogistics.getRoadTollMoney() > 0){
			glf_chinese.text("GHS " + new BigDecimal(orderLogistics.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element glf_chinese_div = document.getElementById("glf_chinese_div");
			glf_chinese_div.remove();
			}
			Element tcf_chinese = document.getElementById("tcf_chinese");
			if(null != orderLogistics.getParkMoney() && orderLogistics.getParkMoney() > 0){
			tcf_chinese.text("GHS " + new BigDecimal(orderLogistics.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element tcf_chinese_div = document.getElementById("tcf_chinese_div");
			tcf_chinese_div.remove();
			}
			Element bcj_chinese = document.getElementById("bcj_chinese");
			if(null != orderLogistics.getPriceDifference() && orderLogistics.getPriceDifference() > 0){
			bcj_chinese.text("GHS " + new BigDecimal(orderLogistics.getPriceDifference()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element bcj_chinese_div = document.getElementById("bcj_chinese_div");
			bcj_chinese_div.remove();
			}
			if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
			Element yhq_chinese = document.getElementById("yhq_chinese");
			yhq_chinese.text("GHS -" + new BigDecimal(orderLogistics.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
			@@ -2032,15 +2674,21 @@
			Element xj_chinese = document.getElementById("xj_chinese");
			xj_chinese.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element pay_type_chinese = document.getElementById("pay_type_chinese");
			pay_type_chinese.text(payTypeChinese);
			pay_type_chinese.text(orderLogistics.getPayType() == 1 ? "手机支付" : (orderLogistics.getPayType() == 2?"银行卡支付":(orderLogistics.getPayType() == 3?"余额支付":"现金支付")));
			Element pay_money_chinese = document.getElementById("pay_money_chinese");
			pay_money_chinese.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element dispute_chinese = document.getElementById("dispute_chinese");
			if(null != orderLogistics.getIsDispute() && orderLogistics.getIsDispute() == 1){
			dispute_chinese.text("（注意: 争议订单，经过三方协商，平台最终定价为 GHS" + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN) + "）");
			}else{
			dispute_chinese.remove();
			}
			Element pdf_chinese = document.getElementById("pdf_chinese");
			pdf_chinese.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + id + "&orderType=4");
			pdf_chinese.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + id + "&orderType=4");
			Element lost_item_chinese = document.getElementById("lost_item_chinese");
			lost_item_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + id + "&orderType=4");
			lost_item_chinese.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + id + "&orderType=4");
			// Element track_chinese = document.getElementById("track_chinese");
			// track_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
			// track_chinese.attr("href", "https://igo.i-go.group/mailbox/user/location.html");
			Element pay_time_chinese = document.getElementById("pay_time_chinese");
			pay_time_chinese.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
			Elements driver_chinese = document.getElementsByClass("driver_chinese");
			@@ -2063,11 +2711,53 @@
			if(2 == language){
			document.getElementById("chinese").remove();
			document.getElementById("french").remove();
			document.getElementsByTag("title").get(0).text("Receipt");
			document.getElementsByTag("title").get(0).text("Delivery receipt");
			Element title_english = document.getElementById("title_english");
			title_english.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
			Element xcf_english = document.getElementById("xcf_english");
			xcf_english.text("GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element qbj_english = document.getElementById("qbj_english");
			qbj_english.text("GHS " + new BigDecimal(orderLogistics.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element scf_english = document.getElementById("scf_english");
			if(null != orderLogistics.getDurationMoney() && orderLogistics.getDurationMoney() > 0){
			scf_english.text("GHS " + new BigDecimal(orderLogistics.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element scf_english_div = document.getElementById("scf_english_div");
			scf_english_div.remove();
			}
			Element lcf_english = document.getElementById("lcf_english");
			if(null != orderLogistics.getMileageMoney() && orderLogistics.getMileageMoney() > 0){
			lcf_english.text("GHS " + new BigDecimal(orderLogistics.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element lcf_english_div = document.getElementById("lcf_english_div");
			lcf_english_div.remove();
			}
			Element ddf_english = document.getElementById("ddf_english");
			if(null != orderLogistics.getWaitMoney() && orderLogistics.getWaitMoney() > 0){
			ddf_english.text("GHS " + new BigDecimal(orderLogistics.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element ddf_english_div = document.getElementById("ddf_english_div");
			ddf_english_div.remove();
			}
			Element glf_english = document.getElementById("glf_english");
			if(null != orderLogistics.getRoadTollMoney() && orderLogistics.getRoadTollMoney() > 0){
			glf_english.text("GHS " + new BigDecimal(orderLogistics.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element glf_english_div = document.getElementById("glf_english_div");
			glf_english_div.remove();
			}
			Element tcf_english = document.getElementById("tcf_english");
			if(null != orderLogistics.getParkMoney() && orderLogistics.getParkMoney() > 0){
			tcf_english.text("GHS " + new BigDecimal(orderLogistics.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element tcf_english_div = document.getElementById("tcf_english_div");
			tcf_english_div.remove();
			}
			Element bcj_english = document.getElementById("bcj_english");
			if(null != orderLogistics.getPriceDifference() && orderLogistics.getPriceDifference() > 0){
			bcj_english.text("GHS " + new BigDecimal(orderLogistics.getPriceDifference()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element bcj_english_div = document.getElementById("bcj_english_div");
			bcj_english_div.remove();
			}
			if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
			Element yhq_english = document.getElementById("yhq_english");
			yhq_english.text("GHS -" + new BigDecimal(orderLogistics.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
			@@ -2092,15 +2782,21 @@
			Element xj_english = document.getElementById("xj_english");
			xj_english.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element pay_type_english = document.getElementById("pay_type_english");
			pay_type_english.text(payTypeEnglish);
			pay_type_english.text(orderLogistics.getPayType() == 1 ? "Mobile money" :(orderLogistics.getPayType() == 2?"Bank card":(orderLogistics.getPayType() == 3?"I-GO Wallet":"Cash")));
			Element pay_money_english = document.getElementById("pay_money_english");
			pay_money_english.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element dispute_english = document.getElementById("dispute_english");
			if(null != orderLogistics.getIsDispute() && orderLogistics.getIsDispute() == 1){
			dispute_english.text("（Note: Disputed order, after tripartite negotiation, the final pricing of the platform is GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN) + "）");
			}else{
			dispute_english.remove();
			}
			Element pdf_english = document.getElementById("pdf_english");
			pdf_english.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + id + "&orderType=4");
			pdf_english.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + id + "&orderType=4");
			Element lost_item_english = document.getElementById("lost_item_english");
			lost_item_english.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + id + "&orderType=4");
			lost_item_english.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + id + "&orderType=4");
			// Element track_english = document.getElementById("track_english");
			// track_english.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
			// track_english.attr("href", "https://igo.i-go.group/mailbox/user/location.html");
			Element pay_time_english = document.getElementById("pay_time_english");
			pay_time_english.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
			Elements driver_english = document.getElementsByClass("driver_english");
			@@ -2123,11 +2819,53 @@
			if(3 == language){
			document.getElementById("chinese").remove();
			document.getElementById("english").remove();
			document.getElementsByTag("title").get(0).text("Reçu");
			document.getElementsByTag("title").get(0).text("Reçu de livraison");
			Element title_french = document.getElementById("title_french");
			title_french.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande i-go1 le ");
			Element xcf_french = document.getElementById("xcf_french");
			xcf_french.text("GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
			title_french.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande I-GO ");
			Element qbj_french = document.getElementById("qbj_french");
			qbj_french.text("GHS " + new BigDecimal(orderLogistics.getStartMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element scf_french = document.getElementById("scf_french");
			if(null != orderLogistics.getDurationMoney() && orderLogistics.getDurationMoney() > 0){
			scf_french.text("GHS " + new BigDecimal(orderLogistics.getDurationMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element scf_french_div = document.getElementById("scf_french_div");
			scf_french_div.remove();
			}
			Element lcf_french = document.getElementById("lcf_french");
			if(null != orderLogistics.getMileageMoney() && orderLogistics.getMileageMoney() > 0){
			lcf_french.text("GHS " + new BigDecimal(orderLogistics.getMileageMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element lcf_french_div = document.getElementById("lcf_french_div");
			lcf_french_div.remove();
			}
			Element ddf_french = document.getElementById("ddf_french");
			if(null != orderLogistics.getWaitMoney() && orderLogistics.getWaitMoney() > 0){
			ddf_french.text("GHS " + new BigDecimal(orderLogistics.getWaitMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element ddf_french_div = document.getElementById("ddf_french_div");
			ddf_french_div.remove();
			}
			Element glf_french = document.getElementById("glf_french");
			if(null != orderLogistics.getRoadTollMoney() && orderLogistics.getRoadTollMoney() > 0){
			glf_french.text("GHS " + new BigDecimal(orderLogistics.getRoadTollMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element glf_french_div = document.getElementById("glf_french_div");
			glf_french_div.remove();
			}
			Element tcf_french = document.getElementById("tcf_french");
			if(null != orderLogistics.getParkMoney() && orderLogistics.getParkMoney() > 0){
			tcf_french.text("GHS " + new BigDecimal(orderLogistics.getParkMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element tcf_french_div = document.getElementById("tcf_french_div");
			tcf_french_div.remove();
			}
			Element bcj_french = document.getElementById("bcj_french");
			if(null != orderLogistics.getPriceDifference() && orderLogistics.getPriceDifference() > 0){
			bcj_french.text("GHS " + new BigDecimal(orderLogistics.getPriceDifference()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element bcj_french_div = document.getElementById("bcj_french_div");
			bcj_french_div.remove();
			}
			if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
			Element yhq_french = document.getElementById("yhq_french");
			yhq_french.text("GHS -" + new BigDecimal(orderLogistics.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
			@@ -2152,15 +2890,21 @@
			Element xj_french = document.getElementById("xj_french");
			xj_french.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element pay_type_french = document.getElementById("pay_type_french");
			pay_type_french.text(payTypeFrench);
			pay_type_french.text(orderLogistics.getPayType() == 1 ? "Argent mobile" : (orderLogistics.getPayType() == 2?"Carte bancaire":(orderLogistics.getPayType() == 3?"Portefeuille I-GO":"En espèces")));
			Element pay_money_french = document.getElementById("pay_money_french");
			pay_money_french.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element dispute_french = document.getElementById("dispute_french");
			if(null != orderLogistics.getIsDispute() && orderLogistics.getIsDispute() == 1){
			dispute_french.text("（Remarque: Il s’agit d’une commande contestée, et après des négociations entre trois parties, la plateforme l’a finalement tarifée à GHS " + new BigDecimal(orderLogistics.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN) + "）");
			}else{
			dispute_french.remove();
			}
			Element pdf_french = document.getElementById("pdf_french");
			pdf_french.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + id + "&orderType=4");
			pdf_french.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + id + "&orderType=4");
			Element lost_item_french = document.getElementById("lost_item_french");
			lost_item_french.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + id + "&orderType=4");
			lost_item_french.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + id + "&orderType=4");
			// Element track_french = document.getElementById("track_french");
			// track_french.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
			// track_french.attr("href", "https://igo.i-go.group/mailbox/user/location.html");
			Element pay_time_french = document.getElementById("pay_time_french");
			pay_time_french.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
			Elements driver_french = document.getElementsByClass("driver_french");
			@@ -2181,14 +2925,14 @@
			server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
			}

			EmailUtil.send(userInfo.getEmail(), language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu", document.html());
			EmailUtil.send(userInfo.getEmail(), language == 1 ? "包裹收据" : language == 2 ? "Delivery receipt" : "Reçu de livraison", document.html());

			//开始生成pdf收据和html收据
			File file = new File("/usr/local/nginx/html/files/html/");
			File file = new File("/home/igotechgh/nginx/html/files/html/");
			if(!file.exists()){
			file.mkdirs();
			}
			file = new File("/usr/local/nginx/html/files/html/parcel_receipt_" + id + ".html");
			file = new File("/home/igotechgh/nginx/html/files/html/parcel_receipt_" + id + ".html");
			if(!file.exists()){
			file.createNewFile();
			}
			@@ -2197,28 +2941,28 @@
			fileWriter.flush();
			fileWriter.close();

			File file1 = new File("/usr/local/nginx/html/files/pdf/");
			File file1 = new File("/home/igotechgh/nginx/html/files/pdf/");
			if(!file1.exists()){
			file1.mkdirs();
			}
			file1 = new File("/usr/local/nginx/html/files/pdf/parcel_receipt_" + id + ".pdf");
			file1 = new File("/home/igotechgh/nginx/html/files/pdf/parcel_receipt_" + id + ".pdf");
			if(!file1.exists()){
			file1.createNewFile();
			}
			try{
			FileOutputStream fileOutputStream = new FileOutputStream(file1);
			HtmlToPdfUtils.convertToPdf("/usr/local/nginx/html/files/html/parcel_receipt_" + id + ".html", "I-GO", fileOutputStream);
			HtmlToPdfUtils.convertToPdf("/home/igotechgh/nginx/html/files/html/parcel_receipt_" + id + ".html", "I-GO", fileOutputStream);
			}catch (Exception e){
			e.printStackTrace();
			System.out.println("html转pdf异常");
			}

			String link ="http://182.160.16.251:81/files/html/parcel_receipt_" + id + ".html";
			String link ="https://igo.i-go.group/files/html/parcel_receipt_" + id + ".html";
			TEmail tEmail = new TEmail();
			tEmail.setLink(link);
			tEmail.setUserId(userInfo.getId());
			tEmail.setType(1);
			tEmail.setName(language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu");
			tEmail.setName(language == 1 ? "包裹收据" : language == 2 ? "Delivery receipt" : "Reçu de livraison");
			tEmail.setOrderId(id);
			tEmail.setCreateTime(new Date());
			int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
			@@ -2297,8 +3041,8 @@
			new Thread(new Runnable() {
			@Override
			public void run() {
			pushUtil.pushOrderState(1, orderLogistics.getUserId(), orderLogistics.getId(), orderLogistics.getType(), orderLogistics.getState(), 0);
			pushUtil.pushOrderState(2, orderLogistics.getDriverId(), orderLogistics.getId(), orderLogistics.getType(), orderLogistics.getState(), 0);
			pushUtil.pushOrderState(1, orderLogistics.getUserId(), orderLogistics.getId(), orderLogistics.getType(), orderLogistics.getState(), 0, "");
			pushUtil.pushOrderState(2, orderLogistics.getDriverId(), orderLogistics.getId(), orderLogistics.getType(), orderLogistics.getState(), 0, "");
			}
			}).start();

			@@ -2350,14 +3094,44 @@
			Integer orderId = Integer.valueOf(String.valueOf(map.get("orderId")));
			Integer state = Integer.valueOf(String.valueOf(map.get("state")));
			if(state == 6){
			map.put("receipt", "http://182.160.16.251:81/files/html/parcel_receipt_" + orderId + ".html");
			map.put("receipt", "https://igo.i-go.group/files/html/parcel_receipt_" + orderId + ".html");
			}else{
			map.put("receipt", "");
			}
			if(state == 7){
			Double discountMoney = Double.valueOf(map.get("discountMoney").toString());
			Double discountMoney = 0D;
			OrderLogistics orderLogistics = this.selectById(orderId);
			UserActivityDiscount1 query2 = userActivityDiscount1Mapper.query(Integer.valueOf(String.valueOf(map.get("companyId"))));
			if(null != query2){
			Integer orderNum=this.selectCount(new EntityWrapper<OrderLogistics>().eq("userId",orderLogistics.getUserId()).eq("activityId",query2.getId()).last(" and to_days(getoffTime) = to_days(now())"));
			if(query2.getDistance()*1000>orderLogistics.getMileage() && query2.getOrderNum()>orderNum){
			Double special = query2.getLogistics();
			Double orderMoney = orderLogistics.getOrderMoney();
			double v = new BigDecimal(orderMoney).multiply(new BigDecimal(special / 10)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
			if(orderMoney.compareTo(v) > 0){
			discountMoney = orderMoney - v;
			}
			}

			}
			Double orderMoney = Double.valueOf(map.get("orderMoney").toString());
			map.put("orderMoney", orderMoney - discountMoney);
			}

			OrderLogistics orderLogistics = this.selectById(orderId);
			map.put("driverTimeOutTime", 0);
			map.put("driverTimeOut", 0);
			if(null != orderLogistics.getEstimateArriveTime()){
			CancleOrder cancleOrder = cancleOrderService.selectOne(new EntityWrapper<CancleOrder>().eq("companyId", orderLogistics.getCompanyId()));
			JSONObject jsonObject = JSON.parseObject(cancleOrder.getContent());
			int driverTimeout1 = jsonObject.getIntValue("driverTimeout");
			long time = orderLogistics.getEstimateArriveTime().getTime() + driverTimeout1 * 60000;
			if(System.currentTimeMillis() > time){
			Integer driverTimeOutTime = Double.valueOf((System.currentTimeMillis() - time) / 60000).intValue();
			driverTimeOutTime = driverTimeOutTime == 0 ? 1 : driverTimeOutTime;
			map.put("driverTimeOutTime", driverTimeOutTime);
			map.put("driverTimeOut", 1);
			}
			}
			}
			return maps;
			@@ -2416,7 +3190,7 @@
			if(null == orderLogistics){
			return ResultUtil.error(language == 1 ? "取消订单失败，订单信息有误" : language == 2 ? "Failed to cancel order, order-information error." : "Échec de l’annulation de la commande, erreur d’information de commande.");
			}
			if(orderLogistics.getState() > 5 && orderLogistics.getState() != 11){
			if(orderLogistics.getState() > 5 && orderLogistics.getState() != 11 && orderLogistics.getState() != 12){
			return ResultUtil.error(language == 1 ? "取消订单失败，不合法的操作" : language == 2 ? "Failed to cancel order, illegal operation." : "Échec de l’annulation de la commande, opération illégale.");
			}

			@@ -2456,20 +3230,47 @@
			integer = orderCancelService.saveData(id, 4, reason, remark, null, amount, 1, 1, uid);
			}
			this.deleteTask(id);//删除定时任务



			//修改司机为空闲
			Driver driver = driverService.selectById(orderLogistics.getDriverId());
			new Thread(new Runnable() {
			@Override
			public void run() {
			pushUtil.pushOrderState(2, orderLogistics.getDriverId(), orderLogistics.getId(), 4, orderLogistics.getState(), 0);
			Integer language1 = driver.getLanguage();
			String audioUrl = "";
			switch (language1){
			case 1:
			audioUrl = "https://igo.i-go.group/files/audio/system/UserCancelledOrder-CN.mp3";
			break;
			case 2:
			audioUrl = "https://igo.i-go.group/files/audio/system/UserCancelledOrder-EN.mp3";
			break;
			case 3:
			audioUrl = "https://igo.i-go.group/files/audio/system/UserCancelledOrder-FR.mp3";
			break;
			}
			pushUtil.pushOrderState(1, orderLogistics.getUserId(), orderLogistics.getId(), 4, orderLogistics.getState(), 0, "");
			pushUtil.pushOrderState(2, orderLogistics.getDriverId(), orderLogistics.getId(), 4, orderLogistics.getState() == 12 ? orderLogistics.getState() : 10, 0, audioUrl);
			}
			}).start();

			//修改司机为空闲
			Driver driver = driverService.selectById(orderLogistics.getDriverId());
			driver.setState(2);
			driverService.updateById(driver);
			}


			if(orderLogistics.getState() == 10 \|\| orderLogistics.getState() == 12){
			//修改行程信息
			boolean updateTrip = fleetEngineUtil.updateTrip("CANCELED", null, null, orderLogistics.getTripId(), null, null, null, null);
			if(!updateTrip){
			for (int i = 0; i < 5; i++) {
			updateTrip = fleetEngineUtil.updateTrip("CANCELED", null, null, orderLogistics.getTripId(), null, null, null, null);
			if(updateTrip){
			break;
			}
			Thread.sleep(3000L);
			}
			}
			}
			//添加消息
			systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功取消包裹订单，谢谢使用！" : language == 2 ? "You've cancelled the delivery order successfully, thank you for using I-GO "
			: "Vous avez annulé la commande de livraison avec succès, merci d’utiliser I-GO", orderLogistics.getUserId(), 1);
			@@ -2561,6 +3362,11 @@
			if(state == 11){
			map.put("state", map.get("oldState"));
			}
			if(state == 12){
			OrderCancel query = orderCancelService.query(orderId, 4, null, null, 1);
			map.put("cancelPayMoney", null == query ? 0 : query.getMoney());
			map.put("cancelMoney", null == query ? 0 : query.getMoney());
			}
			if(Integer.valueOf(String.valueOf(map.get("state"))) != 8 && Integer.valueOf(String.valueOf(map.get("state"))) != 9){
			map.put("redPacketMoney", null);
			map.put("couponMoney", null);
			@@ -2570,7 +3376,8 @@
			if(null != query2){
			Integer orderNum=this.selectCount(new EntityWrapper<OrderLogistics>().eq("userId",orderLogistics.getUserId()).eq("activityId",query2.getId()).last(" and to_days(getoffTime) = to_days(now())"));
			if(query2.getDistance()*1000>orderLogistics.getMileage() && query2.getOrderNum()>orderNum){
			Double special = query2.getSpecial();
			Double special = query2.getLogistics();
			map.put("discount", special);
			orderLogistics.setDiscount(special);
			Double orderMoney = orderLogistics.getOrderMoney();
			double v = new BigDecimal(orderMoney).multiply(new BigDecimal(special / 10)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
			@@ -2581,16 +3388,12 @@

			}
			}
			Map<String, String> geocode = gdMapGeocodingUtil.geocode(map.get("startLon").toString(), map.get("startLat").toString());
			map.put("startCity", geocode.get("city"));
			geocode = gdMapGeocodingUtil.geocode(map.get("endLon").toString(), map.get("endLat").toString());
			map.put("endCity", geocode.get("city"));

			String driverId = redisUtil.getValue("DEVICE_" + map.get("driverId"));
			map.put("device", ToolUtil.isNotEmpty(driverId) ? 2 : 1);
			map.put("orderType", orderLogistics.getType());
			if(state == 6){
			map.put("receipt", "http://182.160.16.251:81/files/html/parcel_receipt_" + orderId + ".html");
			if(state == 8 \|\| state == 9){
			map.put("receipt", "https://igo.i-go.group/files/html/parcel_receipt_" + orderId + ".html");
			}else{
			map.put("receipt", "");
			}
			@@ -2598,9 +3401,21 @@
			if(null != map.get("driverId")){
			companyId = Integer.valueOf(String.valueOf(map.get("companyId")));
			}
			CancleOrder cancleOrder = cancleOrderService.selectOne(new EntityWrapper<CancleOrder>().eq("companyId", companyId));
			JSONObject jsonObject = JSON.parseObject(cancleOrder.getContent());
			map.put("timeOutCancel", jsonObject.getIntValue("driverTimeout"));
			map.put("driverTimeOutTime", 0);
			map.put("driverTimeOut", 0);
			if(null != orderLogistics.getEstimateArriveTime()){
			CancleOrder cancleOrder = cancleOrderService.selectOne(new EntityWrapper<CancleOrder>().eq("companyId", companyId));
			JSONObject jsonObject = JSON.parseObject(cancleOrder.getContent());
			int driverTimeout1 = jsonObject.getIntValue("driverTimeout");
			long time = orderLogistics.getEstimateArriveTime().getTime() + driverTimeout1 * 60000;
			if(System.currentTimeMillis() > time){
			Integer driverTimeOutTime = Double.valueOf((System.currentTimeMillis() - time) / 60000).intValue();
			driverTimeOutTime = driverTimeOutTime == 0 ? 1 : driverTimeOutTime;
			map.put("driverTimeOutTime", driverTimeOutTime);
			map.put("driverTimeOut", 1);
			}
			}
			map.put("isDispute", orderLogistics.getIsDispute());
			return map;
			}

			@@ -2613,8 +3428,19 @@
			@Override
			public List<Map<String, Object>> queryCoupon(Integer language, Integer orderId, Integer uid, Integer pageNum, Integer size) throws Exception {
			OrderLogistics orderLogistics = this.selectById(orderId);
			List<Map<String, Object>> list = userCouponRecordService.queryCoupon(language, uid, orderLogistics.getCompanyId(), 1, 4, orderLogistics.getOrderMoney() - orderLogistics.getDiscountMoney(), pageNum, size);
			List<Map<String, Object>> list1 = userCouponRecordService.queryCoupon(language, uid, orderLogistics.getCompanyId(), 1, 0, orderLogistics.getOrderMoney() - orderLogistics.getDiscountMoney(), pageNum, size);
			UserActivityDiscount1 query2 = userActivityDiscount1Mapper.query(orderLogistics.getCompanyId());
			double v = orderLogistics.getOrderMoney();
			if(null != query2){
			Integer orderNum=this.selectCount(new EntityWrapper<OrderLogistics>().eq("userId",orderLogistics.getUserId()).eq("activityId",query2.getId()).last(" and to_days(getoffTime) = to_days(now())"));
			if(query2.getDistance()*1000>orderLogistics.getMileage() && query2.getOrderNum()>orderNum){
			Double special = query2.getLogistics();
			orderLogistics.setDiscount(special);
			Double orderMoney = orderLogistics.getOrderMoney();
			v = new BigDecimal(orderMoney).multiply(new BigDecimal(special / 10)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
			}
			}
			List<Map<String, Object>> list = userCouponRecordService.queryCoupon(language, uid, orderLogistics.getCompanyId(), 1, 4, v, pageNum, size);
			List<Map<String, Object>> list1 = userCouponRecordService.queryCoupon(language, uid, orderLogistics.getCompanyId(), 1, 0, v, pageNum, size);
			list.addAll(list1);
			return list;
			}
			@@ -2637,32 +3463,33 @@
			BaseWarpper baseWarpper = new BaseWarpper();
			double amount = 0;
			CancleOrder query = cancleOrderService.query(orderLogistics.getCompanyId());
			if(null == query \|\| null == orderLogistics.getDriverId()){
			if(null == query \|\| null == orderLogistics.getDriverId() \|\| orderLogistics.getState() == 11){
			baseWarpper.setAmount(amount);
			return ResultUtil.success(baseWarpper);
			}
			JSONObject object = JSON.parseObject(query.getContent());
			long t = object.getInteger("driverTimeout") * 60000L;
			//司机超时未到达起点，免费取消
			if(orderLogistics.getState() < 3 && orderLogistics.getSnatchOrderTime().getTime() + t < System.currentTimeMillis()){
			if(orderLogistics.getState() <= 3 && orderLogistics.getEstimateArriveTime().getTime() + t <= System.currentTimeMillis()){
			baseWarpper.setAmount(amount);
			return ResultUtil.success(baseWarpper);
			}

			JSONObject order = object.getJSONObject("order");
			long m = order.getInteger("orderAcceptanceTime") * 60000L;
			//超过免费时间，计算费用
			if(orderLogistics.getSnatchOrderTime().getTime() + m < System.currentTimeMillis()){
			BigDecimal money = order.getBigDecimal("money");
			if(null != orderLogistics.getSetOutTime()){
			//非服务中且未超时
			if(orderLogistics.getState() != 5){
			JSONObject order = object.getJSONObject("order");
			long m = order.getInteger("orderAcceptanceTime") * 60000L;
			//超过免费时间，且没有超时，计算费用
			if(orderLogistics.getSnatchOrderTime().getTime() + m < System.currentTimeMillis() && orderLogistics.getEstimateArriveTime().getTime() + t > System.currentTimeMillis()){
			BigDecimal money = order.getBigDecimal("money");
			//里程费
			BigDecimal mileageFee = order.getBigDecimal("mileageFee").multiply(new BigDecimal(orderLogistics.getMileage() / 1000));
			BigDecimal mileageFee = order.getBigDecimal("mileageFee").multiply(new BigDecimal(orderLogistics.getToStartPointMileage() / 1000));
			//时长费
			int s = Double.valueOf((System.currentTimeMillis() - orderLogistics.getSetOutTime().getTime()) / 60000).intValue();
			int s = Double.valueOf((System.currentTimeMillis() - orderLogistics.getSnatchOrderTime().getTime()) / 60000).intValue();
			BigDecimal durationFee = order.getBigDecimal("durationFee").multiply(new BigDecimal(s));
			money = money.add(durationFee).add(mileageFee);
			amount = money.setScale(2, RoundingMode.HALF_EVEN).doubleValue();
			}
			amount = money.setScale(2, RoundingMode.HALF_EVEN).doubleValue();
			}
			baseWarpper.setAmount(amount);
			return ResultUtil.success(baseWarpper);
			@@ -2703,14 +3530,11 @@
			@Override
			public ResultUtil cancleOrderPrivateCar(Integer id, Integer payType, Integer bankCardId, Integer cancleId, Integer type, Integer language) throws Exception {
			OrderLogistics orderLogistics = this.selectById(id);
			Integer uid = orderLogistics.getUserId();
			UserInfo userInfo = userInfoService.selectById(uid);
			ResultUtil resultUtil = ResultUtil.success("");

			if(null == orderLogistics){
			return ResultUtil.error(language == 1 ? "取消订单失败，订单信息有误" : language == 2 ? "Failed to cancel order, order-information error." : "Échec de l’annulation de la commande, erreur d’information de commande.", "");
			}
			if(orderLogistics.getState() != 13){
			if(orderLogistics.getState() != 12){
			return ResultUtil.error(language == 1 ? "取消订单失败，不合法的操作" : language == 2 ? "Failed to cancel order, illegal operation." : "Échec de l’annulation de la commande, opération illégale.", "");
			}
			OrderCancel orderCancel = null;
			@@ -2719,8 +3543,10 @@
			}else{
			orderCancel = orderCancelService.selectById(cancleId);
			}

			Double amount = queryCancleAmount(id, language).getData().getAmount();

			Integer uid = orderLogistics.getUserId();
			UserInfo userInfo = userInfoService.selectById(uid);
			Double amount = orderCancel.getMoney();
			if(0 < amount){
			if(payType == 1){//手机支付
			orderCancel.setPayType(1);
			@@ -2738,8 +3564,8 @@
			checkoutRequest.setRequestDescription("Cancel a trip");
			checkoutRequest.setCallbackUrl(callbackPath + "/base/wxCancelOrderTaxi");
			checkoutRequest.setPendingRedirectUrl("");
			checkoutRequest.setSuccessRedirectUrl("http://182.160.16.251:81/payMoney/pages/success.html");
			checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html");
			checkoutRequest.setSuccessRedirectUrl("https://igo.i-go.group/payMoney/pages/success.html");
			checkoutRequest.setFailRedirectUrl("https://igo.i-go.group/payMoney/pages/fail.html");
			resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest);
			if(resultUtil.getCode()==200){
			paymentRecordService.saveData(1, null, null, id, 4, 1, amount, null, 1);//添加预支付数据
			@@ -2763,8 +3589,8 @@
			checkoutRequest.setRequestDescription("Cancel a trip");
			checkoutRequest.setCallbackUrl(callbackPath + "/base/wxCancelOrderTaxi");
			checkoutRequest.setPendingRedirectUrl("");
			checkoutRequest.setSuccessRedirectUrl("http://182.160.16.251:81/payMoney/pages/success.html");
			checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html");
			checkoutRequest.setSuccessRedirectUrl("https://igo.i-go.group/payMoney/pages/success.html");
			checkoutRequest.setFailRedirectUrl("https://igo.i-go.group/payMoney/pages/fail.html");
			resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest);
			if(resultUtil.getCode()==200){
			paymentRecordService.saveData(1, null, null, id, 4, 2, amount, null, 1);//添加预支付数据
			@@ -2800,18 +3626,35 @@
			orderCancelService.updateById(orderCancel);

			if(null != orderLogistics.getDriverId()){
			BigDecimal c =new BigDecimal(amount);//司机收入
			incomeService.saveData(2, orderLogistics.getDriverId(), 3, orderLogistics.getId(), 4, c.doubleValue());
			Driver driver = driverService.selectById(orderLogistics.getDriverId());
			driver.setBusinessMoney(new BigDecimal(null != driver.getBusinessMoney() ? driver.getBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driver.setLaveBusinessMoney(new BigDecimal(null != driver.getLaveBusinessMoney() ? driver.getLaveBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driverService.updateById(driver);
			//添加已收入明细
			Company company = companyService.selectById(orderLogistics.getCompanyId());
			Double speMoney = company.getSameLogisticsMoney();
			BigDecimal d = null;//企业收入
			BigDecimal c = null;//司机收入
			if(company.getIsSpeFixedOrProportional() == 2){//固定
			d = new BigDecimal(speMoney);
			c = new BigDecimal(amount).subtract(d);//只有出行金额参与抽成，其余归属司机
			}
			if(company.getIsSpeFixedOrProportional() == 1){//比例
			d = new BigDecimal(amount).multiply(new BigDecimal(speMoney).divide(new BigDecimal(100), new MathContext(2, RoundingMode.HALF_EVEN)));
			c = new BigDecimal(amount).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
			}
			incomeService.saveData(1, orderLogistics.getCompanyId(), 3, orderLogistics.getId(), 4, d.doubleValue());
			if(c.doubleValue() > 0){
			incomeService.saveData(2, orderLogistics.getDriverId(), 3, orderLogistics.getId(), 4, c.doubleValue());
			Driver driver = driverService.selectById(orderLogistics.getDriverId());
			driver.setBusinessMoney(new BigDecimal(null != driver.getBusinessMoney() ? driver.getBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driver.setLaveBusinessMoney(new BigDecimal(null != driver.getLaveBusinessMoney() ? driver.getLaveBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driverService.updateById(driver);
			}

			this.deleteTask(id);//删除定时任务
			pushUtil.pushOrderState(2, orderLogistics.getDriverId(), orderLogistics.getId(), 4, orderLogistics.getState(), 0);
			pushUtil.pushOrderState(2, orderLogistics.getDriverId(), orderLogistics.getId(), 4, orderLogistics.getState(), 0, "");
			}else{
			incomeService.saveData(1, orderLogistics.getCompanyId(), 3, orderLogistics.getId(), 4, amount.doubleValue());
			}
			pushUtil.pushOrderState(1, orderLogistics.getUserId(), orderLogistics.getId(), 4, orderLogistics.getState(), 0);
			pushUtil.pushOrderState(1, orderLogistics.getUserId(), orderLogistics.getId(), 4, orderLogistics.getState(), 0, "");


			//添加消息
			@@ -2861,21 +3704,38 @@
			query1.setState(2);
			orderCancelService.updateById(query1);
			}



			Double amount = query.getAmount();
			if(null != orderLogistics.getDriverId()){
			BigDecimal c =new BigDecimal(query.getAmount());//司机收入
			incomeService.saveData(2, orderLogistics.getDriverId(), 3, orderLogistics.getId(), 4, c.doubleValue());
			Driver driver = driverService.selectById(orderLogistics.getDriverId());
			driver.setBusinessMoney(new BigDecimal(null != driver.getBusinessMoney() ? driver.getBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driver.setLaveBusinessMoney(new BigDecimal(null != driver.getLaveBusinessMoney() ? driver.getLaveBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driverService.updateById(driver);
			//添加已收入明细
			Company company = companyService.selectById(orderLogistics.getCompanyId());
			Double speMoney = company.getSameLogisticsMoney();
			BigDecimal d = null;//企业收入
			BigDecimal c = null;//司机收入
			if(company.getIsSpeFixedOrProportional() == 2){//固定
			d = new BigDecimal(speMoney);
			c = new BigDecimal(amount).subtract(d);//只有出行金额参与抽成，其余归属司机
			}
			if(company.getIsSpeFixedOrProportional() == 1){//比例
			d = new BigDecimal(amount).multiply(new BigDecimal(speMoney).divide(new BigDecimal(100), new MathContext(2, RoundingMode.HALF_EVEN)));
			c = new BigDecimal(amount).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
			}
			incomeService.saveData(1, orderLogistics.getCompanyId(), 3, orderLogistics.getId(), 4, d.doubleValue());
			if(c.doubleValue() > 0){
			incomeService.saveData(2, orderLogistics.getDriverId(), 3, orderLogistics.getId(), 4, c.doubleValue());
			Driver driver = driverService.selectById(orderLogistics.getDriverId());
			driver.setBusinessMoney(new BigDecimal(null != driver.getBusinessMoney() ? driver.getBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driver.setLaveBusinessMoney(new BigDecimal(null != driver.getLaveBusinessMoney() ? driver.getLaveBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driverService.updateById(driver);
			}
			this.deleteTask(orderLogistics.getId());//删除定时任务

			pushUtil.pushOrderState(2, orderLogistics.getDriverId(), orderLogistics.getId(), 4, orderLogistics.getState(), 0);
			pushUtil.pushOrderState(2, orderLogistics.getDriverId(), orderLogistics.getId(), 4, orderLogistics.getState(), 0, "");
			}else{
			incomeService.saveData(1, orderLogistics.getCompanyId(), 3, orderLogistics.getId(), 4, amount.doubleValue());
			}
			pushUtil.pushOrderState(1, orderLogistics.getUserId(), orderLogistics.getId(), 4, orderLogistics.getState(), 0);
			pushUtil.pushOrderState(1, orderLogistics.getUserId(), orderLogistics.getId(), 4, orderLogistics.getState(), 0, "");

			//添加消息
			systemNoticeService.addSystemNotice(1, language == 1 ? "您已使用余额成功支付取消订单费用，谢谢使用！" : language == 2
			@@ -2902,7 +3762,22 @@
			orderLogistics.setDestinationLat(endLat);
			orderLogistics.setDestinationLon(endLon);
			this.updateById(orderLogistics);
			pushUtil.pushModifyAddress(2, orderLogistics.getDriverId(), orderId, 1, 1);

			Driver driver = driverService.selectById(orderLogistics.getDriverId());
			Integer language1 = driver.getLanguage();
			String audioUrl = "";
			switch (language1){
			case 1:
			audioUrl = "https://igo.i-go.group/files/audio/system/ChangeAddress-CN.mp3";
			break;
			case 2:
			audioUrl = "https://igo.i-go.group/files/audio/system/ChangeAddress-EN.mp3";
			break;
			case 3:
			audioUrl = "https://igo.i-go.group/files/audio/system/ChangeAddress-FR.mp3";
			break;
			}
			pushUtil.pushModifyAddress(2, orderLogistics.getDriverId(), orderId, 4, 1, audioUrl);
			}else{
			orderLogistics.setEndAddress(endAddress);
			orderLogistics.setEndLat(Double.valueOf(endLat));
			@@ -2944,9 +3819,6 @@
			UserRedPacketRecord userRedPacketRecord = new UserRedPacketRecord();
			userRedPacketRecord.setMoney(money);
			userRedPacketRecord.setRemainingAmount(money);
			Calendar calendar = Calendar.getInstance();
			calendar.setTime(new Date());
			calendar.set(Calendar.DAY_OF_MONTH, calendar.get(Calendar.DAY_OF_MONTH) + Integer.valueOf(String.valueOf(query.get("effective"))));
			userRedPacketRecord.setInsertTime(new Date());
			userRedPacketRecord.setCompanyId(Integer.valueOf(String.valueOf(query.get("companyId"))));
			userRedPacketRecord.setState(0);
			@@ -2999,7 +3871,7 @@
			Element user_chinese = document.getElementById("user_chinese");
			user_chinese.text("您好 " + userInfo.getNickName() + "，");
			Element time_chinese = document.getElementById("time_chinese");
			time_chinese.text("此活动有效期在 " + DateUtil.conversionFormat(language, sdf.format(id.getStartTime())) + " 至 " + DateUtil.conversionFormat(language, sdf.format(id.getEnable())) + "，详情请查看I-GO平台");
			time_chinese.text("此活动有效期在 " + DateUtil.conversionFormat(language, sdf.format(id.getStartTime())) + " 至 " + DateUtil.conversionFormat(language, sdf.format(id.getEndTime())) + "，详情请查看I-GO平台");
			}
			if(2 == language){
			document.getElementById("chinese").remove();
			@@ -3008,7 +3880,7 @@
			Element user_english = document.getElementById("user_english");
			user_english.text("Hello " + userInfo.getNickName() + "，");
			Element time_english = document.getElementById("time_english");
			time_english.text("You could use it from " + DateUtil.conversionFormat(language, sdf.format(id.getStartTime())) + " to " + DateUtil.conversionFormat(language, sdf.format(id.getEnable())) + "，check more details on the app.");
			time_english.text("You could use it from " + DateUtil.conversionFormat(language, sdf.format(id.getStartTime())) + " to " + DateUtil.conversionFormat(language, sdf.format(id.getEndTime())) + "，check more details on the app.");
			}
			if(3 == language){
			document.getElementById("chinese").remove();
			@@ -3017,16 +3889,16 @@
			Element user_french = document.getElementById("user_french");
			user_french.text("Bonjour " + userInfo.getNickName() + "，");
			Element time_french = document.getElementById("time_french");
			time_french.text("Cette promotion est valable du " + DateUtil.conversionFormat(language, sdf.format(id.getStartTime())) + " au " + DateUtil.conversionFormat(language, sdf.format(id.getEnable())) + ". Veuillez consulter la plateforme i-go pour plus de détails.");
			time_french.text("Cette promotion est valable du " + DateUtil.conversionFormat(language, sdf.format(id.getStartTime())) + " au " + DateUtil.conversionFormat(language, sdf.format(id.getEndTime())) + ". Veuillez consulter la plateforme I-GO pour plus de détails.");
			}

			EmailUtil.send(userInfo.getEmail(), language == 1 ? "红包活动" : language == 2 ? "Lucky-promo activities" : "Activités bonus", document.html());
			//开始生成pdf收据和html收据
			File file = new File("/usr/local/nginx/html/files/html/");
			File file = new File("/home/igotechgh/nginx/html/files/html/");
			if(!file.exists()){
			file.mkdirs();
			}
			file = new File("/usr/local/nginx/html/files/html/redpacket_" + orderId + ".html");
			file = new File("/home/igotechgh/nginx/html/files/html/redpacket_" + orderId + ".html");
			if(!file.exists()){
			file.createNewFile();
			}
			@@ -3035,7 +3907,7 @@
			fileWriter.flush();
			fileWriter.close();

			String link ="http://182.160.16.251:81/files/html/redpacket_" + orderId + ".html";
			String link ="https://igo.i-go.group/files/html/redpacket_" + orderId + ".html";
			TEmail tEmail = new TEmail();
			tEmail.setLink(link);
			tEmail.setUserId(userInfo.getId());
			@@ -3079,4 +3951,140 @@
			}
			return list;
			}


			/**
			* 获取服务中的订单数据
			* @param uid
			* @return
			* @throws Exception
			*/
			@Override
			public OrderServerWarpper queryOrderServer(Integer orderId, Integer uid) throws Exception {
			OrderLogistics orderLogistics = this.selectById(orderId);
			//计算预计距离和剩余时间
			String value = redisUtil.getValue("DRIVER" + orderLogistics.getDriverId());
			String d = "0";
			String t = "0";
			if(null == value \|\| "".equals(value)){
			System.err.println("司机没有上传位置信息");

			//调用获取轨迹中的数据
			File file = new File(filePath + orderId + "_4.txt");
			if(file.exists()){
			//读取文件(字符流)
			BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(file),"UTF-8"));
			//循环取出数据
			String str = null;
			StringBuffer sb = new StringBuffer();
			while ((str = in.readLine()) != null) {
			sb.append(str);
			}
			List<OrderPosition> list = JSONArray.parseArray(sb.toString(), OrderPosition.class);
			if(list.size() > 0){
			OrderPosition orderPosition = list.get(list.size() - 1);
			value = orderPosition.getLon() + "," + orderPosition.getLat();
			}
			}
			}

			String tripId = redisUtil.getValue("trip" + uid);
			String lnt = "0";
			String lat = "0";
			if(ToolUtil.isNotEmpty(value)){
			lnt = value.split(",")[0];
			lat = value.split(",")[1];
			DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(orderLogistics.getStartLat(), orderLogistics.getStartLon(), Double.valueOf(lat), Double.valueOf(lnt), tripId);

			if(null == distancematrix){
			System.err.println("查询距离出错了");
			}else if(distancematrix.getDistance() == 0){
			System.err.println("未获取到有效的距离");
			}else{
			d = new BigDecimal(distancematrix.getDistance()).divide(new BigDecimal(1000), new MathContext(2, RoundingMode.HALF_EVEN)).toString();
			t = new BigDecimal(distancematrix.getDuration()).divide(new BigDecimal(60), new MathContext(2, RoundingMode.HALF_EVEN)).intValue() + "";
			}
			}

			OrderServerWarpper orderServerWarpper = new OrderServerWarpper();
			orderServerWarpper.setOrderId(orderLogistics.getId());
			orderServerWarpper.setOrderType(4);
			orderServerWarpper.setState(orderLogistics.getState());
			orderServerWarpper.setLon(lnt);
			orderServerWarpper.setLat(lat);
			orderServerWarpper.setReassignNotice(orderLogistics.getReassignNotice());
			if(orderLogistics.getState() == 2 \|\| orderLogistics.getState() == 3){//前往预约地
			orderServerWarpper.setReservationMileage(d);
			orderServerWarpper.setReservationTime(t);
			orderServerWarpper.setServedMileage("0");
			orderServerWarpper.setServedTime("0");
			orderServerWarpper.setLaveMileage("0");
			orderServerWarpper.setLaveTime("0");
			}
			if(orderLogistics.getState() == 5 \|\| orderLogistics.getState() == 6){//服务中
			DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(Double.valueOf(lat), Double.valueOf(lnt), orderLogistics.getEndLat(), orderLogistics.getEndLon(), tripId);
			if(null == distancematrix){
			System.err.println("查询距离出错了");
			}else if(distancematrix.getDistance() == 0){
			System.err.println("未获取到有效的距离");
			}else{
			d = new BigDecimal(distancematrix.getDistance()).divide(new BigDecimal(1000), new MathContext(2, RoundingMode.HALF_EVEN)).toString();
			t = new BigDecimal(distancematrix.getDuration()).divide(new BigDecimal(60), new MathContext(2, RoundingMode.HALF_EVEN)).intValue() + "";
			}
			orderServerWarpper.setReservationMileage("0");
			orderServerWarpper.setReservationTime("0");
			orderServerWarpper.setServedMileage(String.valueOf((null == orderLogistics.getMileage() ? 0 : orderLogistics.getMileage()) / 1000));
			orderServerWarpper.setServedTime("0");
			if(null != orderLogistics.getStartServiceTime()){
			orderServerWarpper.setServedTime(Long.valueOf((new Date().getTime() - orderLogistics.getStartServiceTime().getTime()) / 60000).intValue() + "");
			}
			orderServerWarpper.setLaveMileage(d);
			orderServerWarpper.setLaveTime(t);
			}
			File file = new File(filePath + orderId + "_4.txt");
			if(file.exists()){
			//读取文件(字符流)
			BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(file),"UTF-8"));
			//循环取出数据
			String str = null;
			StringBuffer sb = new StringBuffer();
			while ((str = in.readLine()) != null) {
			sb.append(str);
			}
			List<OrderPosition> list = JSONArray.parseArray(sb.toString(), OrderPosition.class);
			orderServerWarpper.setOrderPositionList(JSONObject.toJSONString(list));
			}
			return orderServerWarpper;
			}


			/**
			* 获取下单推送完后没有司机接单的提醒
			* @return
			* @throws Exception
			*/
			@Override
			public EndPushWarpper queryEndPush(Integer uid) throws Exception {
			List<OrderLogistics> list = orderLogisticsMapper.queryByState(uid, null, null, 1);
			EndPushWarpper endPushWarpper = new EndPushWarpper();
			if(list.size() > 0){
			OrderLogistics orderPrivateCar = list.get(0);
			if(!orderIds.contains(orderPrivateCar.getId())){
			endPushWarpper.setOrderId(orderPrivateCar.getId());
			endPushWarpper.setOrderType(4);
			endPushWarpper.setState(1);
			List<PushOrder> querys = pushOrderService.querys(null, 2, orderPrivateCar.getCompanyId());//获取需要推送的次数
			int time = 0;
			for(int i = 1; i <= querys.size(); i++){
			PushOrder pushOrder = pushOrderService.querys(i, 2, orderPrivateCar.getCompanyId()).get(0);
			time += pushOrder.getPushTime() * 1000;
			}
			//当前时间减去推单总时间大于下单时间
			if((System.currentTimeMillis() - time) > orderPrivateCar.getInsertTime().getTime()){
			endPushWarpper.setState(2);
			}
			}
			}
			return endPushWarpper;
			}
			}