java/IgoTravel.git

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

			import static com.stylefeng.guns.modular.taxi.service.impl.OrderTaxiServiceImpl.orderIds;

			@@ -378,8 +379,8 @@
			new Thread(new Runnable() {
			@Override
			public void run() {
			pushUtil.pushOrderState(1, orderCrossCity.getUserId(), orderCrossCity.getId(), 3, orderCrossCity.getState(), 0);
			pushUtil.pushOrderState(2, orderCrossCity.getDriverId(), orderCrossCity.getId(), 3, orderCrossCity.getState(), 0);
			pushUtil.pushOrderState(1, orderCrossCity.getUserId(), orderCrossCity.getId(), 3, orderCrossCity.getState(), 0, "", "user");
			pushUtil.pushOrderState(2, orderCrossCity.getDriverId(), orderCrossCity.getId(), 3, orderCrossCity.getState(), 0, "", "user");
			}
			}).start();

			@@ -451,8 +452,8 @@
			new Thread(new Runnable() {
			@Override
			public void run() {
			pushUtil.pushOrderState(1, orderCrossCity.getUserId(), orderCrossCity.getId(), 3, orderCrossCity.getState(), 0);
			pushUtil.pushOrderState(2, orderCrossCity.getDriverId(), orderCrossCity.getId(), 3, orderCrossCity.getState(), 0);
			pushUtil.pushOrderState(1, orderCrossCity.getUserId(), orderCrossCity.getId(), 3, orderCrossCity.getState(), 0, "", "user");
			pushUtil.pushOrderState(2, orderCrossCity.getDriverId(), orderCrossCity.getId(), 3, orderCrossCity.getState(), 0, "", "user");
			}
			}).start();

			@@ -1197,9 +1198,10 @@
			public ResultUtil addCancle(Integer id, String reason, String remark, Integer uid) throws Exception {
			if(ToolUtil.isNotEmpty(remark)){
			if(ToolUtil.isNotEmpty(remark)){
			remark = remark.toLowerCase();
			List<SensitiveWords> sensitiveWords = sensitiveWordsMapper.selectList(null);
			for(SensitiveWords s : sensitiveWords){
			remark = remark.replaceAll(s.getContent(), "***");
			for(SensitiveWords s : sensitiveWords) {
			remark = remark.replaceAll(s.getContent().toLowerCase(), "***");
			}
			}
			}
			@@ -1454,7 +1456,7 @@
			//定义用户所属公司
			OrderTaxi orderTaxi = new OrderTaxi();
			UserInfo userInfo1 = userInfoService.selectById(uid);
			Company query = companyCityService.query1(startLon, startLat);
			Company query = companyCityService.query1(uid, startLon, startLat);
			if(null == query){
			return ResultUtil.error("出发点暂未开通");
			}
			@@ -1580,7 +1582,7 @@
			if(ToolUtil.isEmpty(userInfo.getPhone())){
			return ResultUtil.error("请先绑定手机号码");
			}
			orderPrivateCar.setPassengers(userInfo.getFirstName() + "." + userInfo.getLastName());
			orderPrivateCar.setPassengers(ToolUtil.isNotEmpty(userInfo.getFirstName()) ? userInfo.getFirstName() + "." + userInfo.getLastName() : "");
			orderPrivateCar.setPassengersPhone(userInfo.getPhone());
			}
			orderPrivateCar.setState(1);
			@@ -1588,6 +1590,9 @@
			orderPrivateCar.setTravelTime(travelTime);
			orderPrivateCar.setOrderType(reservation);
			orderPrivateCar.setOrderSource(orderSource);
			String tripId = redisUtil.getValue("trip" + uid);
			orderPrivateCar.setTripId(tripId);
			orderPrivateCar.setIsover(0);

			orderPrivateCar.setIsReassign(1);
			orderPrivateCar.setIsDelete(1);
			@@ -1624,7 +1629,7 @@
			if(orderType == 1){//专车
			OrderPrivateCar orderPrivateCar = orderPrivateCarMapper.selectById(orderId);
			OrderPrivateCarServiceImpl.orderIds.add(orderPrivateCar.getId());//添加记录，防止调用接口重复提醒无人接单
			Company query = companyCityService.query1(String.valueOf(orderPrivateCar.getStartLon()), String.valueOf(orderPrivateCar.getStartLat()));//获取起点所属分公司
			Company query = companyCityService.query1(orderPrivateCar.getUserId(), String.valueOf(orderPrivateCar.getStartLon()), String.valueOf(orderPrivateCar.getStartLat()));//获取起点所属分公司
			List<PushOrder> querys = pushOrderService.querys(null, 1, query.getId());//获取需要推送的次数
			for(int i = 1; i <= querys.size(); i++){
			//订单被抢后的处理
			@@ -1658,7 +1663,7 @@
			//开始进行推送的处理
			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(orderPrivateCar.getUserId(), 1, orderPrivateCar.getServerCarModelId(), orderPrivateCar.getStartLon(), orderPrivateCar.getStartLat(), pushOrder.getPushDistance(), null);//所有附近空闲司机
			if(list.size() > 0){
			double driverProportion = pushOrder.getDriverProportion() / 100;//推送占比计算成小数
			int lastIndex = Double.valueOf(list.size() * driverProportion).intValue();//计算占比转成整数（下标截取）
			@@ -1674,7 +1679,7 @@
			if(bo){
			continue;
			}
			pushUtil.pushOrderState(2, driver.getId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), pushOrder.getPushTime());
			pushUtil.pushOrderState(2, driver.getId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), pushOrder.getPushTime(), "", "user");
			}
			}

			@@ -1693,7 +1698,7 @@
			if(orderType == 2){//出租车
			OrderTaxi orderTaxi = orderTaxiMapper.selectById(orderId);
			OrderTaxiServiceImpl.orderIds.add(orderTaxi.getId());//添加记录，防止调用接口重复提醒无人接单
			Company query = companyCityService.query1(String.valueOf(orderTaxi.getStartLon()), String.valueOf(orderTaxi.getStartLat()));//获取起点所属分公司
			Company query = companyCityService.query1(orderTaxi.getUserId(), String.valueOf(orderTaxi.getStartLon()), String.valueOf(orderTaxi.getStartLat()));//获取起点所属分公司
			List<PushOrder> querys = pushOrderService.querys(null, 2, query.getId());//获取需要推送的次数
			for(int i = 1; i <= querys.size(); i++){
			//处理订单被抢
			@@ -1745,7 +1750,7 @@
			}


			pushUtil.pushOrderState(2, driver.getId(), orderTaxi.getId(), 2, orderTaxi.getState(), pushOrder.getPushTime());
			pushUtil.pushOrderState(2, driver.getId(), orderTaxi.getId(), 2, orderTaxi.getState(), pushOrder.getPushTime(), "", "user");
			}
			}