java/XianNingChuXing.git

			@@ -55,6 +55,7 @@
			import java.math.MathContext;
			import java.math.RoundingMode;
			import java.time.LocalDateTime;
			import java.time.format.DateTimeFormatter;
			import java.util.*;
			import java.util.stream.Collectors;

			@@ -733,6 +734,7 @@
			//推单操作
			if(orderCrossCity.getState() == 1){
			this.pushCrossCityOrder(orderCrossCity);
			System.out.println("推单！！");
			}
			} catch (Exception e) {
			e.printStackTrace();
			@@ -1256,7 +1258,7 @@
			orderCrossCity.setLineId(orderCrossCityWarpperPushOrder.getLineId());
			// orderCrossCity.setLineShiftDriverId(orderCrossCityWarpper.getLineShiftDriverId());
			// orderCrossCity.setCarId(orderCrossCityWarpper.getCarId());
			// orderCrossCity.setOrderNum(this.getOrderNum(orderCrossCityWarpperPushOrder.getDriverId(), orderCrossCityWarpperPushOrder.getLineShiftDriverId()));
			orderCrossCity.setOrderNum(this.getOrderNum(orderCrossCityWarpperPushOrder.getDriverId(), orderCrossCityWarpperPushOrder.getLineShiftDriverId()));
			orderCrossCity.setPlacementLon(orderCrossCityWarpperPushOrder.getPlacementLon());
			orderCrossCity.setPlacementLat(orderCrossCityWarpperPushOrder.getPlacementLat());
			String placementAddress = orderCrossCityWarpperPushOrder.getPlacementAddress();
			@@ -1308,8 +1310,8 @@
			// }

			//调用移动的小号接口
			Map<String, String> geocode = gdMapGeocodingUtil.geocode(orderCrossCity.getStartLon().toString(), orderCrossCity.getStartLat().toString());
			Region region = regionMapper.query(geocode.get("districtCode"));
			// Map<String, String> geocode = gdMapGeocodingUtil.geocode(orderCrossCity.getStartLon().toString(), orderCrossCity.getStartLat().toString());
			// Region region = regionMapper.query(geocode.get("districtCode"));
			// Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderCrossCity.getPassengersPhone(), driver.getPhone(), Integer.valueOf(region.getCitycode().substring(1)));
			// if (String.valueOf(map.get("code")).equals("200")) {
			// orderCrossCity.setTelX(map.get("telX"));
			@@ -2477,7 +2479,10 @@
			LocalDateTime localDateTime = LocalDateTime.now();
			LocalDateTime dateTime = localDateTime.minusMinutes(30);
			String time = dateUtil.localDateTimeToStringHHmm(dateTime);
			List<OrderCrossCity> orderCrossCities = this.selectList(new EntityWrapper<OrderCrossCity>().eq("state", 7).like("insertTime", time));
			LocalDateTime start = LocalDateTime.parse(time + ":00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
			LocalDateTime end = start.plusMinutes(1);

			List<OrderCrossCity> orderCrossCities = this.selectList(new EntityWrapper<OrderCrossCity>().eq("state", 7).between("insertTime", start, end));
			if(!CollectionUtils.isEmpty(orderCrossCities)){
			for (OrderCrossCity orderCrossCity : orderCrossCities) {
			orderCrossCity.setState(10);
			@@ -2527,31 +2532,31 @@
			}
			Company query = companyCityService.query(String.valueOf(orderCrossCity.getStartLon()), String.valueOf(orderCrossCity.getStartLat()));//获取起点所属分公司
			// List<PushOrder> querys = pushOrderService.querys(null, 1, query.getId());//获取需要推送的次数
			// Company query = companyService.selectById(1);
			for(int i = 1; i <= 3; i++){
			PushOrder pushOrder = pushOrderService.querys(i, 1, query.getId()).get(0);
			//获取空闲司机
			// List<Driver> list = driverService.queryIdleDriver(1, orderCrossCity.getServerCarModelId(), orderCrossCity.getStartLon(), orderCrossCity.getStartLat(), pushOrder.getPushDistance(), null);//所有附近空闲司机
			// PushOrder pushOrder = pushOrderService.querys(i, 4, query.getId()).get(0);

			//获取同线路的同车型的跨城司机
			List<Driver> list = driverService.queryDriversByLineAndCarModel(orderCrossCity.getServerCarModelId(), orderCrossCity.getLineId());
			List<Driver> list = driverService.queryDriversByLineAndCarModel(3,orderCrossCity.getServerCarModelId(), orderCrossCity.getLineId());
			if(list.size() > 0){
			double driverProportion = pushOrder.getDriverProportion() / 100;//推送占比计算成小数
			int lastIndex = Double.valueOf(list.size() * driverProportion).intValue();//计算占比转成整数（下标截取）
			list = list.subList(0, lastIndex);//获取空闲司机中占比数据
			// double driverProportion = pushOrder.getDriverProportion() / 100;//推送占比计算成小数
			// int lastIndex = Double.valueOf(list.size() * driverProportion).intValue();//计算占比转成整数（下标截取）
			// list = list.subList(0, lastIndex);//获取空闲司机中占比数据
			for(Driver driver : list){//开始进行推送
			boolean bo = false;
			for(Integer integer : integers){
			if(integer.compareTo(driver.getId()) == 0){
			bo = true;
			break;
			}
			}
			if(bo){
			continue;
			}
			pushUtil.pushOrderState(2, driver.getId(), orderCrossCity.getId(), 3, orderCrossCity.getState(), pushOrder.getPushTime());
			// boolean bo = false;
			// for(Integer integer : integers){
			// if(integer.compareTo(driver.getId()) == 0){
			// bo = true;
			// break;
			// }
			// }
			// if(bo){
			// continue;
			// }
			pushUtil.pushOrderState(2, driver.getId(), orderCrossCity.getId(), 3, orderCrossCity.getState(), 10);
			}
			}
			Thread.sleep(pushOrder.getPushTime() * 1000);//设置等待时间
			Thread.sleep(10 * 1000);//设置等待时间
			Integer state = orderCrossCityMapper.selectById(orderCrossCity.getId()).getState();
			if(state > 1){
			break;
			@@ -2560,6 +2565,32 @@
			if(i == 3 && state == 1){
			pushUtil.pushEndPush(1, orderCrossCity.getUserId(), orderCrossCity.getId(), 1);
			orderIds.remove(orderCrossCity.getId());
			orderCrossCity.setState(10);
			orderCrossCityMapper.updateById(orderCrossCity);

			OrderCancel orderCancel = new OrderCancel();
			orderCancel.setOrderId(orderCrossCity.getId());
			orderCancel.setOrderType(3);
			orderCancel.setReason("没有司机接单，系统自动取消订单");
			orderCancel.setRemark("没有司机接单，系统自动取消订单");
			orderCancel.setState(2);
			orderCancel.setInsertTime(new Date());
			orderCancel.setUserType(2);
			orderCancelService.insert(orderCancel);
			//TODO：退款
			UserInfo userInfo = userInfoService.selectById (orderCrossCity.getUserId());
			userInfo.setBalance (new BigDecimal (userInfo.getBalance ())
			.add (new BigDecimal (orderCrossCity.getOrderMoney())) // 余额增加订单金额
			.setScale (2, BigDecimal.ROUND_HALF_EVEN)
			.doubleValue ());
			SysIntegral query1 = sysIntegralMapper.query (orderCrossCity.getCompanyId ());
			if (query1 != null) {
			int addIntegral = orderCrossCity.getOrderMoney().intValue () * query1.getIntegral (); // 原增加的积分
			userInfo.setIntegral (userInfo.getIntegral () - addIntegral); // 扣除对应积分（确保积分不为负可加额外判断）
			}
			transactionDetailsService.saveData (orderCrossCity.getUserId(), "订单取消退款", orderCrossCity.getOrderMoney (), 1, 1, 1, 3, orderCrossCity.getId ());
			userInfoService.updateById (userInfo);

			}
			}
			} catch (Exception e) {