java/ZhaoYangChuXing.git

			@@ -10,6 +10,7 @@
			import com.stylefeng.guns.core.util.ExcelExportUtil;
			import com.stylefeng.guns.core.util.SinataUtil;
			import com.stylefeng.guns.core.util.ToolUtil;
			import com.stylefeng.guns.modular.system.controller.util.PushUtil;
			import com.stylefeng.guns.modular.system.dao.OrderCancelMapper;
			import com.stylefeng.guns.modular.system.model.*;
			import com.stylefeng.guns.modular.system.service.*;
			@@ -78,10 +79,12 @@
			@RequestMapping("")
			public String index(Model model) {
			//服务专车车型
			List<TServerCarmodel> carmodelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
			List<TServerCarmodel> carmodelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1)
			);
			model.addAttribute("carmodelList",carmodelList);
			return PREFIX + "tOrderPrivateCar.html";
			}


			/**
			* 跳转到专车订单首页
			@@ -110,8 +113,9 @@
			public String toChangeMoney(@PathVariable Integer tOrderPrivateCarId, Model model) {
			Map<String, Object> item = tOrderPrivateCarService.getPrivateCarOrderDetailById(tOrderPrivateCarId);
			model.addAttribute("item",item);
			return PREFIX + "toChangeMoney.html";
			return PREFIX + "toChangeMoney.html.html";
			}

			/**
			* 跳转到出租车订单轨迹页面
			*/
			@@ -148,6 +152,7 @@
			page.setRecords(tOrderPrivateCarService.getPrivateCarOrderList(page,beginTime,endTime,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),orderNum,orderSource,userName,userPhone,passengers,passengersPhone,serverCarModelId,driver,state,smsNumber));
			return super.packForBT(page);
			}


			/**
			* 获取专车订单列表
			@@ -241,7 +246,6 @@
			orderPrivateCar.updateById();
			return SUCCESS_TIP;
			}


			@RequestMapping(value = "/frozenOrder")
			@ResponseBody