java/IgoTravel.git

			@@ -321,13 +321,8 @@
			if(query.size() == 0){
			return ResultUtil.error(language == 1 ? "该司机不能服务此业务" : language == 2 ? "Driver has outstanding fees to pay, unable to receive orders." : "Le chauffeur a des frais impayés à payer, incapable de recevoir des commandes.");
			}

			int count = this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("driverId", driverId).eq("driverPay", 1).in("state", Arrays.asList(7, 8, 9)).eq("isDelete", 1));
			int count = settlementRecordService.selectCount(new EntityWrapper<SettlementRecord>().eq("driverId", driverId).eq("paymentStatus", 1));
			if(count > 0){
			return ResultUtil.error(language == 1 ? "司机未支付订单费用，无法进行接单" : language == 2 ? "Driver has outstanding fees to pay, unable to receive orders." : "Le chauffeur a des frais impayés à payer, incapable de recevoir des commandes.");
			}
			int count1 = orderLogisticsService.selectCount(new EntityWrapper<OrderLogistics>().eq("driverId", driverId).eq("driverPay", 1).ne("state", 10).eq("isDelete", 1));
			if(count1 > 0){
			return ResultUtil.error(language == 1 ? "司机未支付订单费用，无法进行接单" : language == 2 ? "Driver has outstanding fees to pay, unable to receive orders." : "Le chauffeur a des frais impayés à payer, incapable de recevoir des commandes.");
			}

			@@ -442,13 +437,29 @@
			//推单操作
			if(orderPrivateCar.getState() == 1){
			this.pushOrder(orderPrivateCar);
			}else{
			//接单后定时任务判断司机是否去接乘客，没有则推送提醒
			CancleOrder cancleOrder = cancleOrderService.query(orderPrivateCar.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() {
			OrderPrivateCar orderPrivateCar1 = OrderPrivateCarServiceImpl.this.selectById(orderPrivateCar.getId());
			if(orderPrivateCar1.getState() == 2){
			pushUtil.pushDriverTimeOut(1, orderPrivateCar1.getUserId(), orderPrivateCar1.getId(), 1);
			}
			}
			}, time);
			}
			}


			//添加消息
			systemNoticeService.addSystemNotice(1, language == 1 ? "您的打车订单已下单成功，我们正在为您指派司机，请稍后！" :
			language == 2 ? "Your ride order has been successfully placed, we are assigning a driver for you, please wait!" :
			"Votre commande a bien été passée, nous vous assignons un chauffeur, veuillez patienter!", orderPrivateCar.getUserId(), 1);
			language == 2 ? "You've placed the ride order successfully, we are assigning you a driver, please wait." :
			"Vous avez passé la commande de course avec succès, nous vous attribuons un chauffeur, veuillez patienter.", orderPrivateCar.getUserId(), 1);

			BaseWarpper baseWarpper = new BaseWarpper();
			baseWarpper.setState(orderPrivateCar.getState());
			@@ -505,28 +516,89 @@
			}
			return ResultUtil.success();
			}


			/**
			* 获取取消需要支付的金额
			* @param id
			* @param language
			* @return
			* @throws Exception
			*/
			@Override
			public ResultUtil<BaseWarpper> queryCancleAmount(Integer id, Integer language) throws Exception {
			OrderPrivateCar orderPrivateCar = this.selectById(id);
			if(null == orderPrivateCar){
			return ResultUtil.error(language == 1 ? "获取数据失败，订单信息有误" : language == 2 ? "Failed to obtain data, order-information error." : "Impossible d’obtenir les données, erreur d’information de commande. ");
			}
			BaseWarpper baseWarpper = new BaseWarpper();
			double amount = 0;
			CancleOrder query = cancleOrderService.query(orderPrivateCar.getOrderType(), 1, orderPrivateCar.getCompanyId());
			if(null != orderPrivateCar.getDriverId() && orderPrivateCar.getSnatchOrderTime()!=null &&
			(orderPrivateCar.getSnatchOrderTime().getTime() + query.getMinuteNum() * 60 * 1000) < new Date().getTime()){//收费的情况
			if(null != query){
			amount += query.getMoney();
			CancleOrder query = cancleOrderService.query(orderPrivateCar.getCompanyId());
			if(null == query \|\| null == orderPrivateCar.getDriverId()){
			baseWarpper.setAmount(amount);
			return ResultUtil.success(baseWarpper);
			}
			JSONObject object = JSON.parseObject(query.getContent());
			long t = object.getInteger("driverTimeout") * 60000L;
			//司机超时未到达起点，免费取消
			if(orderPrivateCar.getState() < 3 && orderPrivateCar.getSnatchOrderTime().getTime() + t < System.currentTimeMillis()){
			baseWarpper.setAmount(amount);
			return ResultUtil.success(baseWarpper);
			}
			//普通单
			if(1 == orderPrivateCar.getOrderType()){
			JSONObject order = object.getJSONObject("order");
			long m = order.getInteger("orderAcceptanceTime") * 60000L;
			//超过免费时间，计算费用
			if(orderPrivateCar.getSnatchOrderTime().getTime() + m < System.currentTimeMillis()){
			BigDecimal money = order.getBigDecimal("money");
			if(null != orderPrivateCar.getSetOutTime()){
			//里程费
			BigDecimal mileageFee = order.getBigDecimal("mileageFee").multiply(new BigDecimal(orderPrivateCar.getMileage() / 1000));
			//时长费
			int s = Double.valueOf((System.currentTimeMillis() - orderPrivateCar.getSetOutTime().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();
			}
			}
			BaseWarpper baseWarpper = new BaseWarpper();
			//预约单
			if(2 == orderPrivateCar.getOrderType()){
			JSONObject order = object.getJSONObject("reservationOrder");
			long m = order.getInteger("orderAcceptanceTime") * 60000L;
			//超过免费时间，计算费用
			if(System.currentTimeMillis() + m > orderPrivateCar.getTravelTime().getTime()){
			BigDecimal money = order.getBigDecimal("money");
			if(null != orderPrivateCar.getSetOutTime()){
			//里程费
			BigDecimal mileageFee = order.getBigDecimal("mileageFee").multiply(new BigDecimal(orderPrivateCar.getMileage() / 1000));
			//时长费
			int s = Double.valueOf((System.currentTimeMillis() - orderPrivateCar.getSetOutTime().getTime()) / 60000).intValue();
			BigDecimal durationFee = order.getBigDecimal("durationFee").multiply(new BigDecimal(s));
			//预定费用
			BigDecimal reservationFee = order.getBigDecimal("reservationFee");
			money = money.add(durationFee).add(mileageFee).add(reservationFee);
			}
			amount = money.setScale(2, RoundingMode.HALF_EVEN).doubleValue();
			}
			}
			baseWarpper.setAmount(amount);
			return ResultUtil.success(baseWarpper);
			}



			/**
			* 添加取消操作
			* @param id
			* @param reason
			* @param remark
			* @param uid
			* @param language
			* @return
			* @throws Exception
			*/
			@Override
			public ResultUtil addCancle(Integer id, String reason, String remark, Integer uid, Integer language) throws Exception {
			public ResultUtil addCancle(Integer id, String reason, String remark, Integer uid, Double lon, Double lat, String address, Integer language) throws Exception {
			if(ToolUtil.isNotEmpty(remark)){
			if(ToolUtil.isNotEmpty(remark)){
			List<SensitiveWords> sensitiveWords = sensitiveWordsMapper.selectList(null);
			@@ -545,6 +617,8 @@
			if(orderPrivateCar.getState() > 5 && orderPrivateCar.getState() != 11){
			return ResultUtil.error(language == 1 ? "取消订单失败，不合法的操作" : language == 2 ? "Failed to cancel order, illegal operation." : "Échec de l’annulation de la commande, opération illégale.");
			}

			//服务中也可以取消订单，所以取消订单时需要计算订单费用
			if(null == orderPrivateCar.getDriverId()){//没有接单的情况
			if(orderPrivateCar.getType() == 2){//摆渡车
			OrderCrossCityServiceImpl.pushEndMap.remove(orderPrivateCar.getCrossCityOrderId());//删除标识数据
			@@ -566,40 +640,52 @@
			this.updateById(orderPrivateCar);
			}
			}else {
			CancleOrder query = cancleOrderService.query(orderPrivateCar.getOrderType(), 1, orderPrivateCar.getCompanyId());
			if (null != query) {
			if ((orderPrivateCar.getSnatchOrderTime().getTime() + query.getMinuteNum() * 60 * 1000) < System.currentTimeMillis() && query.getMoney().compareTo(0D) > 0) {//收费的情况
			orderPrivateCar.setState(12);
			this.updateById(orderPrivateCar);
			integer = orderCancelService.saveData(id, 1, reason, remark, null, query.getMoney(), 1, 1, uid);
			} else {
			integer = orderCancelService.saveData(id, 1, reason, remark, null, null, 2, 1, uid);

			BaseWarpper data = queryCancleAmount(id, language).getData();
			Double amount = data.getAmount();
			if(0 == amount){
			integer = orderCancelService.saveData(id, 1, reason, remark, null, null, 2, 1, uid);
			if(5 == orderPrivateCar.getState()){
			orderPrivateCar.setState(6);
			orderPrivateCar.setGetoffLon(lon);
			orderPrivateCar.setGetoffLat(lat);
			orderPrivateCar.setGetoffAddress(address);
			orderPrivateCar.setGetoffTime(new Date());
			orderPrivateCar.setEndServiceTime(new Date());
			}else{
			orderPrivateCar.setState(10);
			this.updateById(orderPrivateCar);
			}
			this.deleteTask(id);//删除定时任务

			new Thread(new Runnable() {
			@Override
			public void run() {
			pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0);
			System.err.println("推送取消操作---------------------");
			}
			}).start();

			//修改司机为空闲
			Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
			driver.setState(2);
			driverService.updateById(driver);
			this.updateById(orderPrivateCar);
			}else{
			return ResultUtil.error(language == 1 ? "请完善后台取消规则设置" : language == 2 ? "Please complete the setting of cancellation rules from the background." : "Veuillez compléter le réglage des règles d’annulation à partir de l’arrière-plan.");
			if(5 == orderPrivateCar.getState()){
			orderPrivateCar.setGetoffLon(lon);
			orderPrivateCar.setGetoffLat(lat);
			orderPrivateCar.setGetoffAddress(address);
			orderPrivateCar.setGetoffTime(new Date());
			orderPrivateCar.setEndServiceTime(new Date());
			}
			orderPrivateCar.setOldState(6);
			orderPrivateCar.setState(12);
			this.updateById(orderPrivateCar);
			integer = orderCancelService.saveData(id, 1, reason, remark, null, amount, 1, 1, uid);
			}

			this.deleteTask(id);//删除定时任务

			new Thread(new Runnable() {
			@Override
			public void run() {
			pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0);
			System.err.println("推送取消操作---------------------");
			}
			}).start();

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

			//添加消息
			systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功取消出行订单，谢谢使用！" : language == 2 ? "You have successfully canceled the travel order, thank you for using" : "Vous avez annulé avec succès la commande de voyage, merci d'utiliser", orderPrivateCar.getUserId(), 1);
			systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功取消出行订单，谢谢使用！" : language == 2 ? "You've cancelled the ride order successfully, thank you for using I-GO " : "Vous avez annulé la commande de course avec succès, merci d’utiliser I-GO", orderPrivateCar.getUserId(), 1);
			Map<String, Object> map = new HashMap<>();
			map.put("id", integer);
			return ResultUtil.success(map);
			@@ -631,9 +717,9 @@
			}else{
			orderCancel = orderCancelService.selectById(cancleId);
			}

			CancleOrder query = cancleOrderService.query(orderPrivateCar.getOrderType(), 1, orderPrivateCar.getCompanyId());
			if(null != query){

			Double amount = queryCancleAmount(id, language).getData().getAmount();
			if(0 < amount){
			if(payType == 1){//手机支付
			orderCancel.setPayType(1);
			orderCancelService.updateById(orderCancel);
			@@ -645,7 +731,7 @@
			checkoutRequest.setAccountNumber(userInfo.getPhone());
			checkoutRequest.setCustomerFirstName(userInfo.getFirstName());
			checkoutRequest.setCustomerLastName(userInfo.getLastName());
			checkoutRequest.setRequestAmount(query.getMoney());
			checkoutRequest.setRequestAmount(amount);
			checkoutRequest.setMerchantTransactionId(merchantTransactionId);
			checkoutRequest.setRequestDescription("Cancel a trip");
			checkoutRequest.setCallbackUrl(callbackPath + "/base/wxCancelOrderTaxi");
			@@ -654,7 +740,7 @@
			checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html");
			resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest);
			if(resultUtil.getCode()==200){
			paymentRecordService.saveData(1, null, null, id, 1, 1, query.getMoney(), null, 1);//添加预支付数据
			paymentRecordService.saveData(1, null, null, id, 1, 1, amount, null, 1);//添加预支付数据
			}

			}
			@@ -670,7 +756,7 @@
			checkoutRequest.setAccountNumber(bankCard.getCode());
			checkoutRequest.setCustomerFirstName(bankCard.getFirstName());
			checkoutRequest.setCustomerLastName(bankCard.getLastName());
			checkoutRequest.setRequestAmount(query.getMoney());
			checkoutRequest.setRequestAmount(amount);
			checkoutRequest.setMerchantTransactionId(merchantTransactionId);
			checkoutRequest.setRequestDescription("Cancel a trip");
			checkoutRequest.setCallbackUrl(callbackPath + "/base/wxCancelOrderTaxi");
			@@ -679,26 +765,30 @@
			checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html");
			resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest);
			if(resultUtil.getCode()==200){
			paymentRecordService.saveData(1, null, null, id, 1, 2, query.getMoney(), null, 1);//添加预支付数据
			paymentRecordService.saveData(1, null, null, id, 1, 2, amount, null, 1);//添加预支付数据
			}

			}
			if(payType == 3){//余额支付
			if(userInfo.getBalance() != null && userInfo.getBalance() < query.getMoney()){
			if(userInfo.getBalance() != null && userInfo.getBalance() < amount){
			return ResultUtil.error((language == 1 ? "账户余额不足" : language == 2 ? "Insufficient balance" : "Solde insuffisant"), "");
			}

			userInfo.setBalance(new BigDecimal(userInfo.getBalance()).subtract(new BigDecimal(query.getMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			userInfo.setBalance(new BigDecimal(userInfo.getBalance()).subtract(new BigDecimal(amount)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			//添加交易明细
			transactionDetailsService.saveData(uid, "取消订单", query.getMoney(), 2, 1, 1, 1, id);
			transactionDetailsService.saveData(uid, "取消订单", amount, 2, 1, 1, 1, id);
			userInfoService.updateById(userInfo);

			//解除小号绑定
			if(orderPrivateCar.getBindId() != null){
			chinaMobileUtil.midAxbUnBindSend(orderPrivateCar.getBindId(),orderPrivateCar.getTelX());
			ChinaMobileUtil.midAxbUnBindSend(orderPrivateCar.getBindId(),orderPrivateCar.getTelX());
			}

			orderPrivateCar.setState(10);

			if(5 == orderPrivateCar.getOldState()){
			orderPrivateCar.setState(6);
			}else{
			orderPrivateCar.setState(10);
			}
			orderPrivateCar.setTelX("");
			orderPrivateCar.setBindId("");
			this.updateById(orderPrivateCar);
			@@ -707,25 +797,24 @@
			orderCancel.setPayType(3);
			orderCancelService.updateById(orderCancel);

			//添加已收入明细
			incomeService.saveData(1, orderPrivateCar.getCompanyId(), 3, orderPrivateCar.getId(), 1, query.getMoney());
			//添加已收入明细
			Company company = companyService.selectById(orderPrivateCar.getCompanyId());
			Double taxi = company.getSpeMoney();
			BigDecimal c =new BigDecimal(query.getMoney());//司机收入
			incomeService.saveData(2, orderPrivateCar.getDriverId(), 3, orderPrivateCar.getId(), 1, c.doubleValue());
			Driver driver = driverService.selectById(orderPrivateCar.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);//删除定时任务
			if(null != orderPrivateCar.getDriverId()){
			BigDecimal c =new BigDecimal(amount);//司机收入
			incomeService.saveData(2, orderPrivateCar.getDriverId(), 3, orderPrivateCar.getId(), 1, c.doubleValue());
			Driver driver = driverService.selectById(orderPrivateCar.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, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0);
			}
			pushUtil.pushOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0);

			//添加消息
			systemNoticeService.addSystemNotice(1, language == 1 ? "您已使用余额成功支付取消订单费用，谢谢使用！" : language == 2
			? "You have successfully paid the cancellation fee, thank you for using!"
			: "Vous avez payé avec succès les frais d’annulation de commande, merci d’utiliser!", orderPrivateCar.getUserId(), 1);
			? "You've paid for cancellation fee with the balance successfully, thank you for using I-GO"
			: "Vous avez utilisé avec succès votre solde pour payer les frais d’annulation, merci d’utiliser I-GO", orderPrivateCar.getUserId(), 1);
			}
			}
			return resultUtil;
			@@ -827,8 +916,19 @@
			UserInfo userInfo = userInfoService.selectById(uid);
			map.put("balance", userInfo.getBalance());
			OrderPrivateCar orderPrivateCar = this.selectById(orderId);
			int i = userCouponRecordService.queryAvailable(uid, orderPrivateCar.getCompanyId(), 1, 1, orderPrivateCar.getOrderMoney());
			i = i + userCouponRecordService.queryAvailable(uid, orderPrivateCar.getCompanyId(), 1, 0, orderPrivateCar.getOrderMoney());
			UserActivityDiscount1 query2 = userActivityDiscount1Mapper.query(orderPrivateCar.getCompanyId());
			double v = orderPrivateCar.getOrderMoney();
			if(null != query2){
			Integer orderNum=this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("userId",orderPrivateCar.getUserId()).eq("activityId",query2.getId()).last(" and to_days(getoffTime) = to_days(now())"));
			if(query2.getDistance()*1000>orderPrivateCar.getMileage() && query2.getOrderNum()>orderNum){
			Double special = query2.getSpecial();
			orderPrivateCar.setDiscount(special);
			Double orderMoney = orderPrivateCar.getOrderMoney();
			v = new BigDecimal(orderMoney).multiply(new BigDecimal(special / 10)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
			}
			}
			int i = userCouponRecordService.queryAvailable(uid, orderPrivateCar.getCompanyId(), 1, 1, v);
			i = i + userCouponRecordService.queryAvailable(uid, orderPrivateCar.getCompanyId(), 1, 0, v);
			map.put("coupon", i);
			return map;
			}
			@@ -836,8 +936,19 @@
			@Override
			public List<Map<String, Object>> queryCoupon(Integer language, Integer orderId, Integer uid, Integer pageNum, Integer size) throws Exception {
			OrderPrivateCar orderPrivateCar = this.selectById(orderId);
			List<Map<String, Object>> list = userCouponRecordService.queryCoupon(language, uid, orderPrivateCar.getCompanyId(), 1, 1, orderPrivateCar.getOrderMoney(), pageNum, size);
			List<Map<String, Object>> list1 = userCouponRecordService.queryCoupon(language, uid, orderPrivateCar.getCompanyId(), 1, 0, orderPrivateCar.getOrderMoney(), pageNum, size);
			UserActivityDiscount1 query2 = userActivityDiscount1Mapper.query(orderPrivateCar.getCompanyId());
			double v = orderPrivateCar.getOrderMoney();
			if(null != query2){
			Integer orderNum=this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("userId",orderPrivateCar.getUserId()).eq("activityId",query2.getId()).last(" and to_days(getoffTime) = to_days(now())"));
			if(query2.getDistance()*1000>orderPrivateCar.getMileage() && query2.getOrderNum()>orderNum){
			Double special = query2.getSpecial();
			orderPrivateCar.setDiscount(special);
			Double orderMoney = orderPrivateCar.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, orderPrivateCar.getCompanyId(), 1, 1, v, pageNum, size);
			List<Map<String, Object>> list1 = userCouponRecordService.queryCoupon(language, uid, orderPrivateCar.getCompanyId(), 1, 0, v, pageNum, size);
			list.addAll(list1);
			return list;
			}
			@@ -861,11 +972,27 @@
			orderPrivateCar.setCouponMoney(0D);//初始化历史数据
			orderPrivateCar.setCouponId(null);

			//计算折扣
			UserActivityDiscount1 query2 = userActivityDiscount1Mapper.query(orderPrivateCar.getCompanyId());
			if(null != query2){
			Integer orderNum=this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("userId",orderPrivateCar.getUserId()).eq("activityId",query2.getId()).last(" and to_days(getoffTime) = to_days(now())"));
			if(query2.getDistance()*1000>orderPrivateCar.getMileage() && query2.getOrderNum()>orderNum){
			Double special = query2.getSpecial();
			orderPrivateCar.setDiscount(special);
			double v = new BigDecimal(orderMoney).multiply(new BigDecimal(special / 10)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
			if(orderMoney.compareTo(v) > 0){
			orderPrivateCar.setDiscountMoney(orderMoney - v);
			orderPrivateCar.setActivityId(query2.getId());
			orderMoney = v;
			}
			}
			}

			//计算优惠券
			UserCouponRecord userCouponRecord = null;
			if(null != couponId){
			userCouponRecord = userCouponRecordService.selectById(couponId);
			if(userCouponRecord.getCompanyId() != orderPrivateCar.getCompanyId()){
			if(!userCouponRecord.getCompanyId().equals(orderPrivateCar.getCompanyId())){
			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.getState() == 2){
			@@ -892,22 +1019,6 @@
			orderMoney = orderMoney - query.getMoney();
			orderPrivateCar.setRedPacketMoney(query.getMoney());
			orderPrivateCar.setRedPacketId(query.getId());
			}
			//计算折扣
			UserActivityDiscount1 query2 = userActivityDiscount1Mapper.query(orderPrivateCar.getCompanyId());
			if(null != query2){
			Integer orderNum=this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("userId",orderPrivateCar.getUserId()).eq("activityId",query2.getId()).last(" and to_days(getoffTime) = to_days(now())"));
			if(query2.getDistance()*1000>orderPrivateCar.getMileage() && query2.getOrderNum()>orderNum){
			Double special = query2.getSpecial();
			orderPrivateCar.setDiscount(special);
			double v = new BigDecimal(orderMoney).multiply(new BigDecimal(special / 10)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
			if(orderMoney.compareTo(v) > 0){
			orderPrivateCar.setDiscountMoney(orderMoney - v);
			orderPrivateCar.setActivityId(query2.getId());
			orderMoney = v;
			}
			}

			}

			if(payType == 1){//手机支付
			@@ -1034,16 +1145,38 @@
			if(1 == language){
			document.getElementById("english").remove();
			document.getElementById("french").remove();
			document.getElementsByTag("title").get(0).text("I-GO电子收据");
			Element title_chinese = document.getElementById("title_chinese");
			title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，您在I-GO1个订单消费GHS " + orderPrivateCar.getPayMoney());
			title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，您在I-GO此订单消费GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			Element xcf_chinese = document.getElementById("xcf_chinese");
			xcf_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
			xcf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
			if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
			Element yhq_chinese = document.getElementById("yhq_chinese");
			yhq_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element yhq_chinese_div = document.getElementById("yhq_chinese_div");
			yhq_chinese_div.remove();
			}
			if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
			Element zk_chinese = document.getElementById("zk_chinese");
			zk_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element zk_chinese_div = document.getElementById("zk_chinese_div");
			zk_chinese_div.remove();
			}
			if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
			Element hb_chinese = document.getElementById("hb_chinese");
			hb_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element hb_chinese_div = document.getElementById("hb_chinese_div");
			hb_chinese_div.remove();
			}
			Element xj_chinese = document.getElementById("xj_chinese");
			xj_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
			xj_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			Element pay_type_chinese = document.getElementById("pay_type_chinese");
			pay_type_chinese.text("余额");
			pay_type_chinese.text("余额支付");
			Element pay_money_chinese = document.getElementById("pay_money_chinese");
			pay_money_chinese.text("GHS " + orderPrivateCar.getPayMoney());
			pay_money_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			Element pdf_chinese = document.getElementById("pdf_chinese");
			pdf_chinese.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=1");
			Element lost_item_chinese = document.getElementById("lost_item_chinese");
			@@ -1055,7 +1188,7 @@
			Elements driver_chinese = document.getElementsByClass("driver_chinese");
			for (int i = 0; i < driver_chinese.size(); i++) {
			Element element = driver_chinese.get(i);
			element.text(driver.getFirstName() + "." + driver.getLastName());
			element.text(" " + driver.getFirstName() + "." + driver.getLastName());
			}
			Element cp_chinese = document.getElementById("cp_chinese");
			cp_chinese.text("车牌：" + car.getCarLicensePlate());
			@@ -1078,16 +1211,38 @@
			if(2 == language){
			document.getElementById("chinese").remove();
			document.getElementById("french").remove();
			document.getElementsByTag("title").get(0).text("Receipt");
			Element title_english = document.getElementById("title_english");
			title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，You spent GHS " + orderPrivateCar.getPayMoney() + " on the trip ");
			title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，You spent GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " on the trip ");
			Element xcf_english = document.getElementById("xcf_english");
			xcf_english.text("GHS " + orderPrivateCar.getOrderMoney());
			xcf_english.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
			if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
			Element yhq_english = document.getElementById("yhq_english");
			yhq_english.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element yhq_english_div = document.getElementById("yhq_english_div");
			yhq_english_div.remove();
			}
			if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
			Element zk_english = document.getElementById("zk_english");
			zk_english.text("GHS -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element zk_english_div = document.getElementById("zk_english_div");
			zk_english_div.remove();
			}
			if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
			Element hb_english = document.getElementById("hb_english");
			hb_english.text("GHS -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element hb_english_div = document.getElementById("hb_english_div");
			hb_english_div.remove();
			}
			Element xj_english = document.getElementById("xj_english");
			xj_english.text("GHS " + orderPrivateCar.getOrderMoney());
			xj_english.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			Element pay_type_english = document.getElementById("pay_type_english");
			pay_type_english.text("balance");
			pay_type_english.text("I-GO Wallet");
			Element pay_money_english = document.getElementById("pay_money_english");
			pay_money_english.text("GHS " + orderPrivateCar.getPayMoney());
			pay_money_english.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			Element pdf_english = document.getElementById("pdf_english");
			pdf_english.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=1");
			Element lost_item_english = document.getElementById("lost_item_english");
			@@ -1099,7 +1254,7 @@
			Elements driver_english = document.getElementsByClass("driver_english");
			for (int i = 0; i < driver_english.size(); i++) {
			Element element = driver_english.get(i);
			element.text(driver.getFirstName() + "." + driver.getLastName());
			element.text(" " + driver.getFirstName() + "." + driver.getLastName());
			}
			Element cp_english = document.getElementById("cp_english");
			cp_english.text("Number Plate：" + car.getCarLicensePlate());
			@@ -1122,16 +1277,38 @@
			if(3 == language){
			document.getElementById("chinese").remove();
			document.getElementById("english").remove();
			document.getElementsByTag("title").get(0).text("Reçu");
			Element title_french = document.getElementById("title_french");
			title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + orderPrivateCar.getPayMoney() + " sur le voyage");
			title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " sur le voyage");
			Element xcf_french = document.getElementById("xcf_french");
			xcf_french.text("GHS " + orderPrivateCar.getOrderMoney());
			xcf_french.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
			if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
			Element yhq_french = document.getElementById("yhq_french");
			yhq_french.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element yhq_french_div = document.getElementById("yhq_french_div");
			yhq_french_div.remove();
			}
			if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
			Element zk_french = document.getElementById("zk_french");
			zk_french.text("GHS -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element zk_french_div = document.getElementById("zk_french_div");
			zk_french_div.remove();
			}
			if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
			Element hb_french = document.getElementById("hb_french");
			hb_french.text("GHS -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element hb_french_div = document.getElementById("hb_french_div");
			hb_french_div.remove();
			}
			Element xj_french = document.getElementById("xj_french");
			xj_french.text("GHS " + orderPrivateCar.getOrderMoney());
			xj_french.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			Element pay_type_french = document.getElementById("pay_type_french");
			pay_type_french.text("Le solde");
			pay_type_french.text("Portefeuille I-GO");
			Element pay_money_french = document.getElementById("pay_money_french");
			pay_money_french.text("GHS " + orderPrivateCar.getPayMoney());
			pay_money_french.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			Element pdf_french = document.getElementById("pdf_french");
			pdf_french.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=1");
			Element lost_item_french = document.getElementById("lost_item_french");
			@@ -1143,7 +1320,7 @@
			Elements driver_french = document.getElementsByClass("driver_french");
			for (int i = 0; i < driver_french.size(); i++) {
			Element element = driver_french.get(i);
			element.text(driver.getFirstName() + "." + driver.getLastName());
			element.text(" " + driver.getFirstName() + "." + driver.getLastName());
			}
			Element cp_french = document.getElementById("cp_french");
			cp_french.text("Plaque: GS " + car.getCarLicensePlate());
			@@ -1163,7 +1340,7 @@
			Element server_tel_french = document.getElementById("server_tel_french");
			server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
			}
			EmailUtil.send(userInfo.getEmail(), language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de Ride", document.html());
			EmailUtil.send(userInfo.getEmail(), language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu", document.html());

			//开始生成pdf收据和html收据
			File file = new File("/usr/local/nginx/html/files/html/");
			@@ -1178,7 +1355,7 @@
			fileWriter.write(document.html());
			fileWriter.flush();
			fileWriter.close();
			FileInputStream fileInputStream = new FileInputStream(file);

			File file1 = new File("/usr/local/nginx/html/files/pdf/");
			if(!file1.exists()){
			file1.mkdirs();
			@@ -1187,15 +1364,19 @@
			if(!file1.exists()){
			file1.createNewFile();
			}
			FileOutputStream fileOutputStream = new FileOutputStream(file1);
			HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);

			try {
			FileOutputStream fileOutputStream = new FileOutputStream(file1);
			HtmlToPdfUtils.convertToPdf("/usr/local/nginx/html/files/html/ride_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/ride_receipt_" + orderId + ".html";
			TEmail tEmail = new TEmail();
			tEmail.setLink(link);
			tEmail.setUserId(uid);
			tEmail.setName(language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de Ride");
			tEmail.setName(language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu");
			tEmail.setType(1);
			tEmail.setOrderId(orderId);
			tEmail.setCreateTime(new Date());
			@@ -1203,9 +1384,9 @@
			tEmail.setWeek(EmailUtil.getWeek(language,i));
			boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
			if(am){
			tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
			tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
			}else {
			tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
			tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
			}
			emailService.insert(tEmail);

			@@ -1230,8 +1411,8 @@
			}).start();

			systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成出行订单支付，谢谢使用！" : language == 2
			? "You have successfully completed the travel order payment, thank you for using!"
			: "Vous avez complété avec succès le paiement de votre commande de voyage. Merci d’utiliser!", orderPrivateCar.getUserId(), 1);
			? "You've paid for the ride order successfully, thank you for using I-GO"
			: "Vous avez payé la commande de course avec succès, merci d’utiliser I-GO", orderPrivateCar.getUserId(), 1);
			}


			@@ -1249,17 +1430,43 @@
			orderPrivateCar.setPayMoney(orderMoney);
			orderPrivateCar.setOrderMoney(orderPrivateCar.getOrderMoney()+orderPrivateCar.getFreeMoney().doubleValue());

			Driver driver = driverService.selectById(orderPrivateCar.getDriverId());

			//处理优惠券和红包
			if(null != userCouponRecord){
			userCouponRecord.setState(2);
			userCouponRecord.setEndTime(new Date());
			userCouponRecordService.updateById(userCouponRecord);
			//添加优惠收入补贴
			Double money = userCouponRecord.getMoney();
			incomeService.saveData(2, orderPrivateCar.getDriverId(), 5, orderPrivateCar.getId(), 1, money);
			driver.setBusinessMoney(new BigDecimal(null != driver.getBusinessMoney() ? driver.getBusinessMoney() : 0).add(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driver.setLaveBusinessMoney(new BigDecimal(null != driver.getLaveBusinessMoney() ? driver.getLaveBusinessMoney() : 0).add(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0).add(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driverService.updateById(driver);
			}
			if(null != query){
			query.setState(2);
			query.setEndTime(new Date());
			userRedPacketRecordService.updateById(query);

			Double money = query.getMoney();
			incomeService.saveData(2, orderPrivateCar.getDriverId(), 7, orderPrivateCar.getId(), 1, money);
			driver.setBusinessMoney(new BigDecimal(null != driver.getBusinessMoney() ? driver.getBusinessMoney() : 0).add(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driver.setLaveBusinessMoney(new BigDecimal(null != driver.getLaveBusinessMoney() ? driver.getLaveBusinessMoney() : 0).add(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0).add(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driverService.updateById(driver);
			}
			if(null != orderPrivateCar.getDiscountMoney() && 0 < orderPrivateCar.getDiscountMoney()){
			Double money = orderPrivateCar.getDiscountMoney();
			incomeService.saveData(2, orderPrivateCar.getDriverId(), 6, orderPrivateCar.getId(), 1, money);
			driver.setBusinessMoney(new BigDecimal(null != driver.getBusinessMoney() ? driver.getBusinessMoney() : 0).add(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driver.setLaveBusinessMoney(new BigDecimal(null != driver.getLaveBusinessMoney() ? driver.getLaveBusinessMoney() : 0).add(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0).add(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driverService.updateById(driver);
			}


			if(orderPrivateCar.getIsplatPay()==1){
			//添加已收入明细
			Company company = companyService.selectById(orderPrivateCar.getCompanyId());
			@@ -1277,7 +1484,7 @@
			}
			// incomeService.saveData(1, orderPrivateCar.getCompanyId(), 2, orderPrivateCar.getId(), 1, d.doubleValue());
			// incomeService.saveData(2, orderPrivateCar.getDriverId(), 2, orderPrivateCar.getId(), 1, c.doubleValue());
			Driver driver = driverService.selectById(orderPrivateCar.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());
			@@ -1299,24 +1506,33 @@
			if(null != settlementAllocation){
			JSONObject jsonObject = JSON.parseObject(settlementAllocation.getContent());
			Double maxPrice = jsonObject.getDouble("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 = new SettlementRecord();
			settlementRecord.setDay(new Date());
			settlementRecord.setDriverId(driver.getId());
			settlementRecord.setType(1);
			settlementRecord.setPaymentStatus(1);
			settlementRecord.setPayMoney(total.doubleValue());
			settlementRecord.setInsertTime(new Date());
			settlementRecordService.insert(settlementRecord);

			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) {
			detail.setSettlementRecordId(settlementRecord.getId());
			settlementDetailService.updateById(detail);
			total = total.add(new BigDecimal(detail.getPrice()));
			}
			if(maxPrice.compareTo(total.doubleValue()) <= 0){
			SettlementRecord settlementRecord = settlementRecordService.selectOne(new EntityWrapper<SettlementRecord>().eq("driverId", orderPrivateCar.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(orderPrivateCar.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);
			}
			}
			}
			}
			@@ -1343,16 +1559,38 @@
			if(1 == language){
			document.getElementById("english").remove();
			document.getElementById("french").remove();
			document.getElementsByTag("title").get(0).text("I-GO电子收据");
			Element title_chinese = document.getElementById("title_chinese");
			title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，您在I-GO1个订单消费GHS " + orderPrivateCar.getPayMoney());
			title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，您在I-GO此订单消费GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			Element xcf_chinese = document.getElementById("xcf_chinese");
			xcf_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
			xcf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
			if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
			Element yhq_chinese = document.getElementById("yhq_chinese");
			yhq_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element yhq_chinese_div = document.getElementById("yhq_chinese_div");
			yhq_chinese_div.remove();
			}
			if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
			Element zk_chinese = document.getElementById("zk_chinese");
			zk_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element zk_chinese_div = document.getElementById("zk_chinese_div");
			zk_chinese_div.remove();
			}
			if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
			Element hb_chinese = document.getElementById("hb_chinese");
			hb_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element hb_chinese_div = document.getElementById("hb_chinese_div");
			hb_chinese_div.remove();
			}
			Element xj_chinese = document.getElementById("xj_chinese");
			xj_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
			xj_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			Element pay_type_chinese = document.getElementById("pay_type_chinese");
			pay_type_chinese.text("现金");
			Element pay_money_chinese = document.getElementById("pay_money_chinese");
			pay_money_chinese.text("GHS " + orderPrivateCar.getPayMoney());
			pay_money_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			Element pdf_chinese = document.getElementById("pdf_chinese");
			pdf_chinese.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=1");
			Element lost_item_chinese = document.getElementById("lost_item_chinese");
			@@ -1364,7 +1602,7 @@
			Elements driver_chinese = document.getElementsByClass("driver_chinese");
			for (int i = 0; i < driver_chinese.size(); i++) {
			Element element = driver_chinese.get(i);
			element.text(driver.getFirstName() + "." + driver.getLastName());
			element.text(" " + driver.getFirstName() + "." + driver.getLastName());
			}
			Element cp_chinese = document.getElementById("cp_chinese");
			cp_chinese.text("车牌：" + car.getCarLicensePlate());
			@@ -1387,16 +1625,38 @@
			if(2 == language){
			document.getElementById("chinese").remove();
			document.getElementById("french").remove();
			document.getElementsByTag("title").get(0).text("Receipt");
			Element title_english = document.getElementById("title_english");
			title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，You spent GHS " + orderPrivateCar.getPayMoney() + " on the trip ");
			title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，You spent GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " on the trip ");
			Element xcf_english = document.getElementById("xcf_english");
			xcf_english.text("GHS " + orderPrivateCar.getOrderMoney());
			xcf_english.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
			if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
			Element yhq_english = document.getElementById("yhq_english");
			yhq_english.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element yhq_english_div = document.getElementById("yhq_english_div");
			yhq_english_div.remove();
			}
			if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
			Element zk_english = document.getElementById("zk_english");
			zk_english.text("GHS -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element zk_english_div = document.getElementById("zk_english_div");
			zk_english_div.remove();
			}
			if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
			Element hb_english = document.getElementById("hb_english");
			hb_english.text("GHS -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element hb_english_div = document.getElementById("hb_english_div");
			hb_english_div.remove();
			}
			Element xj_english = document.getElementById("xj_english");
			xj_english.text("GHS " + orderPrivateCar.getOrderMoney());
			xj_english.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			Element pay_type_english = document.getElementById("pay_type_english");
			pay_type_english.text("Cash");
			Element pay_money_english = document.getElementById("pay_money_english");
			pay_money_english.text("GHS " + orderPrivateCar.getPayMoney());
			pay_money_english.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			Element pdf_english = document.getElementById("pdf_english");
			pdf_english.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=1");
			Element lost_item_english = document.getElementById("lost_item_english");
			@@ -1408,7 +1668,7 @@
			Elements driver_english = document.getElementsByClass("driver_english");
			for (int i = 0; i < driver_english.size(); i++) {
			Element element = driver_english.get(i);
			element.text(driver.getFirstName() + "." + driver.getLastName());
			element.text(" " + driver.getFirstName() + "." + driver.getLastName());
			}
			Element cp_english = document.getElementById("cp_english");
			cp_english.text("Number Plate：" + car.getCarLicensePlate());
			@@ -1431,16 +1691,38 @@
			if(3 == language){
			document.getElementById("chinese").remove();
			document.getElementById("english").remove();
			document.getElementsByTag("title").get(0).text("Reçu");
			Element title_french = document.getElementById("title_french");
			title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + orderPrivateCar.getPayMoney() + " sur le voyage");
			title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " sur le voyage");
			Element xcf_french = document.getElementById("xcf_french");
			xcf_french.text("GHS " + orderPrivateCar.getOrderMoney());
			xcf_french.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
			if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
			Element yhq_french = document.getElementById("yhq_french");
			yhq_french.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element yhq_french_div = document.getElementById("yhq_french_div");
			yhq_french_div.remove();
			}
			if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
			Element zk_french = document.getElementById("zk_french");
			zk_french.text("GHS -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element zk_french_div = document.getElementById("zk_french_div");
			zk_french_div.remove();
			}
			if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
			Element hb_french = document.getElementById("hb_french");
			hb_french.text("GHS -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element hb_french_div = document.getElementById("hb_french_div");
			hb_french_div.remove();
			}
			Element xj_french = document.getElementById("xj_french");
			xj_french.text("GHS " + orderPrivateCar.getOrderMoney());
			xj_french.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			Element pay_type_french = document.getElementById("pay_type_french");
			pay_type_french.text("espèces");
			pay_type_french.text("En espèces");
			Element pay_money_french = document.getElementById("pay_money_french");
			pay_money_french.text("GHS " + orderPrivateCar.getPayMoney());
			pay_money_french.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			Element pdf_french = document.getElementById("pdf_french");
			pdf_french.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=1");
			Element lost_item_french = document.getElementById("lost_item_french");
			@@ -1452,7 +1734,7 @@
			Elements driver_french = document.getElementsByClass("driver_french");
			for (int i = 0; i < driver_french.size(); i++) {
			Element element = driver_french.get(i);
			element.text(driver.getFirstName() + "." + driver.getLastName());
			element.text(" " + driver.getFirstName() + "." + driver.getLastName());
			}
			Element cp_french = document.getElementById("cp_french");
			cp_french.text("Plaque: GS " + car.getCarLicensePlate());
			@@ -1473,7 +1755,7 @@
			server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
			}

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

			//开始生成pdf收据和html收据
			File file = new File("/usr/local/nginx/html/files/html/");
			@@ -1488,7 +1770,7 @@
			fileWriter.write(document.html());
			fileWriter.flush();
			fileWriter.close();
			FileInputStream fileInputStream = new FileInputStream(file);

			File file1 = new File("/usr/local/nginx/html/files/pdf/");
			if(!file1.exists()){
			file1.mkdirs();
			@@ -1497,13 +1779,18 @@
			if(!file1.exists()){
			file1.createNewFile();
			}
			FileOutputStream fileOutputStream = new FileOutputStream(file1);
			HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
			try {
			FileOutputStream fileOutputStream = new FileOutputStream(file1);
			HtmlToPdfUtils.convertToPdf("/usr/local/nginx/html/files/html/ride_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/ride_receipt_" + orderId + ".html";
			TEmail tEmail = new TEmail();
			tEmail.setLink(link);
			tEmail.setUserId(uid);
			tEmail.setName(language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de Ride");
			tEmail.setName(language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu");
			tEmail.setType(1);
			tEmail.setOrderId(orderId);
			tEmail.setCreateTime(new Date());
			@@ -1511,9 +1798,9 @@
			tEmail.setWeek(EmailUtil.getWeek(language,i));
			boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
			if(am){
			tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
			tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
			}else {
			tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
			tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
			}
			emailService.insert(tEmail);

			@@ -1538,8 +1825,8 @@
			}).start();

			systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成出行订单支付，谢谢使用！" : language == 2
			? "You have successfully completed the travel order payment, thank you for using!"
			: "Vous avez complété avec succès le paiement de votre commande de voyage. Merci d’utiliser!", orderPrivateCar.getUserId(), 1);
			? "You've paid for the ride order successfully, thank you for using I-GO"
			: "Vous avez payé la commande de course avec succès, merci d’utiliser I-GO", orderPrivateCar.getUserId(), 1);
			}

			this.updateAllColumnById(orderPrivateCar);
			@@ -1630,29 +1917,32 @@
			if(1 == language){
			document.getElementById("english").remove();
			document.getElementById("french").remove();
			document.getElementsByTag("title").get(0).text("红包活动");
			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(query.getInsertTime())) + "至" + DateUtil.conversionFormat(language, sdf.format(query.getEndTime())) + "，详情请查看I-GO平台");
			time_chinese.text("此活动有效期在 " + DateUtil.conversionFormat(language, sdf.format(query.getInsertTime())) + " 至 " + DateUtil.conversionFormat(language, sdf.format(query.getExpirationTime())) + "，详情请查看I-GO平台");
			}
			if(2 == language){
			document.getElementById("chinese").remove();
			document.getElementById("french").remove();
			document.getElementsByTag("title").get(0).text("Lucky-promo activities");
			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(query.getInsertTime())) + "to" + DateUtil.conversionFormat(language, sdf.format(query.getEndTime())) + "，check more details on the app.");
			time_english.text("You could use it from " + DateUtil.conversionFormat(language, sdf.format(query.getInsertTime())) + " to " + DateUtil.conversionFormat(language, sdf.format(query.getExpirationTime())) + "，check more details on the app.");
			}
			if(3 == language){
			document.getElementById("chinese").remove();
			document.getElementById("english").remove();
			document.getElementsByTag("title").get(0).text("Activités bonus");
			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(query.getInsertTime())) + "au" + DateUtil.conversionFormat(language, sdf.format(query.getEndTime())) + ". Veuillez consulter la plateforme i-go pour plus de détails.");
			time_french.text("Cette promotion est valable du " + DateUtil.conversionFormat(language, sdf.format(query.getInsertTime())) + " au " + DateUtil.conversionFormat(language, sdf.format(query.getExpirationTime())) + ". Veuillez consulter la plateforme i-go pour plus de détails.");
			}

			EmailUtil.send(userInfo.getEmail(), language == 1 ? "红包活动" : language == 2 ? "Red envelope activity" : "Activité de l’enveloppe rouge", document.html());
			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/");
			if(!file.exists()){
			@@ -1666,33 +1956,22 @@
			fileWriter.write(document.html());
			fileWriter.flush();
			fileWriter.close();
			FileInputStream fileInputStream = new FileInputStream(file);
			File file1 = new File("/usr/local/nginx/html/files/pdf/");
			if(!file1.exists()){
			file1.mkdirs();
			}
			file1 = new File("/usr/local/nginx/html/files/pdf/redpacket_" + orderId + ".pdf");
			if(!file1.exists()){
			file1.createNewFile();
			}
			FileOutputStream fileOutputStream = new FileOutputStream(file1);
			HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);

			String link ="http://182.160.16.251:81/files/html/redpacket_" + orderId + ".html";
			TEmail tEmail = new TEmail();
			tEmail.setLink(link);
			tEmail.setUserId(userInfo.getId());
			tEmail.setType(1);
			tEmail.setName( language == 1 ? "红包活动" : language == 2 ? "Red envelope activity" : "Activité de l’enveloppe rouge");
			tEmail.setName(language == 1 ? "红包活动" : language == 2 ? "Lucky-promo activities" : "Activités bonus");
			tEmail.setOrderId(orderId);
			tEmail.setCreateTime(new Date());
			int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
			tEmail.setWeek(EmailUtil.getWeek(language,i));
			boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
			if(am){
			tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
			tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
			}else {
			tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
			tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
			}
			emailService.insert(tEmail);

			@@ -1716,10 +1995,14 @@
			if(null != query){
			//添加交易明细
			transactionDetailsService.saveData(orderPrivateCar.getUserId(), "取消订单", query.getAmount(), 2, 1, 1, 1, query.getOrderId());
			orderPrivateCar.setState(10);
			if(5 == orderPrivateCar.getOldState()){
			orderPrivateCar.setState(6);
			}else{
			orderPrivateCar.setState(10);
			}
			//解除小号绑定
			if(orderPrivateCar.getBindId() != null){
			chinaMobileUtil.midAxbUnBindSend(orderPrivateCar.getBindId(),orderPrivateCar.getTelX());
			ChinaMobileUtil.midAxbUnBindSend(orderPrivateCar.getBindId(),orderPrivateCar.getTelX());
			}
			orderPrivateCar.setBindId("");
			orderPrivateCar.setTelX("");
			@@ -1735,32 +2018,24 @@
			orderCancelService.updateById(query1);
			}

			//添加已收入明细
			incomeService.saveData(1, orderPrivateCar.getCompanyId(), 3, orderPrivateCar.getId(), 1, query.getAmount());
			//添加已收入明细
			Company company = companyService.selectById(orderPrivateCar.getCompanyId());
			Double taxi = company.getSpeMoney();
			BigDecimal c =new BigDecimal(query.getAmount());//司机收入
			incomeService.saveData(2, orderPrivateCar.getDriverId(), 3, orderPrivateCar.getId(), 1, c.doubleValue());
			Driver driver = driverService.selectById(orderPrivateCar.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(orderPrivateCar.getId());//删除定时任务

			// TODO: 2020/5/24 这里需要给司机和用户推送订单状态
			// new Thread(new Runnable() {
			// @Override
			// public void run() {
			// pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0);
			// }
			// }).start();
			if(null != orderPrivateCar.getDriverId()){
			BigDecimal c =new BigDecimal(query.getAmount());//司机收入
			incomeService.saveData(2, orderPrivateCar.getDriverId(), 3, orderPrivateCar.getId(), 1, c.doubleValue());
			Driver driver = driverService.selectById(orderPrivateCar.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(orderPrivateCar.getId());//删除定时任务

			pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0);
			}
			pushUtil.pushOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0);

			//添加消息
			systemNoticeService.addSystemNotice(1, language == 1 ? "您已使用余额成功支付取消订单费用，谢谢使用！" : language == 2
			? "You have successfully paid the cancellation fee, thank you for using!"
			: "Vous avez payé avec succès les frais d’annulation de commande, merci d’utiliser!", orderPrivateCar.getUserId(), 1);
			? "You've paid for cancellation fee with the balance successfully, thank you for using I-GO"
			: "Vous avez utilisé avec succès votre solde pour payer les frais d’annulation, merci d’utiliser I-GO", orderPrivateCar.getUserId(), 1);
			}else{
			System.err.println("预支付数据异常（orderId = " + id + ")");
			}
			@@ -1847,16 +2122,38 @@
			if(1 == language){
			document.getElementById("english").remove();
			document.getElementById("french").remove();
			document.getElementsByTag("title").get(0).text("I-GO电子收据");
			Element title_chinese = document.getElementById("title_chinese");
			title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，您在I-GO1个订单消费GHS " + orderPrivateCar.getPayMoney());
			title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，您在I-GO此订单消费GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			Element xcf_chinese = document.getElementById("xcf_chinese");
			xcf_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
			xcf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
			if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
			Element yhq_chinese = document.getElementById("yhq_chinese");
			yhq_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element yhq_chinese_div = document.getElementById("yhq_chinese_div");
			yhq_chinese_div.remove();
			}
			if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
			Element zk_chinese = document.getElementById("zk_chinese");
			zk_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element zk_chinese_div = document.getElementById("zk_chinese_div");
			zk_chinese_div.remove();
			}
			if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
			Element hb_chinese = document.getElementById("hb_chinese");
			hb_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element hb_chinese_div = document.getElementById("hb_chinese_div");
			hb_chinese_div.remove();
			}
			Element xj_chinese = document.getElementById("xj_chinese");
			xj_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
			xj_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			Element pay_type_chinese = document.getElementById("pay_type_chinese");
			pay_type_chinese.text(orderPrivateCar.getPayType() == 1 ? "手机" : "银行卡");
			pay_type_chinese.text(orderPrivateCar.getPayType() == 1 ? "手机支付" : (orderPrivateCar.getPayType() == 2?"银行卡支付":(orderPrivateCar.getPayType() == 3?"余额支付":"现金支付")));
			Element pay_money_chinese = document.getElementById("pay_money_chinese");
			pay_money_chinese.text("GHS " + orderPrivateCar.getPayMoney());
			pay_money_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			Element pdf_chinese = document.getElementById("pdf_chinese");
			pdf_chinese.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + id + "&orderType=1");
			Element lost_item_chinese = document.getElementById("lost_item_chinese");
			@@ -1868,7 +2165,7 @@
			Elements driver_chinese = document.getElementsByClass("driver_chinese");
			for (int i = 0; i < driver_chinese.size(); i++) {
			Element element = driver_chinese.get(i);
			element.text(driver.getFirstName() + "." + driver.getLastName());
			element.text(" " + driver.getFirstName() + "." + driver.getLastName());
			}
			Element cp_chinese = document.getElementById("cp_chinese");
			cp_chinese.text("车牌：" + car.getCarLicensePlate());
			@@ -1891,16 +2188,38 @@
			if(2 == language){
			document.getElementById("chinese").remove();
			document.getElementById("french").remove();
			document.getElementsByTag("title").get(0).text("Receipt");
			Element title_english = document.getElementById("title_english");
			title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，You spent GHS " + orderPrivateCar.getPayMoney() + " on the trip ");
			title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，You spent GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " on the trip ");
			Element xcf_english = document.getElementById("xcf_english");
			xcf_english.text("GHS " + orderPrivateCar.getOrderMoney());
			xcf_english.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
			if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
			Element yhq_english = document.getElementById("yhq_english");
			yhq_english.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element yhq_english_div = document.getElementById("yhq_english_div");
			yhq_english_div.remove();
			}
			if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
			Element zk_english = document.getElementById("zk_english");
			zk_english.text("GHS -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element zk_english_div = document.getElementById("zk_english_div");
			zk_english_div.remove();
			}
			if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
			Element hb_english = document.getElementById("hb_english");
			hb_english.text("GHS -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element hb_english_div = document.getElementById("hb_english_div");
			hb_english_div.remove();
			}
			Element xj_english = document.getElementById("xj_english");
			xj_english.text("GHS " + orderPrivateCar.getOrderMoney());
			xj_english.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			Element pay_type_english = document.getElementById("pay_type_english");
			pay_type_english.text(orderPrivateCar.getPayType() == 1 ? "Mobile" : "Bank card");
			pay_type_english.text(orderPrivateCar.getPayType() == 1 ? "Mobile money" :(orderPrivateCar.getPayType() == 2?"Bank card":(orderPrivateCar.getPayType() == 3?"I-GO Wallet":"Cash")));
			Element pay_money_english = document.getElementById("pay_money_english");
			pay_money_english.text("GHS " + orderPrivateCar.getPayMoney());
			pay_money_english.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			Element pdf_english = document.getElementById("pdf_english");
			pdf_english.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + id + "&orderType=1");
			Element lost_item_english = document.getElementById("lost_item_english");
			@@ -1912,7 +2231,7 @@
			Elements driver_english = document.getElementsByClass("driver_english");
			for (int i = 0; i < driver_english.size(); i++) {
			Element element = driver_english.get(i);
			element.text(driver.getFirstName() + "." + driver.getLastName());
			element.text(" " + driver.getFirstName() + "." + driver.getLastName());
			}
			Element cp_english = document.getElementById("cp_english");
			cp_english.text("Number Plate：" + car.getCarLicensePlate());
			@@ -1935,16 +2254,38 @@
			if(3 == language){
			document.getElementById("chinese").remove();
			document.getElementById("english").remove();
			document.getElementsByTag("title").get(0).text("Reçu");
			Element title_french = document.getElementById("title_french");
			title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + orderPrivateCar.getPayMoney() + " sur le voyage");
			title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " sur le voyage");
			Element xcf_french = document.getElementById("xcf_french");
			xcf_french.text("GHS " + orderPrivateCar.getOrderMoney());
			xcf_french.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
			if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
			Element yhq_french = document.getElementById("yhq_french");
			yhq_french.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element yhq_french_div = document.getElementById("yhq_french_div");
			yhq_french_div.remove();
			}
			if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
			Element zk_french = document.getElementById("zk_french");
			zk_french.text("GHS -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element zk_french_div = document.getElementById("zk_french_div");
			zk_french_div.remove();
			}
			if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
			Element hb_french = document.getElementById("hb_french");
			hb_french.text("GHS -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
			}else{
			Element hb_french_div = document.getElementById("hb_french_div");
			hb_french_div.remove();
			}
			Element xj_french = document.getElementById("xj_french");
			xj_french.text("GHS " + orderPrivateCar.getOrderMoney());
			xj_french.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			Element pay_type_french = document.getElementById("pay_type_french");
			pay_type_french.text(orderPrivateCar.getPayType() == 1 ? "Mobile" : "Carte bancaire");
			pay_type_french.text(orderPrivateCar.getPayType() == 1 ? "Argent mobile" : (orderPrivateCar.getPayType() == 2?"Carte bancaire":(orderPrivateCar.getPayType() == 3?"Portefeuille I-GO":"En espèces")));
			Element pay_money_french = document.getElementById("pay_money_french");
			pay_money_french.text("GHS " + orderPrivateCar.getPayMoney());
			pay_money_french.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			Element pdf_french = document.getElementById("pdf_french");
			pdf_french.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + id + "&orderType=1");
			Element lost_item_french = document.getElementById("lost_item_french");
			@@ -1956,7 +2297,7 @@
			Elements driver_french = document.getElementsByClass("driver_french");
			for (int i = 0; i < driver_french.size(); i++) {
			Element element = driver_french.get(i);
			element.text(driver.getFirstName() + "." + driver.getLastName());
			element.text(" " + driver.getFirstName() + "." + driver.getLastName());
			}
			Element cp_french = document.getElementById("cp_french");
			cp_french.text("Plaque: GS " + car.getCarLicensePlate());
			@@ -1977,7 +2318,7 @@
			server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
			}

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

			//开始生成pdf收据和html收据
			File file = new File("/usr/local/nginx/html/files/html/");
			@@ -1992,7 +2333,7 @@
			fileWriter.write(document.html());
			fileWriter.flush();
			fileWriter.close();
			FileInputStream fileInputStream = new FileInputStream(file);

			File file1 = new File("/usr/local/nginx/html/files/pdf/");
			if(!file1.exists()){
			file1.mkdirs();
			@@ -2001,14 +2342,19 @@
			if(!file1.exists()){
			file1.createNewFile();
			}
			FileOutputStream fileOutputStream = new FileOutputStream(file1);
			HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
			try {
			FileOutputStream fileOutputStream = new FileOutputStream(file1);
			HtmlToPdfUtils.convertToPdf("/usr/local/nginx/html/files/html/ride_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/ride_receipt_" + id + ".html";
			TEmail tEmail = new TEmail();
			tEmail.setLink(link);
			tEmail.setName( language == 1 ? "打车收据" : language == 2 ? "Ride receipt" : "Reçu de Ride");
			tEmail.setName(language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu");
			tEmail.setUserId(userInfo.getId());
			tEmail.setType(1);
			tEmail.setOrderId(id);
			@@ -2017,9 +2363,9 @@
			tEmail.setWeek(EmailUtil.getWeek(language,i));
			boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
			if(am){
			tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
			tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
			}else {
			tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
			tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
			}
			emailService.insert(tEmail);

			@@ -2041,8 +2387,8 @@
			}).start();

			systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成出行订单支付，谢谢使用！" : language == 2
			? "You have successfully completed the travel order payment, thank you for using!"
			: "Vous avez complété avec succès le paiement de votre commande de voyage. Merci d’utiliser!", orderPrivateCar.getUserId(), 1);
			? "You've paid for the ride order successfully, thank you for using I-GO"
			: "Vous avez payé la commande de course avec succès, merci d’utiliser I-GO", orderPrivateCar.getUserId(), 1);
			}else{
			System.err.println("预支付数据异常（orderId = " + id + ")");
			}
			@@ -2058,10 +2404,14 @@
			pageNum = (pageNum - 1) * size;
			List<Map<String, Object>> maps = orderPrivateCarMapper.queryMyOrderList(uid, pageNum, size);
			for(Map<String, Object> map : maps){
			String orderTime = map.get("orderTime").toString();
			map.put("orderTime", DateUtil.conversionFormat(language, orderTime));
			String time = map.get("time").toString();
			map.put("time", DateUtil.conversionFormat1(language, time));
			if(null != map.get("orderTime")){
			String orderTime = map.get("orderTime").toString();
			map.put("orderTime", DateUtil.conversionFormat(language, orderTime));
			}
			if(null != map.get("time")){
			String time = map.get("time").toString();
			map.put("time", DateUtil.conversionFormat1(language, time));
			}
			Integer orderId = Integer.valueOf(String.valueOf(map.get("orderId")));
			Integer state = Integer.valueOf(String.valueOf(map.get("state")));
			if(state == 11){
			@@ -2082,8 +2432,11 @@
			endTime = dateUtil.getStartOrEndDate(endTime, "end");
			List<Map<String, Object>> list = orderPrivateCarMapper.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid);
			for (Map<String, Object> map : list) {
			String time = map.get("time").toString();
			map.put("time", DateUtil.conversionFormat(language, time));
			map.put("orderName", language == 1 ? "打车订单" : language == 2 ? "Ride" : "Course");
			if(null != map.get("time")){
			String time = map.get("time").toString();
			map.put("time", DateUtil.conversionFormat(language, time));
			}
			}
			return list;
			}
			@@ -2091,8 +2444,10 @@
			@Override
			public Map<String, Object> queryOrderInfo(Integer language, Integer orderId) throws Exception {
			Map<String, Object> map = orderPrivateCarMapper.queryOrderInfo(orderId);
			String travelTime = map.get("travelTime").toString();
			map.put("travelTime", DateUtil.conversionFormat1(language, travelTime));
			if(null != map.get("travelTime")){
			String travelTime = map.get("travelTime").toString();
			map.put("travelTime", DateUtil.conversionFormat1(language, travelTime));
			}
			Integer state = Integer.valueOf(String.valueOf(map.get("state")));
			if(null != map.get("reassignNotice") && Integer.valueOf(String.valueOf(map.get("reassignNotice"))) == 2){//改派完成，重新获取了新的司机数据，开始修改数据防止继续调用
			OrderPrivateCar orderPrivateCar = this.selectById(orderId);
			@@ -2139,8 +2494,10 @@
			public List<Map<String, Object>> queryMyTravelRecord(Integer language, Integer uid) throws Exception {
			List<Map<String, Object>> list = orderPrivateCarMapper.queryMyTravelRecord(uid);
			for (Map<String, Object> map : list) {
			String time = map.get("time").toString();
			map.put("time", DateUtil.conversionFormat(language, time));
			if(null != map.get("time")){
			String time = map.get("time").toString();
			map.put("time", DateUtil.conversionFormat(language, time));
			}
			}
			return list;
			}
			@@ -2258,8 +2615,11 @@
			public List<Map<String, Object>> queryRedEnvelope(Integer language, Integer uid) throws Exception {
			List<Map<String, Object>> list = orderPrivateCarMapper.queryRedEnvelope(uid);
			for (Map<String, Object> map : list) {
			String time = map.get("time").toString();
			map.put("time", DateUtil.conversionFormat(language, time));
			map.put("name", language == 1 ? "打车订单" : language == 2 ? "Ride" : "Course");
			if(null != map.get("time")){
			String time = map.get("time").toString();
			map.put("time", DateUtil.conversionFormat(language, time));
			}
			}
			return list;
			}
			@@ -2293,4 +2653,29 @@
			}
			return endPushWarpper;
			}


			/**
			* 修改目的地
			* @param orderId
			* @param endLon
			* @param endLat
			* @param endAddress
			*/
			@Override
			public void updateEndAddress(Integer orderId, String endLon, String endLat, String endAddress) {
			OrderPrivateCar orderPrivateCar = this.selectById(orderId);
			if(null != orderPrivateCar.getDriverId()){
			orderPrivateCar.setDestination(endAddress);
			orderPrivateCar.setDestinationLat(endLat);
			orderPrivateCar.setDestinationLon(endLon);
			this.updateById(orderPrivateCar);
			pushUtil.pushModifyAddress(2, orderPrivateCar.getDriverId(), orderId, 1, 1);
			}else{
			orderPrivateCar.setEndAddress(endAddress);
			orderPrivateCar.setEndLat(Double.valueOf(endLat));
			orderPrivateCar.setEndLon(Double.valueOf(endLon));
			this.updateById(orderPrivateCar);
			}
			}
			}