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);
			@@ -605,6 +606,10 @@
			break;
			case 6:
			break;
			case 7://专车
			map = orderTransferService.queryOrderInfo(orderId);
			break;

			}
			if(null != map.get("telX")){
			map.put("phone", map.get("telX"));
			@@ -640,6 +645,9 @@
			break;
			case 6:
			break;
			case 7://接送机
			companyId = orderTransferService.selectById(orderId).getCompanyId();
			break;
			}
			return sysReformistMapper.queryMoney(companyId);
			}
			@@ -671,6 +679,8 @@
			return orderLogisticsService.process(orderId, state, lon, lat, address);
			case 6:
			break;
			case 7://专车
			return orderTransferService.process(orderId, state, lon, lat, address);
			}
			return null;
			}
			@@ -706,6 +716,8 @@
			break;
			case 6:
			break;
			case 7://接送机
			return orderTransferService.confirmFees(orderId, type, parkingFee, crossingFee);
			}
			return null;
			}
			@@ -840,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;
			}


			@@ -1167,6 +1184,8 @@
			return orderPrivateCarService.queryMoneyInfo(orderId);
			case 2:
			break;
			case 7:
			return orderTransferService.queryMoneyInfo(orderId);
			}
			return null;
			}