java/YueKeDuo.git

			@@ -234,6 +234,8 @@

			if (orderTaxi.getTravelTime().getTime() > (System.currentTimeMillis() + 600000)) {
			orderTaxi.setOrderType(2);
			} else {
			orderTaxi.setOrderType(1);
			}


			@@ -2812,34 +2814,38 @@
			}
			orderTaxiMapper.updateById(orderTaxi1);

			try {
			if (orderTaxi.getType() == 2) {
			List<OrderTaxi> list = orderTaxiMapper.selectList(
			new EntityWrapper<OrderTaxi>()
			.eq("type", 2)
			.eq("userId", orderTaxi.getUserId())
			.ne("state", 1)
			.eq("crossCityOrderId", orderTaxi.getCrossCityOrderId())
			.eq("place", orderTaxi.getPlace()).ne("id", orderTaxi.getId())
			);
			List<OrderPrivateCar> list1 = orderPrivateCarService.selectList(
			new EntityWrapper<OrderPrivateCar>()
			.eq("type", 2)
			.eq("userId", orderTaxi.getUserId())
			.ne("state", 1)
			.eq("crossCityOrderId", orderTaxi.getCrossCityOrderId())
			.eq("place", orderTaxi.getPlace())
			);
			for (OrderTaxi orderTaxi2 : list) {
			orderTaxi2.setState(10);
			orderTaxiMapper.updateById(orderTaxi2);
			}
			for (OrderPrivateCar orderPrivateCar : list1) {
			orderPrivateCar.setState(10);
			orderPrivateCarService.updateById(orderPrivateCar);
			}
			}
			} catch (Exception ignore) {

			if(orderTaxi.getType() == 2){
			List<OrderTaxi> list = orderTaxiMapper.selectList(
			new EntityWrapper<OrderTaxi>()
			.eq("type", 2)
			.eq("userId", orderTaxi.getUserId())
			.ne("state", 1)
			.eq("crossCityOrderId", orderTaxi.getCrossCityOrderId())
			.eq("place", orderTaxi.getPlace()).ne("id", orderTaxi.getId())
			);
			List<OrderPrivateCar> list1 = orderPrivateCarService.selectList(
			new EntityWrapper<OrderPrivateCar>()
			.eq("type", 2)
			.eq("userId", orderTaxi.getUserId())
			.ne("state", 1)
			.eq("crossCityOrderId", orderTaxi.getCrossCityOrderId())
			.eq("place", orderTaxi.getPlace())
			);
			for(OrderTaxi orderTaxi2 : list){
			orderTaxi2.setState(10);
			orderTaxiMapper.updateById(orderTaxi2);
			}
			for(OrderPrivateCar orderPrivateCar : list1){
			orderPrivateCar.setState(10);
			orderPrivateCarService.updateById(orderPrivateCar);
			}
			}

			OrderTaxi finalOrderTaxi = orderTaxi1;

			//如果是预约单，则不修改司机为服务中
			if(orderTaxi1.getOrderType() != 2 \|\| (orderTaxi1.getOrderType() == 2 && orderTaxi1.getTravelTime().getTime() < System.currentTimeMillis() + 600000)){
			@@ -2847,14 +2853,14 @@
			driver1.setState(3);
			driverService.updateById(driver1);
			}

			System.err.println("---获取单子信息---" + orderTaxi1);
			//推送相关代码-----------------start----------------
			OrderTaxi finalOrderTaxi = orderTaxi1;
			new Thread(new Runnable() {
			@Override
			public void run() {
			System.err.println("----------------------------------推送开始----------------------------");
			pushUtil.pushOrderState(1, finalOrderTaxi.getUserId(), finalOrderTaxi.getId(), 2, finalOrderTaxi.getState(),0);
			pushUtil.pushOrderState(2, finalOrderTaxi.getDriverId(), finalOrderTaxi.getId(), 2, finalOrderTaxi.getState(),0);
			pushUtil.pushOrderState(2, orderTaxi1.getDriverId(), orderTaxi1.getId(), 2, orderTaxi1.getState(), 0);
			if(finalOrderTaxi.getType() == 2){
			pushUtil.pushFerryOrderState(1, finalOrderTaxi.getUserId(), finalOrderTaxi.getId(), 2, 2);
			System.err.println("----------------------------------推送结束----------------------------");

	UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/controller/OrderTaxiController.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java	62 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -2670,7 +2670,7 @@
			}
			Double finalAmount = null != map.get("orderMoney") ? Double.valueOf(String.valueOf(map.get("orderMoney"))) : orderPrivateCar.getOrderMoney();
			Double displayAmount = getPrivateCarPrepayDisplayPayAmount(orderPrivateCar, finalAmount);
			map.put("orderMoney", displayAmount);
			map.put("orderMoney", finalAmount);
			map.put("payMoney", displayAmount);
			}

			@@ -52,11 +52,6 @@
			if(null == uid){
			return ResultUtil.tokenErr();
			}
			if (orderTaxiWarpper.getTravelTime().getTime() > (System.currentTimeMillis() + 600000)) {
			orderTaxiWarpper.setOrderType(2);
			}else {
			orderTaxiWarpper.setOrderType(1);
			}
			return orderTaxiService.taxiOrder(orderTaxi, uid);
			}catch (Exception e){
			e.printStackTrace();