java/ZhaoYangChuXing.git

			@@ -18,10 +18,7 @@
			import com.stylefeng.guns.modular.system.service.*;
			import com.stylefeng.guns.modular.system.service.impl.OrderPositionServiceImpl;
			import com.stylefeng.guns.modular.system.util.*;
			import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
			import com.stylefeng.guns.modular.system.warpper.EndPushWarpper;
			import com.stylefeng.guns.modular.system.warpper.OrderInfoWarpper;
			import com.stylefeng.guns.modular.system.warpper.OrderServerWarpper;
			import com.stylefeng.guns.modular.system.warpper.*;
			import com.stylefeng.guns.modular.taxi.dao.OrderTaxiMapper;
			import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
			import com.stylefeng.guns.modular.taxi.model.PaymentRecord;
			@@ -35,8 +32,10 @@
			import org.springframework.http.MediaType;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.util.CollectionUtils;
			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;
			@@ -167,11 +166,14 @@

			@Autowired
			private IAssignOrderService assignOrderService;

			// @Autowired
			// private ALiSendSms aLiSendSms;


			@Autowired
			private IOpenCityService openCityService;
			@Autowired
			private IServerCarModelService serverCarModelService;
			@Autowired
			private IAppOpenInfoService appOpenInfoService;
			@Resource
			private UserInfoMapper userInfoMapper;
			@Value("${filePath}")
			private String filePath;

			@@ -207,7 +209,8 @@
			*/
			@Override
			public synchronized ResultUtil<BaseWarpper> saveOrderPrivateCar(Integer serverCarModelId, Date travelTime, Integer reservation, Integer instead, String placementLon, String placementLat, String startLon, String startLat,
			String startAddress, String endLon, String endLat, String endAddress, String name, String phone, Integer orderSource, Integer driverId, Integer type, Integer uid,BigDecimal estimatedPrice) throws Exception {
			String startAddress, String endLon, String endLat, String endAddress, String name, String phone, Integer orderSource, Integer driverId, Integer type, Integer uid,
			BigDecimal estimatedPrice,String cityCode,Integer carIndex) throws Exception {

			//如果出行时间大于当前10分钟则默认为预约单
			if(travelTime.getTime() > (System.currentTimeMillis() + 600000)){
			@@ -285,25 +288,24 @@
			orderPrivateCar.setTravelTime(travelTime);
			orderPrivateCar.setOrderType(reservation);
			orderPrivateCar.setOrderSource(orderSource);
			orderPrivateCar.setEstimatedPrice(estimatedPrice);
			Driver driver2 = driverService.selectById(driverId);
			if(orderSource == 2){//扫码下单
			Driver driver = driverService.selectById(driverId);
			if(null == driver){
			if(null == driver2){
			return ResultUtil.error("司机信息有误，无法完成下单");
			}
			if(driver.getAuthState() == 1){
			if(driver2.getAuthState() == 1){
			return ResultUtil.error("司机信息还未完成审核，无法完成下单");
			}
			if(driver.getAuthState() == 3){
			if(driver2.getAuthState() == 3){
			return ResultUtil.error("司机账户已被冻结，无法提供服务");
			}
			if(driver.getAuthState() == 4){
			if(driver2.getAuthState() == 4){
			return ResultUtil.error("司机信息未通过审核，无法提供服务");
			}
			if(driver.getState() == 1){
			if(driver2.getState() == 1){
			return ResultUtil.error("司机还未上线，无法提供服务");
			}
			if(driver.getState() == 3){
			if(driver2.getState() == 3){
			return ResultUtil.error("司机正在服务中，无法提供服务");
			}
			List<DriverService> query = driverServiceService.query(driverId, 1);
			@@ -312,200 +314,525 @@
			}

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

			//调用高德创建轨迹
			// String s = gdFalconUtil.selectTerminal(driver.getPhone());
			// String track = gdFalconUtil.createTrack(s);
			// JSONObject jsonObject = JSONObject.parseObject(track);
			// orderPrivateCar.setTrackId(String.valueOf(jsonObject.getInteger("trid")));

			//调用移动的小号接口
			/* Map<String, String> geocode1 = gdMapGeocodingUtil.geocode(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
			Region region = regionMapper.query(geocode1.get("districtCode"));*/
			// Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderPrivateCar.getPassengersPhone(), driver.getPhone(), null);
			// if(String.valueOf(map.get("code")).equals("200")){
			// orderPrivateCar.setTelX(map.get("telX"));
			// orderPrivateCar.setBindId(map.get("bindId"));
			// }

			driver.setState(3);
			driverService.updateById(driver);
			driver2.setState(3);
			driverService.updateById(driver2);
			}
			// 查询城市的订单额度
			OpenCity openCity = openCityService.selectOne(new EntityWrapper<OpenCity>()
			.eq("code", cityCode)
			.ne("flag", 3)
			.orderBy("orderMagnitude", false)
			.last("LIMIT 1"));
			if(Objects.isNull(openCity)){
			String city = cityCode.substring(0, 4) + "00";
			openCity = openCityService.selectOne(new EntityWrapper<OpenCity>()
			.eq("code", city)
			.ne("flag", 3)
			.orderBy("orderMagnitude", false)
			.last("LIMIT 1"));
			}

			orderPrivateCar.setIsReassign(1);
			orderPrivateCar.setIsDelete(1);
			this.insert(orderPrivateCar);

			if(orderSource == 2){//扫码下单
			new Thread(new Runnable() {
			@Override
			public void run() {
			pushUtil.pushOrderState(1, uid, orderPrivateCar.getId(), 1, 2, 0);
			pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, 2, 0);
			pushUtil.pushDriverPosition(orderPrivateCar.getId(), 1);
			}
			}).start();
			}


			// TODO: 2021/5/11 修改，根据后台设定的派单范围查询范围内有无司机，将单子指派给距离最近的司机（距离相同随机取），范围内没有司机再进行推单流程
			if(orderPrivateCar.getState() == 1){
			Company query = companyCityService.query(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
			if(null == query){
			return ResultUtil.error("起点暂未企业提供服务");
			// 查询预估价格
			ResultUtil<List<ServerCarModelWarpper>> listResultUtil = serverCarModelService.queryServerCarModel(startLon + "," + startLat, endLon + "," + endLat, 1);
			List<ServerCarModelWarpper> data = listResultUtil.getData();
			if(Objects.isNull(serverCarModelId)){
			//获取经营业务
			CarService query = new CarService();
			query.setCarId(driver2.getCarId());
			CarService service = carServiceMapper.selectOne(query);
			if(Objects.nonNull(service)){
			serverCarModelId = service.getServerCarModelId();
			}
			AssignOrder assignOrder = assignOrderService.selectOne(new EntityWrapper<AssignOrder>().eq("companyId", query.getId()).eq("type", 1));
			if(null != assignOrder){//配置了指派规则才处理
			boolean lock = redisUtil.lock("order_lock", 10);
			if(!lock){
			int num1 = 1;
			while (num1 <= 10){
			Thread.sleep(3000);//等待3秒
			lock = redisUtil.lock("order_lock", 10);
			if(lock){
			break;
			}else{
			num1++;
			}
			Integer finalServerCarModelId = serverCarModelId;
			data = data.stream().filter(e -> finalServerCarModelId.equals(e.getId())).sorted(Comparator.comparing(ServerCarModelWarpper::getAmount)).collect(Collectors.toList());
			if(Objects.nonNull(openCity) && !CollectionUtils.isEmpty(data) && BigDecimal.valueOf(data.get(0).getAmount()).compareTo(openCity.getOrderMagnitude()) > 0){
			orderPrivateCar.setIsReassign(1);
			orderPrivateCar.setIsDelete(1);
			orderPrivateCar.setState(7);
			if(orderSource == 2){
			orderPrivateCar.setOrderMoney(data.get(0).getAmount());
			orderPrivateCar.setEstimatedPrice(data.get(0).getAmount());
			}else {
			orderPrivateCar.setOrderMoney(data.get(carIndex).getAmount());
			orderPrivateCar.setEstimatedPrice(data.get(carIndex).getAmount());
			}
			orderPrivateCar.setPayMethod(0);
			this.insert(orderPrivateCar);
			BaseWarpper baseWarpper = new BaseWarpper();
			baseWarpper.setId(orderPrivateCar.getId());
			baseWarpper.setState(orderPrivateCar.getState());
			baseWarpper.setPayMethod(0);
			baseWarpper.setAmount(orderPrivateCar.getOrderMoney());
			return ResultUtil.success(baseWarpper);
			}else {
			if(orderSource == 2){
			if(!CollectionUtils.isEmpty(data)){
			orderPrivateCar.setEstimatedPrice(data.get(0).getAmount());
			}
			}else {
			orderPrivateCar.setEstimatedPrice(data.get(carIndex).getAmount());
			}
			orderPrivateCar.setIsReassign(1);
			orderPrivateCar.setIsDelete(1);
			orderPrivateCar.setPayMethod(1);
			this.insert(orderPrivateCar);

			if(orderSource == 2){//扫码下单
			new Thread(new Runnable() {
			@Override
			public void run() {
			pushUtil.pushOrderState(1, uid, orderPrivateCar.getId(), 1, 2, 0);
			pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, 2, 0);
			pushUtil.pushDriverPosition(orderPrivateCar.getId(), 1);
			}
			}).start();
			}


			// TODO: 2021/5/11 修改，根据后台设定的派单范围查询范围内有无司机，将单子指派给距离最近的司机（距离相同随机取），范围内没有司机再进行推单流程
			if(orderPrivateCar.getState() == 1){
			Company query = companyCityService.query(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
			if(null == query){
			return ResultUtil.error("起点暂未企业提供服务");
			}
			AssignOrder assignOrder = assignOrderService.selectOne(new EntityWrapper<AssignOrder>().eq("companyId", query.getId()).eq("type", 1));
			if(null != assignOrder){//配置了指派规则才处理
			boolean lock = redisUtil.lock("order_lock", 10);
			if(!lock){
			int num1 = 1;
			while (num1 <= 10){
			Thread.sleep(3000);//等待3秒
			lock = redisUtil.lock("order_lock", 10);
			if(lock){
			break;
			}else{
			num1++;
			}
			}
			}
			}
			try {
			//获取空闲司机
			List<Driver> drivers = driverService.queryIdleDriver(1, orderPrivateCar.getServerCarModelId(), orderPrivateCar.getStartLon(), orderPrivateCar.getStartLat(), assignOrder.getDistance(), null);//获取范围内空闲司机
			List<Integer> driverIds = drivers.stream().map(Driver::getId).collect(Collectors.toList());
			if(drivers.size() > 0) {//有司机，直接指派给司机
			Driver dr = null;
			if (drivers.size() > 1) {
			List<Driver> ds = new ArrayList<>();//存储直线距离最近的几个司机
			for (int i = 0; i < assignOrder.getPeople(); i++) {
			Driver driver = null;
			int m = 0;
			int index = 0;
			// 查询预约单
			List<OrderPrivateCar> orderPrivateCarss = orderPrivateCarMapper.queryOrderByState(driverIds, 2, 1, 2, 3, 4, 5, 6, 11);
			List<Integer> orderPrivateCarDriverIds = orderPrivateCars.stream().map(OrderPrivateCar::getDriverId).collect(Collectors.toList());
			for (int j = 0; j < drivers.size(); j++) {
			Driver driver1 = drivers.get(j);
			if (orderPrivateCar.getOrderType() == 2 && orderPrivateCarDriverIds.contains(driver.getId())) {
			continue;
			}
			// 判断该司机是否有30分钟内预约单
			long count = orderPrivateCarss.stream().filter(s -> s.getDriverId().equals(driver1.getId()) &&
			DateUtil.dateToLocalDateTime(s.getTravelTime()).minusMinutes(query.getLimitationTime()).isBefore(LocalDateTime.now())).count();
			if (count > 0) {
			continue;
			}
			String value = redisUtil.getValue("DRIVER" + drivers.get(j).getId());
			if (null != value) {
			try {
			//获取空闲司机
			List<Driver> drivers = driverService.queryIdleDriver(1, orderPrivateCar.getServerCarModelId(), orderPrivateCar.getStartLon(), orderPrivateCar.getStartLat(), assignOrder.getDistance(), null);//获取范围内空闲司机
			List<Integer> driverIds = drivers.stream().map(Driver::getId).collect(Collectors.toList());
			if(drivers.size() > 0) {//有司机，直接指派给司机
			Driver dr = null;
			if (drivers.size() > 1) {
			List<Driver> ds = new ArrayList<>();//存储直线距离最近的几个司机
			for (int i = 0; i < assignOrder.getPeople(); i++) {
			Driver driver = null;
			int m = 0;
			int index = 0;
			// 查询预约单
			List<OrderPrivateCar> orderPrivateCarss = orderPrivateCarMapper.queryOrderByState(driverIds, 2, 1, 2, 3, 4, 5, 6, 11);
			List<Integer> orderPrivateCarDriverIds = orderPrivateCars.stream().map(OrderPrivateCar::getDriverId).collect(Collectors.toList());
			for (int j = 0; j < drivers.size(); j++) {
			Driver driver1 = drivers.get(j);
			if (orderPrivateCar.getOrderType() == 2 && orderPrivateCarDriverIds.contains(driver.getId())) {
			continue;
			}
			// 判断该司机是否有30分钟内预约单
			long count = orderPrivateCarss.stream().filter(s -> s.getDriverId().equals(driver1.getId()) &&
			DateUtil.dateToLocalDateTime(s.getTravelTime()).minusMinutes(query.getLimitationTime()).isBefore(LocalDateTime.now())).count();
			if (count > 0) {
			continue;
			}
			String value = redisUtil.getValue("DRIVER" + drivers.get(j).getId());
			if (null != value) {
			// Map<String, String> distance1 = gdMapElectricFenceUtil.getDistance(orderPrivateCar.getStartLon() + "," + orderPrivateCar.getStartLat(), value, 0);//计算距离
			// Integer d = Integer.valueOf(distance1.get("distance"));
			String[] split = value.split(",");
			double distance = GDMapGeocodingUtil.getDistance(orderPrivateCar.getStartLat(), orderPrivateCar.getStartLon(), Double.valueOf(split[1]), Double.valueOf(split[0]));
			int d = Double.valueOf(distance).intValue();
			if ((0 == m && null == driver) \|\| (d < m)) {
			driver = drivers.get(j);
			String[] split = value.split(",");
			double distance = GDMapGeocodingUtil.getDistance(orderPrivateCar.getStartLat(), orderPrivateCar.getStartLon(), Double.valueOf(split[1]), Double.valueOf(split[0]));
			int d = Double.valueOf(distance).intValue();
			if ((0 == m && null == driver) \|\| (d < m)) {
			driver = drivers.get(j);
			m = d;
			index = j;
			}
			}
			}
			ds.add(driver);
			drivers.remove(index);
			}

			//再根据直线距离最短的司机中找出行驶距离最短的司机
			Integer m = 0;
			for (Driver driver : ds) {
			String value = redisUtil.getValue("DRIVER" + driver.getId());
			if (null != value) {
			Map<String, String> distance1 = gdMapElectricFenceUtil.getDistance(orderPrivateCar.getStartLon() + "," + orderPrivateCar.getStartLat(), value, 1);//计算距离
			Integer d = Integer.valueOf(distance1.get("distance"));
			if ((0 == m && null == dr) \|\| (d.intValue() < m.intValue())) {
			dr = driver;
			m = d;
			index = j;
			}
			}
			}
			ds.add(driver);
			drivers.remove(index);
			} else {
			List<OrderPrivateCar> orderPrivateCarss = orderPrivateCarMapper.queryOrderByState(driverIds, 2, 1, 2, 3, 4, 5, 6, 11);
			if (orderPrivateCarss.size() == 0) {
			dr = drivers.get(0);
			}
			}

			//再根据直线距离最短的司机中找出行驶距离最短的司机
			Integer m = 0;
			for (Driver driver : ds) {
			String value = redisUtil.getValue("DRIVER" + driver.getId());
			if (null != value) {
			Map<String, String> distance1 = gdMapElectricFenceUtil.getDistance(orderPrivateCar.getStartLon() + "," + orderPrivateCar.getStartLat(), value, 1);//计算距离
			Integer d = Integer.valueOf(distance1.get("distance"));
			if ((0 == m && null == dr) \|\| (d.intValue() < m.intValue())) {
			dr = driver;
			m = d;

			if (Objects.nonNull(dr)) {
			orderPrivateCar.setDriverId(dr.getId());
			orderPrivateCar.setCompanyId(dr.getFranchiseeId() != null && dr.getFranchiseeId() != 0 ? dr.getFranchiseeId() : (
			dr.getCompanyId() != null && dr.getCompanyId() != 0 ? dr.getCompanyId() : 1));
			orderPrivateCar.setState(2);
			orderPrivateCar.setCarId(dr.getCarId());
			CarService query1 = carServiceMapper.query(1, dr.getCarId());
			orderPrivateCar.setServerCarModelId(query1.getServerCarModelId());
			orderPrivateCar.setSnatchOrderTime(new Date());
			if (orderPrivateCar.getOrderType() != 2) {
			dr.setState(3);
			}
			driverService.updateById(dr);
			new Thread(new Runnable() {
			@Override
			public void run() {
			pushUtil.pushOrderState(1, uid, orderPrivateCar.getId(), 1, 2, 0);
			pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, 2, 0);
			pushUtil.pushDriverPosition(orderPrivateCar.getId(), 1);
			}
			}
			}).start();
			}
			} else {
			List<OrderPrivateCar> orderPrivateCarss = orderPrivateCarMapper.queryOrderByState(driverIds, 2, 1, 2, 3, 4, 5, 6, 11);
			if (orderPrivateCarss.size() == 0) {
			dr = drivers.get(0);
			}
			}

			if (Objects.nonNull(dr)) {
			orderPrivateCar.setDriverId(dr.getId());
			orderPrivateCar.setCompanyId(dr.getFranchiseeId() != null && dr.getFranchiseeId() != 0 ? dr.getFranchiseeId() : (
			dr.getCompanyId() != null && dr.getCompanyId() != 0 ? dr.getCompanyId() : 1));
			orderPrivateCar.setState(2);
			orderPrivateCar.setCarId(dr.getCarId());
			CarService query1 = carServiceMapper.query(1, dr.getCarId());
			orderPrivateCar.setServerCarModelId(query1.getServerCarModelId());
			orderPrivateCar.setSnatchOrderTime(new Date());
			if (orderPrivateCar.getOrderType() != 2) {
			dr.setState(3);
			}
			driverService.updateById(dr);
			new Thread(new Runnable() {
			@Override
			public void run() {
			pushUtil.pushOrderState(1, uid, orderPrivateCar.getId(), 1, 2, 0);
			pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, 2, 0);
			pushUtil.pushDriverPosition(orderPrivateCar.getId(), 1);
			}
			}).start();
			}


			//调用高德创建轨迹
			// String s = gdFalconUtil.selectTerminal(dr.getPhone());
			// String track = gdFalconUtil.createTrack(s);
			// orderPrivateCar.setTrackId(track);

			//调用移动的小号接口
			/* Map<String, String> geocode1 = gdMapGeocodingUtil.geocode(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
			Region region = regionMapper.query(geocode1.get("districtCode"));*/
			// Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderPrivateCar.getPassengersPhone(), dr.getPhone(), null);
			// if(String.valueOf(map.get("code")).equals("200")){
			// orderPrivateCar.setTelX(map.get("telX"));
			// orderPrivateCar.setBindId(map.get("bindId"));
			// }

			this.updateById(orderPrivateCar);

			//发送短信给司机
			this.updateById(orderPrivateCar);

			//发送短信给司机
			// aLiSendSms.sendSms(dr.getPhone(), "SMS_216832951", "{\"" + orderPrivateCar.getStartAddress() + "\"}");
			}
			}catch (Exception e){
			e.printStackTrace();
			}finally {
			redisUtil.unlock("order_lock");
			}
			}catch (Exception e){
			e.printStackTrace();
			}finally {
			redisUtil.unlock("order_lock");
			}
			}


			//推单操作
			if(orderPrivateCar.getState() == 1){
			this.pushOrder(orderPrivateCar);
			}
			//添加消息
			systemNoticeService.addSystemNotice(1, "您的专车订单已下单成功，我们正在为您指派司机，请稍后！", orderPrivateCar.getUserId(), 1);
			BaseWarpper baseWarpper = new BaseWarpper();
			baseWarpper.setState(orderPrivateCar.getState());
			baseWarpper.setId(orderPrivateCar.getId());
			baseWarpper.setPayMethod(1);
			return ResultUtil.success(baseWarpper);
			}


			//推单操作
			if(orderPrivateCar.getState() == 1){
			this.pushOrder(orderPrivateCar);
			}


			//添加消息
			systemNoticeService.addSystemNotice(1, "您的专车订单已下单成功，我们正在为您指派司机，请稍后！", orderPrivateCar.getUserId(), 1);

			BaseWarpper baseWarpper = new BaseWarpper();
			baseWarpper.setState(orderPrivateCar.getState());
			baseWarpper.setId(orderPrivateCar.getId());
			return ResultUtil.success(baseWarpper);
			}

			// @Override
			// public synchronized ResultUtil<BaseWarpper> saveOrderPrivateCar(Integer serverCarModelId, Date travelTime, Integer reservation, Integer instead, String placementLon, String placementLat, String startLon, String startLat,
			// String startAddress, String endLon, String endLat, String endAddress, String name, String phone, Integer orderSource, Integer driverId, Integer type, Integer uid,BigDecimal estimatedPrice) throws Exception {
			//
			// //如果出行时间大于当前10分钟则默认为预约单
			// if(travelTime.getTime() > (System.currentTimeMillis() + 600000)){
			// reservation = 2;
			// }
			//
			// /**
			// * 1.下了即时单就不能下预约单和即时单
			// * 2.下了预约单和再下一张即时单不能再下预约单
			// */
			// List<OrderPrivateCar> orderPrivateCars = orderPrivateCarMapper.queryByState(uid, 1, 1, 1, 2, 3, 4, 5, 6, 11);
			// if(orderPrivateCars.size() > 0){
			// return ResultUtil.error("有未完成的订单");
			// }
			// List<OrderTaxi> list = orderTaxiMapper.queryByState_(uid, 1, 1, 1, 2, 3, 4, 5, 6, 11);
			// if(list.size() > 0){
			// return ResultUtil.error("有未完成的订单");
			// }
			//
			// orderPrivateCars = orderPrivateCarMapper.queryByState(uid, 2, 1, 1, 2, 3, 4, 5, 6, 11);
			// if(orderPrivateCars.size() > 0 && reservation == 2){
			// return ResultUtil.error("有未完成的订单");
			// }
			//
			// orderPrivateCars = orderPrivateCarMapper.queryByState(uid, 1, 1, 7,12);
			// if(orderPrivateCars.size() > 0){
			// BaseWarpper baseWarpper = new BaseWarpper();
			// baseWarpper.setState(7);
			// baseWarpper.setId(orderPrivateCars.get(0).getId());
			// return ResultUtil.success(baseWarpper);
			// }
			//
			//
			// list = orderTaxiMapper.queryByState_(uid, 2, 1, 1, 2, 3, 4, 5, 6, 11);
			// if(list.size() > 0 && reservation == 2){
			// return ResultUtil.error("有未完成的订单");
			// }
			//
			// startAddress = startAddress.replaceAll("& #40;", "(");
			// startAddress = startAddress.replaceAll("& #41;", ")");
			// endAddress = endAddress.replaceAll("& #40;", "(");
			// endAddress = endAddress.replaceAll("& #41;", ")");
			// if((orderSource == 1 \|\| orderSource == 3) && null == serverCarModelId){
			// return ResultUtil.error("请选择服务车型");
			// }
			//
			// OrderPrivateCar orderPrivateCar = new OrderPrivateCar();
			// orderPrivateCar.setType(type);
			// orderPrivateCar.setUserId(uid);
			// orderPrivateCar.setServerCarModelId(serverCarModelId);
			// orderPrivateCar.setOrderNum(this.getOrderNum());
			// orderPrivateCar.setPlacementLon(Double.valueOf(placementLon));
			// orderPrivateCar.setPlacementLat(Double.valueOf(placementLat));
			// Map<String, String> geocode = gdMapGeocodingUtil.geocode(placementLon, placementLat);
			// orderPrivateCar.setPlacementAddress(geocode.get("address"));
			// orderPrivateCar.setStartLon(Double.valueOf(startLon));
			// orderPrivateCar.setStartLat(Double.valueOf(startLat));
			// orderPrivateCar.setStartAddress(startAddress);
			// orderPrivateCar.setEndLon(Double.valueOf(endLon));
			// orderPrivateCar.setEndLat(Double.valueOf(endLat));
			// orderPrivateCar.setEndAddress(endAddress);
			// orderPrivateCar.setSubstitute(instead);
			// orderPrivateCar.setPassengers(name);
			// orderPrivateCar.setPassengersPhone(phone);
			// if(instead == 0 \|\| ToolUtil.isEmpty(orderPrivateCar.getPassengers())){
			// UserInfo userInfo = userInfoService.selectById(uid);
			// if(ToolUtil.isEmpty(userInfo.getPhone())){
			// return ResultUtil.error("请先绑定手机号码");
			// }
			// orderPrivateCar.setPassengers(userInfo.getName());
			// orderPrivateCar.setPassengersPhone(userInfo.getPhone());
			// }
			// orderPrivateCar.setState(1);
			// orderPrivateCar.setInsertTime(new Date());
			// orderPrivateCar.setTravelTime(travelTime);
			// orderPrivateCar.setOrderType(reservation);
			// orderPrivateCar.setOrderSource(orderSource);
			// orderPrivateCar.setEstimatedPrice(estimatedPrice);
			// if(orderSource == 2){//扫码下单
			// Driver driver = driverService.selectById(driverId);
			// if(null == driver){
			// return ResultUtil.error("司机信息有误，无法完成下单");
			// }
			// if(driver.getAuthState() == 1){
			// return ResultUtil.error("司机信息还未完成审核，无法完成下单");
			// }
			// if(driver.getAuthState() == 3){
			// return ResultUtil.error("司机账户已被冻结，无法提供服务");
			// }
			// if(driver.getAuthState() == 4){
			// return ResultUtil.error("司机信息未通过审核，无法提供服务");
			// }
			// if(driver.getState() == 1){
			// return ResultUtil.error("司机还未上线，无法提供服务");
			// }
			// if(driver.getState() == 3){
			// return ResultUtil.error("司机正在服务中，无法提供服务");
			// }
			// List<DriverService> query = driverServiceService.query(driverId, 1);
			// if(query.size() == 0){
			// return ResultUtil.error("该司机不能服务此业务");
			// }
			//
			// orderPrivateCar.setDriverId(driverId);
			// orderPrivateCar.setCompanyId(driver.getFranchiseeId() != null && driver.getFranchiseeId() != 0 ? driver.getFranchiseeId() : (
			// driver.getCompanyId() != null && driver.getCompanyId() != 0 ? driver.getCompanyId() : 1));
			// orderPrivateCar.setState(2);
			// orderPrivateCar.setCarId(driver.getCarId());
			// CarService query1 = carServiceMapper.query(1, driver.getCarId());
			// orderPrivateCar.setServerCarModelId(query1.getServerCarModelId());
			// orderPrivateCar.setSnatchOrderTime(new Date());
			//
			// //调用高德创建轨迹
			//// String s = gdFalconUtil.selectTerminal(driver.getPhone());
			//// String track = gdFalconUtil.createTrack(s);
			//// JSONObject jsonObject = JSONObject.parseObject(track);
			//// orderPrivateCar.setTrackId(String.valueOf(jsonObject.getInteger("trid")));
			//
			// //调用移动的小号接口
			// /* Map<String, String> geocode1 = gdMapGeocodingUtil.geocode(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
			// Region region = regionMapper.query(geocode1.get("districtCode"));*/
			//// Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderPrivateCar.getPassengersPhone(), driver.getPhone(), null);
			//// if(String.valueOf(map.get("code")).equals("200")){
			//// orderPrivateCar.setTelX(map.get("telX"));
			//// orderPrivateCar.setBindId(map.get("bindId"));
			//// }
			//
			// driver.setState(3);
			// driverService.updateById(driver);
			// }
			//
			// orderPrivateCar.setIsReassign(1);
			// orderPrivateCar.setIsDelete(1);
			// this.insert(orderPrivateCar);
			//
			// if(orderSource == 2){//扫码下单
			// new Thread(new Runnable() {
			// @Override
			// public void run() {
			// pushUtil.pushOrderState(1, uid, orderPrivateCar.getId(), 1, 2, 0);
			// pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, 2, 0);
			// pushUtil.pushDriverPosition(orderPrivateCar.getId(), 1);
			// }
			// }).start();
			// }
			//
			//
			// // TODO: 2021/5/11 修改，根据后台设定的派单范围查询范围内有无司机，将单子指派给距离最近的司机（距离相同随机取），范围内没有司机再进行推单流程
			// if(orderPrivateCar.getState() == 1){
			// Company query = companyCityService.query(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
			// if(null == query){
			// return ResultUtil.error("起点暂未企业提供服务");
			// }
			// AssignOrder assignOrder = assignOrderService.selectOne(new EntityWrapper<AssignOrder>().eq("companyId", query.getId()).eq("type", 1));
			// if(null != assignOrder){//配置了指派规则才处理
			// boolean lock = redisUtil.lock("order_lock", 10);
			// if(!lock){
			// int num1 = 1;
			// while (num1 <= 10){
			// Thread.sleep(3000);//等待3秒
			// lock = redisUtil.lock("order_lock", 10);
			// if(lock){
			// break;
			// }else{
			// num1++;
			// }
			// }
			// }
			// try {
			// //获取空闲司机
			// List<Driver> drivers = driverService.queryIdleDriver(1, orderPrivateCar.getServerCarModelId(), orderPrivateCar.getStartLon(), orderPrivateCar.getStartLat(), assignOrder.getDistance(), null);//获取范围内空闲司机
			// List<Integer> driverIds = drivers.stream().map(Driver::getId).collect(Collectors.toList());
			// if(drivers.size() > 0) {//有司机，直接指派给司机
			// Driver dr = null;
			// if (drivers.size() > 1) {
			// List<Driver> ds = new ArrayList<>();//存储直线距离最近的几个司机
			// for (int i = 0; i < assignOrder.getPeople(); i++) {
			// Driver driver = null;
			// int m = 0;
			// int index = 0;
			// // 查询预约单
			// List<OrderPrivateCar> orderPrivateCarss = orderPrivateCarMapper.queryOrderByState(driverIds, 2, 1, 2, 3, 4, 5, 6, 11);
			// List<Integer> orderPrivateCarDriverIds = orderPrivateCars.stream().map(OrderPrivateCar::getDriverId).collect(Collectors.toList());
			// for (int j = 0; j < drivers.size(); j++) {
			// Driver driver1 = drivers.get(j);
			// if (orderPrivateCar.getOrderType() == 2 && orderPrivateCarDriverIds.contains(driver.getId())) {
			// continue;
			// }
			// // 判断该司机是否有30分钟内预约单
			// long count = orderPrivateCarss.stream().filter(s -> s.getDriverId().equals(driver1.getId()) &&
			// DateUtil.dateToLocalDateTime(s.getTravelTime()).minusMinutes(query.getLimitationTime()).isBefore(LocalDateTime.now())).count();
			// if (count > 0) {
			// continue;
			// }
			// String value = redisUtil.getValue("DRIVER" + drivers.get(j).getId());
			// if (null != value) {
			//// Map<String, String> distance1 = gdMapElectricFenceUtil.getDistance(orderPrivateCar.getStartLon() + "," + orderPrivateCar.getStartLat(), value, 0);//计算距离
			//// Integer d = Integer.valueOf(distance1.get("distance"));
			// String[] split = value.split(",");
			// double distance = GDMapGeocodingUtil.getDistance(orderPrivateCar.getStartLat(), orderPrivateCar.getStartLon(), Double.valueOf(split[1]), Double.valueOf(split[0]));
			// int d = Double.valueOf(distance).intValue();
			// if ((0 == m && null == driver) \|\| (d < m)) {
			// driver = drivers.get(j);
			// m = d;
			// index = j;
			// }
			// }
			// }
			// ds.add(driver);
			// drivers.remove(index);
			// }
			//
			// //再根据直线距离最短的司机中找出行驶距离最短的司机
			// Integer m = 0;
			// for (Driver driver : ds) {
			// String value = redisUtil.getValue("DRIVER" + driver.getId());
			// if (null != value) {
			// Map<String, String> distance1 = gdMapElectricFenceUtil.getDistance(orderPrivateCar.getStartLon() + "," + orderPrivateCar.getStartLat(), value, 1);//计算距离
			// Integer d = Integer.valueOf(distance1.get("distance"));
			// if ((0 == m && null == dr) \|\| (d.intValue() < m.intValue())) {
			// dr = driver;
			// m = d;
			// }
			// }
			// }
			// } else {
			// List<OrderPrivateCar> orderPrivateCarss = orderPrivateCarMapper.queryOrderByState(driverIds, 2, 1, 2, 3, 4, 5, 6, 11);
			// if (orderPrivateCarss.size() == 0) {
			// dr = drivers.get(0);
			// }
			// }
			//
			// if (Objects.nonNull(dr)) {
			// orderPrivateCar.setDriverId(dr.getId());
			// orderPrivateCar.setCompanyId(dr.getFranchiseeId() != null && dr.getFranchiseeId() != 0 ? dr.getFranchiseeId() : (
			// dr.getCompanyId() != null && dr.getCompanyId() != 0 ? dr.getCompanyId() : 1));
			// orderPrivateCar.setState(2);
			// orderPrivateCar.setCarId(dr.getCarId());
			// CarService query1 = carServiceMapper.query(1, dr.getCarId());
			// orderPrivateCar.setServerCarModelId(query1.getServerCarModelId());
			// orderPrivateCar.setSnatchOrderTime(new Date());
			// if (orderPrivateCar.getOrderType() != 2) {
			// dr.setState(3);
			// }
			// driverService.updateById(dr);
			// new Thread(new Runnable() {
			// @Override
			// public void run() {
			// pushUtil.pushOrderState(1, uid, orderPrivateCar.getId(), 1, 2, 0);
			// pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, 2, 0);
			// pushUtil.pushDriverPosition(orderPrivateCar.getId(), 1);
			// }
			// }).start();
			// }
			//
			//
			// //调用高德创建轨迹
			//// String s = gdFalconUtil.selectTerminal(dr.getPhone());
			//// String track = gdFalconUtil.createTrack(s);
			//// orderPrivateCar.setTrackId(track);
			//
			// //调用移动的小号接口
			// /* Map<String, String> geocode1 = gdMapGeocodingUtil.geocode(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
			// Region region = regionMapper.query(geocode1.get("districtCode"));*/
			//// Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderPrivateCar.getPassengersPhone(), dr.getPhone(), null);
			//// if(String.valueOf(map.get("code")).equals("200")){
			//// orderPrivateCar.setTelX(map.get("telX"));
			//// orderPrivateCar.setBindId(map.get("bindId"));
			//// }
			//
			// this.updateById(orderPrivateCar);
			//
			// //发送短信给司机
			//// aLiSendSms.sendSms(dr.getPhone(), "SMS_216832951", "{\"" + orderPrivateCar.getStartAddress() + "\"}");
			// }
			// }catch (Exception e){
			// e.printStackTrace();
			// }finally {
			// redisUtil.unlock("order_lock");
			// }
			// }
			// }
			//
			//
			// //推单操作
			// if(orderPrivateCar.getState() == 1){
			// this.pushOrder(orderPrivateCar);
			// }
			//
			//
			// //添加消息
			// systemNoticeService.addSystemNotice(1, "您的专车订单已下单成功，我们正在为您指派司机，请稍后！", orderPrivateCar.getUserId(), 1);
			//
			// BaseWarpper baseWarpper = new BaseWarpper();
			// baseWarpper.setState(orderPrivateCar.getState());
			// baseWarpper.setId(orderPrivateCar.getId());
			// return ResultUtil.success(baseWarpper);
			// }


			/**
			@@ -591,7 +918,10 @@
			if(null == orderPrivateCar){
			return ResultUtil.error("取消订单失败，订单信息有误");
			}
			if(orderPrivateCar.getState() > 5 && orderPrivateCar.getState() != 11){
			if(orderPrivateCar.getPayMethod() == 0 && (Objects.nonNull(orderPrivateCar.getPaymentAdvanceMoney()) && orderPrivateCar.getPaymentAdvanceMoney()>0) && orderPrivateCar.getState() > 5 && orderPrivateCar.getState() != 11){
			return ResultUtil.error("取消订单失败，当前状态无法取消");
			}
			if(orderPrivateCar.getPayMethod() == 1 && orderPrivateCar.getState() > 5 && orderPrivateCar.getState() != 11){
			return ResultUtil.error("取消订单失败，不合法的操作");
			}
			if(null == orderPrivateCar.getDriverId()){//没有接单的情况
			@@ -613,6 +943,26 @@
			integer = orderCancelService.saveData(id, 1, "无司机接单", "无司机接单", null, null, 2, 1, uid);
			orderPrivateCar.setState(10);
			this.updateById(orderPrivateCar);
			if (orderPrivateCar.getPayMethod() == 0 && (Objects.nonNull(orderPrivateCar.getPaymentAdvanceMoney()) && orderPrivateCar.getPaymentAdvanceMoney()>0)) {
			// 退款
			if (orderPrivateCar.getPayType() == 1 && orderPrivateCar.getOrderMoney() != 0) {//微信退款
			// 微信退款
			payMoneyUtil.wxRefund(orderPrivateCar.getTransactionId(), orderPrivateCar.getOrderNum(), String.valueOf(orderPrivateCar.getPaymentAdvanceMoney()), String.valueOf(new BigDecimal(orderPrivateCar.getPaymentAdvanceMoney())), "/base/transferWXNotify");
			// orderPrivateCar.setPayMoney(new BigDecimal(orderPrivateCar.getOrderMoney()).doubleValue());
			}
			if (orderPrivateCar.getPayType() == 2 && orderPrivateCar.getOrderMoney() != 0) {//支付宝退款
			// 支付宝退款
			payMoneyUtil.aliRefund(orderPrivateCar.getTransactionId(), String.valueOf(new BigDecimal(orderPrivateCar.getPaymentAdvanceMoney()).multiply(new BigDecimal(100))));
			// orderPrivateCar.setPayMoney(new BigDecimal(orderPrivateCar.getOrderMoney()).doubleValue());
			}
			if (orderPrivateCar.getPayType() == 3 && orderPrivateCar.getOrderMoney() != 0) {//余额支付
			BigDecimal refundMoney = new BigDecimal(orderPrivateCar.getPaymentAdvanceMoney());
			// 余额退款
			UserInfo userInfo = userInfoMapper.selectById(orderPrivateCar.getUserId());
			userInfo.setBalance(new BigDecimal(userInfo.getBalance()).add(refundMoney).doubleValue());
			userInfoMapper.updateById(userInfo);
			}
			}
			}
			}else {
			CancleOrder query = cancleOrderService.query(orderPrivateCar.getOrderType(), 1, orderPrivateCar.getCompanyId());
			@@ -626,6 +976,26 @@

			orderPrivateCar.setState(10);
			this.updateById(orderPrivateCar);
			if (orderPrivateCar.getPayMethod() == 0 && (Objects.nonNull(orderPrivateCar.getPaymentAdvanceMoney()) && orderPrivateCar.getPaymentAdvanceMoney()>0)) {
			// 退款
			if (orderPrivateCar.getPayType() == 1 && orderPrivateCar.getOrderMoney() != 0) {//微信退款
			// 微信退款
			payMoneyUtil.wxRefund(orderPrivateCar.getTransactionId(), orderPrivateCar.getOrderNum(), String.valueOf(orderPrivateCar.getPaymentAdvanceMoney()), String.valueOf(new BigDecimal(orderPrivateCar.getPaymentAdvanceMoney())), "/base/transferWXNotify");
			// orderPrivateCar.setPayMoney(new BigDecimal(orderPrivateCar.getOrderMoney()).doubleValue());
			}
			if (orderPrivateCar.getPayType() == 2 && orderPrivateCar.getOrderMoney() != 0) {//支付宝退款
			// 支付宝退款
			payMoneyUtil.aliRefund(orderPrivateCar.getTransactionId(), String.valueOf(new BigDecimal(orderPrivateCar.getPaymentAdvanceMoney()).multiply(new BigDecimal(100))));
			// orderPrivateCar.setPayMoney(new BigDecimal(orderPrivateCar.getOrderMoney()).doubleValue());
			}
			if (orderPrivateCar.getPayType() == 3 && orderPrivateCar.getOrderMoney() != 0) {//余额支付
			BigDecimal refundMoney = new BigDecimal(orderPrivateCar.getPaymentAdvanceMoney());
			// 余额退款
			UserInfo userInfo = userInfoMapper.selectById(orderPrivateCar.getUserId());
			userInfo.setBalance(new BigDecimal(userInfo.getBalance()).add(refundMoney).doubleValue());
			userInfoMapper.updateById(userInfo);
			}
			}
			}
			this.deleteTask(id);//删除定时任务

			@@ -783,7 +1153,6 @@
			if(userInfo.getBalance() != null && userInfo.getBalance() < query.getMoney()){
			return ResultUtil.error("余额不足，无法完成支付", "");
			}

			userInfo.setBalance(new BigDecimal(userInfo.getBalance()).subtract(new BigDecimal(query.getMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			//添加交易明细
			transactionDetailsService.saveData(uid, "取消订单", query.getMoney(), 2, 1, 1, 1, id);
			@@ -809,13 +1178,13 @@
			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);

			incomeService.saveDriverData(2, orderPrivateCar.getDriverId(), 3, orderPrivateCar.getId(), 1, c.doubleValue(),driver.getLaveBusinessMoney());

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

			// new Thread(new Runnable() {
			@@ -859,7 +1228,11 @@
			for(int i = 1; i <= querys.size(); i++){
			PushOrder pushOrder = pushOrderService.querys(i, 1, query.getId()).get(0);
			//获取空闲司机
			// List<Driver> list = driverService.queryIdleDriver(1, orderPrivateCar.getServerCarModelId(), orderPrivateCar.getStartLon(), orderPrivateCar.getStartLat(), pushOrder.getPushDistance(), null);//所有附近空闲司机
			List<Driver> list = driverService.queryIdleDriver(1, orderPrivateCar.getServerCarModelId(), orderPrivateCar.getStartLon(), orderPrivateCar.getStartLat(), pushOrder.getPushDistance(), null);//所有附近空闲司机
			List<Driver> list1 = driverService.queryIdleDriver_(1, orderPrivateCar.getServerCarModelId(), orderPrivateCar.getStartLon(), orderPrivateCar.getStartLat(), 2.0D, null);//所有附近空闲司机
			list.addAll(list1);
			list = list.stream().distinct().collect(Collectors.toList());
			if(list.size() > 0){
			// 查询预约单
			List<Integer> driverIds = list.stream().map(Driver::getId).collect(Collectors.toList());
			@@ -871,11 +1244,10 @@
			for(Driver driver : list){//开始进行推送
			// 判断该司机是否有30分钟内预约单
			long count = orderPrivateCars.stream().filter(orderPrivateCar1 -> driver.getId().equals(orderPrivateCar1.getDriverId())
			&& DateUtil.dateToLocalDateTime(orderPrivateCar1.getTravelTime()).minusMinutes(query.getLimitationTime()).isBefore(LocalDateTime.now())
			&& DateUtil.dateToLocalDateTime(orderPrivateCar1.getTravelTime()).isAfter(LocalDateTime.now())).count();
			if(orderPrivateCar.getOrderType() == 2 && orderPrivateCarDriverIds.contains(driver.getId())){
			continue;
			}
			&& DateUtil.dateToLocalDateTime(orderPrivateCar1.getTravelTime()).minusMinutes(query.getLimitationTime()).isBefore(LocalDateTime.now())).count();
			// if(orderPrivateCar.getOrderType() == 2 && orderPrivateCarDriverIds.contains(driver.getId())){
			// continue;
			// }
			if(count > 0){
			continue;
			}
			@@ -904,10 +1276,26 @@
			// 第三轮取消订单
			orderPrivateCar.setState(10);
			orderPrivateCarMapper.updateById(orderPrivateCar);
			pushUtil.pushOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0);
			// 添加站内信
			systemNoticeService.addSystemNotice(1, "当前区域未能及时为您匹配到合适车辆。为避免耽误您的行程，系统已自动取消订单，建议您稍后重新尝试。", orderPrivateCar.getUserId(), 1);
			// TODO 0731 添加短信发送

			// 查询是否开启短信通知
			AppOpenInfo appOpenInfo = appOpenInfoService.selectOne(new EntityWrapper<AppOpenInfo>()
			.eq("type", 3));
			if(Objects.nonNull(appOpenInfo) && appOpenInfo.getIsOpen() == 1){
			// 添加短信发送
			//发送记录集合
			JSONArray records = new JSONArray();
			JSONObject record = new JSONObject();
			UserInfo userInfo = userInfoService.selectById(orderPrivateCar.getUserId());
			//手机号
			record.put("mobile", userInfo.getPhone());
			//替换变量
			JSONObject param = new JSONObject();
			record.put("tpContent", param);
			records.add(record);
			SMSUtil.sendSmsTp(380702L, records);
			}
			}
			}
			} catch (Exception e) {
			@@ -1027,41 +1415,47 @@
			return ResultUtil.error("订单不在待支付状态，不允许支付", "");
			}
			PaymentRecord query3 = paymentRecordService.query(1, null, null, orderId, 1, null, 1);
			if(null != query3){
			ResultUtil<Map<String, Object>> resultUtil1 = payMoneyUtil.queryWXOrder("", query3.getSerialNumber(), "JSAPI");
			if (resultUtil1.getCode() == 200) {
			/**
			* SUCCESS--支付成功
			* REFUND--转入退款
			* NOTPAY--未支付
			* CLOSED--已关闭
			* REVOKED--已撤销(刷卡支付)
			* USERPAYING--用户支付中
			* PAYERROR--支付失败(其他原因，如银行返回失败)
			* ACCEPT--已接收，等待扣款
			*/
			String result_code = resultUtil1.getData().get("result_code").toString();
			if("SUCCESS".equals(result_code)){
			String s = resultUtil1.getData().get("trade_state").toString();
			if ("REFUND".equals(s) \|\| "CLOSED".equals(s) \|\| "REVOKED".equals(s) \|\| "PAYERROR".equals(s)) {
			payMoneyUtil.closeWXOrder(query3.getSerialNumber());
			paymentRecordService.deleteById(query3.getId());
			}
			if ("SUCCESS".equals(s) \|\| "ACCEPT".equals(s)) {
			return ResultUtil.error("不允许重复支付");
			}
			if ("NOTPAY".equals(s) \|\| "USERPAYING".equals(s)) {
			payMoneyUtil.closeWXOrder(query3.getSerialNumber());
			paymentRecordService.deleteById(query3.getId());
			}
			}
			}
			}
			// if(null != query3){
			// ResultUtil<Map<String, Object>> resultUtil1 = payMoneyUtil.queryWXOrder("", query3.getSerialNumber(), "JSAPI");
			// if (resultUtil1.getCode() == 200) {
			// /**
			// * SUCCESS--支付成功
			// * REFUND--转入退款
			// * NOTPAY--未支付
			// * CLOSED--已关闭
			// * REVOKED--已撤销(刷卡支付)
			// * USERPAYING--用户支付中
			// * PAYERROR--支付失败(其他原因，如银行返回失败)
			// * ACCEPT--已接收，等待扣款
			// */
			// String result_code = resultUtil1.getData().get("result_code").toString();
			// if("SUCCESS".equals(result_code)){
			// String s = resultUtil1.getData().get("trade_state").toString();
			// if ("REFUND".equals(s) \|\| "CLOSED".equals(s) \|\| "REVOKED".equals(s) \|\| "PAYERROR".equals(s)) {
			// payMoneyUtil.closeWXOrder(query3.getSerialNumber());
			// paymentRecordService.deleteById(query3.getId());
			// }
			// if ("SUCCESS".equals(s) \|\| "ACCEPT".equals(s)) {
			// return ResultUtil.error("不允许重复支付");
			// }
			// if ("NOTPAY".equals(s) \|\| "USERPAYING".equals(s)) {
			// payMoneyUtil.closeWXOrder(query3.getSerialNumber());
			// paymentRecordService.deleteById(query3.getId());
			// }
			// }
			// }
			// }



			Integer uid = orderPrivateCar.getUserId();
			Double orderMoney = orderPrivateCar.getOrderMoney();
			System.out.println("=========================订单金额====================="+orderMoney);
			if(Objects.nonNull(orderPrivateCar.getPaymentAdvanceMoney()) && orderPrivateCar.getPaymentAdvanceMoney() > 0){
			double couponMoney1 = Objects.nonNull(orderPrivateCar.getCouponMoney()) ? orderPrivateCar.getCouponMoney() : 0.00;
			orderMoney = orderMoney - orderPrivateCar.getPaymentAdvanceMoney() - couponMoney1;
			System.out.println("=========================减去先付后金额====================="+orderMoney);
			}
			UserInfo userInfo = userInfoService.selectById(uid);
			ResultUtil resultUtil = ResultUtil.success(new HashMap<>());
			orderPrivateCar.setCouponMoney(0D);//初始化历史数据
			@@ -1195,20 +1589,21 @@
			if(userInfo.getBalance() == null \|\| userInfo.getBalance() < orderMoney){
			return ResultUtil.error("余额不足，无法完成支付", "");
			}


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

			SysIntegral query1 = sysIntegralMapper.query(orderPrivateCar.getCompanyId());
			userInfo.setIntegral(userInfo.getIntegral() + (orderMoney.intValue() * query1.getIntegral()));//积分


			// SysIntegral query1 = sysIntegralMapper.query(orderPrivateCar.getCompanyId());
			// if(Objects.nonNull(query1)){
			// userInfo.setIntegral(userInfo.getIntegral() + (orderMoney.intValue() * query1.getIntegral()));//积分
			// }

			//添加交易明细
			transactionDetailsService.saveData(uid, "完成订单", orderMoney, 2, 1, 1, 1, orderId);
			userInfoService.updateById(userInfo);

			orderPrivateCar.setState(8);

			// orderPrivateCar.setState(8);
			orderPrivateCar.setPayType(3);
			orderPrivateCar.setPayMoney(orderMoney);
			orderPrivateCar.setOrderMoney(orderPrivateCar.getOrderMoney()+orderPrivateCar.getFreeMoney().doubleValue());
			// orderPrivateCar.setPayMoney(orderMoney);
			// orderPrivateCar.setOrderMoney(orderPrivateCar.getOrderMoney()+orderPrivateCar.getFreeMoney().doubleValue());

			//处理优惠券和红包
			if(null != userCouponRecord){
			@@ -1221,41 +1616,107 @@
			query.setEndTime(new Date());
			userRedPacketRecordService.updateById(query);
			}
			if(orderPrivateCar.getIsplatPay()==1){
			//添加已收入明细
			Company company = companyService.selectById(orderPrivateCar.getCompanyId());
			Double speMoney = company.getSpeMoney();
			BigDecimal d = null;//企业收入
			BigDecimal c = null;//司机收入
			if(company.getIsSpeFixedOrProportional() == 2){//固定
			d = new BigDecimal(speMoney);
			c = new BigDecimal(orderPrivateCar.getOrderMoney()).subtract(d);//只有出行金额参与抽成，其余归属司机

			if(orderPrivateCar.getPayMethod() == 0){
			// 先付
			if(Objects.nonNull(orderPrivateCar.getPaymentAdvanceMoney()) && orderPrivateCar.getPaymentAdvanceMoney() > 0){
			orderPrivateCar.setPayMoney(new BigDecimal(orderMoney).add(new BigDecimal(orderPrivateCar.getPaymentAdvanceMoney())).doubleValue());
			orderPrivateCar.setOrderMoney(orderPrivateCar.getPayMoney());

			SysIntegral query1 = sysIntegralMapper.query(orderPrivateCar.getCompanyId());
			if(Objects.nonNull(query1)){
			userInfo.setIntegral(userInfo.getIntegral() + (orderMoney.intValue() * query1.getIntegral()));//积分
			}
			//添加已收入明细
			Company company = companyService.selectById(orderPrivateCar.getCompanyId());
			Double speMoney = company.getSpeMoney();
			BigDecimal d = null;//企业收入
			BigDecimal c = null;//司机收入
			if(company.getIsSpeFixedOrProportional() == 2){//固定
			d = new BigDecimal(speMoney);
			c = new BigDecimal(orderPrivateCar.getOrderMoney()).subtract(d);//只有出行金额参与抽成，其余归属司机
			if(c.compareTo(BigDecimal.ZERO)<1){
			c = BigDecimal.ZERO;
			}
			}
			if(company.getIsSpeFixedOrProportional() == 1){//比例
			Double price = orderPrivateCar.getStartMoney() + orderPrivateCar.getMileageMoney() + orderPrivateCar.getWaitMoney() + orderPrivateCar.getDurationMoney() + orderPrivateCar.getLongDistanceMoney();
			d = new BigDecimal(price).multiply(new BigDecimal(speMoney).divide(new BigDecimal(100), new MathContext(2, RoundingMode.HALF_EVEN))).setScale(2, BigDecimal.ROUND_HALF_EVEN);
			c = new BigDecimal(orderPrivateCar.getOrderMoney()).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
			}
			incomeService.saveData(1, orderPrivateCar.getCompanyId(), 2, orderPrivateCar.getId(), 1, d.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);
			incomeService.saveDriverData(2, orderPrivateCar.getDriverId(), 2, orderPrivateCar.getId(), 1, c.doubleValue(), driver.getLaveBusinessMoney());
			orderPrivateCar.setState(8);
			}else {
			if(orderPrivateCar.getOrderSource() == 2){
			orderPrivateCar.setState(2);
			}else {
			orderPrivateCar.setState(1);
			}
			orderPrivateCar.setPaymentAdvanceMoney(orderMoney);
			orderPrivateCar.setOrderMoney(orderMoney);
			orderPrivateCar.setPayMoney(orderMoney);
			}
			if(company.getIsSpeFixedOrProportional() == 1){//比例
			Double price = orderPrivateCar.getStartMoney() + orderPrivateCar.getMileageMoney() + orderPrivateCar.getWaitMoney() + orderPrivateCar.getDurationMoney() + orderPrivateCar.getLongDistanceMoney();
			d = new BigDecimal(price).multiply(new BigDecimal(speMoney).divide(new BigDecimal(100), new MathContext(2, RoundingMode.HALF_EVEN))).setScale(2, BigDecimal.ROUND_HALF_EVEN);
			c = new BigDecimal(orderPrivateCar.getOrderMoney()).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
			// new Thread(new Runnable() {
			// @Override
			// public void run() {
			// pushUtil.pushOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0);
			// pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0);
			// }
			// }).start();
			userInfoService.updateById(userInfo);
			systemNoticeService.addSystemNotice(1, "您已使用余额成功完成出行订单支付，谢谢使用！", uid, 1);
			if(orderPrivateCar.getState() == 1){
			this.pushOrder(orderPrivateCar);
			}
			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());
			driverService.updateById(driver);
			}else {
			// 后付
			orderPrivateCar.setPayMoney(orderMoney);
			orderPrivateCar.setState(8);
			if(orderPrivateCar.getIsplatPay()==1){
			//添加已收入明细
			Company company = companyService.selectById(orderPrivateCar.getCompanyId());
			Double speMoney = company.getSpeMoney();
			BigDecimal d = null;//企业收入
			BigDecimal c = null;//司机收入
			if(company.getIsSpeFixedOrProportional() == 2){//固定
			d = new BigDecimal(speMoney);
			c = new BigDecimal(orderPrivateCar.getOrderMoney()).subtract(d);//只有出行金额参与抽成，其余归属司机
			if(c.compareTo(BigDecimal.ZERO)<1){
			c = BigDecimal.ZERO;
			}
			}
			if(company.getIsSpeFixedOrProportional() == 1){//比例
			Double price = orderPrivateCar.getStartMoney() + orderPrivateCar.getMileageMoney() + orderPrivateCar.getWaitMoney() + orderPrivateCar.getDurationMoney() + orderPrivateCar.getLongDistanceMoney();
			d = new BigDecimal(price).multiply(new BigDecimal(speMoney).divide(new BigDecimal(100), new MathContext(2, RoundingMode.HALF_EVEN))).setScale(2, BigDecimal.ROUND_HALF_EVEN);
			c = new BigDecimal(orderPrivateCar.getOrderMoney()).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
			}
			incomeService.saveData(1, orderPrivateCar.getCompanyId(), 2, orderPrivateCar.getId(), 1, d.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);
			incomeService.saveDriverData(2, orderPrivateCar.getDriverId(), 2, orderPrivateCar.getId(), 1, c.doubleValue(), driver.getLaveBusinessMoney());
			}


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

			systemNoticeService.addSystemNotice(1, "您已使用余额成功完成出行订单支付，谢谢使用！", uid, 1);
			}


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

			systemNoticeService.addSystemNotice(1, "您已使用余额成功完成出行订单支付，谢谢使用！", uid, 1);
			}

			this.updateAllColumnById(orderPrivateCar);
			@@ -1374,6 +1835,32 @@
			//添加交易明细
			transactionDetailsService.saveData(orderPrivateCar.getUserId(), "取消订单", query.getAmount(), 2, 1, 1, 1, query.getOrderId());
			orderPrivateCar.setState(10);
			// 判断订单金额是否为空或者为0
			if(orderPrivateCar.getPayMethod() == 0){
			// 先付
			Double refundMoney = orderPrivateCar.getOrderMoney();
			if(Objects.nonNull(orderPrivateCar.getCouponMoney())){
			refundMoney = new BigDecimal(refundMoney).subtract(new BigDecimal(orderPrivateCar.getCouponMoney())).doubleValue();
			}
			// 退款
			if(orderPrivateCar.getPayType() == 1 && orderPrivateCar.getOrderMoney() !=0){//微信退款
			// 微信退款
			payMoneyUtil.wxRefund(orderPrivateCar.getTransactionId(),orderPrivateCar.getOrderNum(),String.valueOf(orderPrivateCar.getOrderMoney()),String.valueOf(refundMoney),"/base/transferWXNotify");
			}
			if(orderPrivateCar.getPayType() == 2 && orderPrivateCar.getOrderMoney() !=0) {//支付宝退款
			// 支付宝退款
			payMoneyUtil.aliRefund(orderPrivateCar.getTransactionId(),String.valueOf(refundMoney*100));
			}
			if(orderPrivateCar.getPayType() == 3 && orderPrivateCar.getOrderMoney() !=0) {//余额退款
			// 余额退款
			UserInfo userInfo = userInfoService.selectById(orderPrivateCar.getUserId());
			userInfo.setBalance(new BigDecimal(userInfo.getBalance()).add(new BigDecimal(refundMoney)).doubleValue());
			userInfoService.updateById(userInfo);
			//添加交易明细
			transactionDetailsService.saveData(orderPrivateCar.getUserId(), "专车取消退款", refundMoney, 2, 1, 1, 1, id);
			}
			}

			//解除小号绑定
			// if(orderPrivateCar.getBindId() != null){
			// chinaMobileUtil.midAxbUnBindSend(orderPrivateCar.getBindId(),orderPrivateCar.getTelX());
			@@ -1398,12 +1885,12 @@
			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);
			incomeService.saveDriverData(2, orderPrivateCar.getDriverId(), 3, orderPrivateCar.getId(), 1, c.doubleValue(), driver.getLaveBusinessMoney());
			this.deleteTask(orderPrivateCar.getId());//删除定时任务

			// TODO: 2020/5/24 这里需要给司机和用户推送订单状态
			@@ -1448,16 +1935,17 @@
			return;
			}
			transactionDetailsService.saveData(orderPrivateCar.getUserId(), "完成订单", query.getAmount(), 2, 1, 1, 1, query.getOrderId());
			orderPrivateCar.setState(8);
			// orderPrivateCar.setState(8);
			orderPrivateCar.setPayType(type);
			orderPrivateCar.setOrderMoney(orderPrivateCar.getOrderMoney()+orderPrivateCar.getFreeMoney().doubleValue());
			orderPrivateCar.setPayMoney(query.getAmount());
			if(!StringUtils.hasLength(orderPrivateCar.getTransactionId())){
			orderPrivateCar.setTransactionId(order_id);
			}
			this.updateById(orderPrivateCar);

			UserInfo userInfo = userInfoService.selectById(orderPrivateCar.getUserId());
			SysIntegral query1 = sysIntegralMapper.query(orderPrivateCar.getCompanyId());
			userInfo.setIntegral(userInfo.getIntegral() + (query.getAmount().intValue() * query1.getIntegral()));//积分
			userInfoService.updateById(userInfo);
			// UserInfo userInfo = userInfoService.selectById(orderPrivateCar.getUserId());
			// SysIntegral query1 = sysIntegralMapper.query(orderPrivateCar.getCompanyId());
			// userInfo.setIntegral(userInfo.getIntegral() + (query.getAmount().intValue() * query1.getIntegral()));//积分
			// userInfoService.updateById(userInfo);

			//处理优惠券和红包
			if(null != orderPrivateCar.getCouponId()){
			@@ -1476,29 +1964,77 @@
			query.setState(2);
			query.setCode(order_id);
			paymentRecordService.updateById(query);

			if(orderPrivateCar.getIsplatPay()==1){
			//添加已收入明细
			Company company = companyService.selectById(orderPrivateCar.getCompanyId());
			Double taxi = company.getSpeMoney();
			BigDecimal d = null;//企业收入
			BigDecimal c = null;//司机收入
			if(company.getIsSpeFixedOrProportional() == 2){//固定
			d = new BigDecimal(taxi);
			c = new BigDecimal(orderPrivateCar.getOrderMoney()).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);

			// 判断先付还是后付
			if(orderPrivateCar.getPayMethod() == 0){

			if (Objects.nonNull(orderPrivateCar.getPaymentAdvanceMoney()) && orderPrivateCar.getPaymentAdvanceMoney() > 0 ) {
			orderPrivateCar.setState(8);
			orderPrivateCar.setOrderMoney(orderPrivateCar.getOrderMoney()+query.getAmount());
			orderPrivateCar.setPayMoney(orderPrivateCar.getPayMoney()+query.getAmount());
			//添加已收入明细
			Company company = companyService.selectById(orderPrivateCar.getCompanyId());
			Double speMoney = company.getSpeMoney();
			BigDecimal d = null;//企业收入
			BigDecimal c = null;//司机收入
			if(company.getIsSpeFixedOrProportional() == 2){//固定
			d = new BigDecimal(speMoney);
			c = new BigDecimal(orderPrivateCar.getOrderMoney()).subtract(d);//只有出行金额参与抽成，其余归属司机
			if(c.compareTo(BigDecimal.ZERO)<1){
			c = BigDecimal.ZERO;
			}
			}
			if(company.getIsSpeFixedOrProportional() == 1){//比例
			Double price = orderPrivateCar.getStartMoney() + orderPrivateCar.getMileageMoney() + orderPrivateCar.getWaitMoney() + orderPrivateCar.getDurationMoney() + orderPrivateCar.getLongDistanceMoney();
			d = new BigDecimal(price).multiply(new BigDecimal(speMoney).divide(new BigDecimal(100), new MathContext(2, RoundingMode.HALF_EVEN))).setScale(2, BigDecimal.ROUND_HALF_EVEN);
			c = new BigDecimal(orderPrivateCar.getOrderMoney()).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
			}
			incomeService.saveData(1, orderPrivateCar.getCompanyId(), 2, orderPrivateCar.getId(), 1, d.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);
			incomeService.saveDriverData(2, orderPrivateCar.getDriverId(), 2, orderPrivateCar.getId(), 1, c.doubleValue(), driver.getLaveBusinessMoney());
			}else {
			if(orderPrivateCar.getOrderSource() == 2){
			orderPrivateCar.setState(2);
			}else {
			orderPrivateCar.setState(1);
			}
			orderPrivateCar.setOrderMoney(orderPrivateCar.getOrderMoney()+orderPrivateCar.getFreeMoney().doubleValue());
			orderPrivateCar.setPayMoney(query.getAmount());
			orderPrivateCar.setPaymentAdvanceMoney(orderPrivateCar.getOrderMoney());
			}
			if(company.getIsSpeFixedOrProportional() == 1){//比例
			Double price = orderPrivateCar.getStartMoney() + orderPrivateCar.getMileageMoney() + orderPrivateCar.getWaitMoney() + orderPrivateCar.getDurationMoney() + orderPrivateCar.getLongDistanceMoney();
			d = new BigDecimal(price).multiply(new BigDecimal(taxi).divide(new BigDecimal(100), new MathContext(2, RoundingMode.HALF_EVEN))).setScale(2, BigDecimal.ROUND_HALF_EVEN);
			c = new BigDecimal(orderPrivateCar.getOrderMoney()).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
			this.updateById(orderPrivateCar);
			}else {
			orderPrivateCar.setOrderMoney(orderPrivateCar.getOrderMoney()+orderPrivateCar.getFreeMoney().doubleValue());
			orderPrivateCar.setPayMoney(query.getAmount());
			orderPrivateCar.setState(8);
			this.updateById(orderPrivateCar);
			if(orderPrivateCar.getIsplatPay()==1){
			//添加已收入明细
			Company company = companyService.selectById(orderPrivateCar.getCompanyId());
			Double taxi = company.getSpeMoney();
			BigDecimal d = null;//企业收入
			BigDecimal c = null;//司机收入
			if(company.getIsSpeFixedOrProportional() == 2){//固定
			d = new BigDecimal(taxi);
			c = new BigDecimal(orderPrivateCar.getOrderMoney()).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
			}
			if(company.getIsSpeFixedOrProportional() == 1){//比例
			Double price = orderPrivateCar.getStartMoney() + orderPrivateCar.getMileageMoney() + orderPrivateCar.getWaitMoney() + orderPrivateCar.getDurationMoney() + orderPrivateCar.getLongDistanceMoney();
			d = new BigDecimal(price).multiply(new BigDecimal(taxi).divide(new BigDecimal(100), new MathContext(2, RoundingMode.HALF_EVEN))).setScale(2, BigDecimal.ROUND_HALF_EVEN);
			c = new BigDecimal(orderPrivateCar.getOrderMoney()).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
			}
			incomeService.saveData(1, orderPrivateCar.getCompanyId(), 2, orderPrivateCar.getId(), 1, d.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);
			incomeService.saveDriverData(2, orderPrivateCar.getDriverId(), 2, orderPrivateCar.getId(), 1, c.doubleValue(), driver.getLaveBusinessMoney());
			}
			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());
			driverService.updateById(driver);
			}
			// TODO: 2020/5/24 这里需要给司机和用户推送订单状态
			new Thread(new Runnable() {
			@@ -1562,19 +2098,23 @@
			}
			if(Integer.valueOf(String.valueOf(map.get("state"))) == 7){
			OrderPrivateCar orderPrivateCar = orderPrivateCarMapper.selectById(orderId);
			UserActivityDiscount1 query2 = userActivityDiscount1Mapper.query(Integer.valueOf(String.valueOf(map.get("companyId"))));
			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();
			double v = new BigDecimal(orderMoney).multiply(new BigDecimal(special / 10)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
			if(orderMoney.compareTo(v) > 0){
			map.put("discountMoney",orderMoney - v);
			Object companyId = map.get("companyId");
			if(Objects.nonNull(companyId)){
			UserActivityDiscount1 query2 = userActivityDiscount1Mapper.query(Integer.valueOf(String.valueOf(map.get("companyId"))));
			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();
			double v = new BigDecimal(orderMoney).multiply(new BigDecimal(special / 10)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
			if(orderMoney.compareTo(v) > 0){
			map.put("discountMoney",orderMoney - v);
			}
			}
			}

			}else{
			map.put("discountMoney",0);
			}
			}

			@@ -1665,6 +2205,16 @@
			List<OrderPosition> list = JSONArray.parseArray(sb.toString(), OrderPosition.class);
			orderServerWarpper.setOrderPositionList(JSONObject.toJSONString(list));
			}
			// 查询司机服务中的订单
			OrderPrivateCar one = this.selectOne(new EntityWrapper<OrderPrivateCar>()
			.eq("driverId", orderPrivateCar.getDriverId())
			.eq("state", 5)
			.orderBy("insertTime", false)
			.last("LIMIT 1"));
			if(Objects.nonNull(one)){
			orderServerWarpper.setLastLon(one.getEndLon()+"");
			orderServerWarpper.setLastLat(one.getEndLat()+"");
			}
			return orderServerWarpper;
			}