java/NTTravel.git

			@@ -16,6 +16,7 @@
			import com.stylefeng.guns.modular.system.model.Driver;
			import com.stylefeng.guns.modular.system.model.OrderPosition;
			import com.stylefeng.guns.modular.system.model.Region;
			import com.stylefeng.guns.modular.system.model.TOrderTransfer;
			import com.stylefeng.guns.modular.system.service.IDriverService;
			import com.stylefeng.guns.modular.system.service.IOrderService;
			import com.stylefeng.guns.modular.system.service.ITOrderTransferService;
			@@ -206,7 +207,7 @@
			datas.addAll(list3);

			//接送机
			List<Map<String, Object>> list4 = orderTransferService.queryOrderList(state,uid);
			List<Map<String, Object>> list4 = orderTransferService.queryMyAllOrder(state,uid);
			datas.addAll(list4);

			List<OrderListWarpper> orderListWarpper = OrderListWarpper.getOrderListWarpper(datas);
			@@ -680,8 +681,6 @@
			break;
			case 7://专车
			return orderTransferService.process(orderId, state, lon, lat, address);


			}
			return null;
			}
			@@ -853,7 +852,12 @@
			//出租车
			Integer[] state = new Integer[]{6, 7, 8, 9};
			int i = orderTaxiService.selectCount(new EntityWrapper<OrderTaxi>().eq("driverId", driverId).between("insertTime", start, end).in("state", state));
			return i;
			int i1 = orderTransferService.selectCount(new EntityWrapper<TOrderTransfer>().eq("driverId", driverId).between("insertTime", start, end).in("state", state));
			int i2 = orderPrivateCarService.selectCount(new EntityWrapper<OrderPrivateCar>().eq("driverId", driverId).between("insertTime", start, end).in("state", state));
			int i3 = orderCrossCityService.selectCount(new EntityWrapper<OrderCrossCity>().eq("driverId", driverId).between("insertTime", start, end).in("state", state));


			return i+i1+i2+i3;
			}