java/FBTravel.git

			@@ -5,6 +5,7 @@
			import com.alibaba.fastjson.JSONObject;
			import com.baomidou.mybatisplus.mapper.EntityWrapper;
			import com.stylefeng.guns.core.common.constant.state.Order;
			import com.stylefeng.guns.core.util.ToolUtil;
			import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
			import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
			import com.stylefeng.guns.modular.system.dao.CarMapper;
			@@ -79,7 +80,7 @@
			jsonObject.put("RegisterDate", userInfo.getInsertTime());//注册日期YYYYMMDD
			jsonObject.put("PassengerPhone", userInfo.getPhone());//乘客手机号
			jsonObject.put("PassengerName", userInfo.getNickName());//乘客称谓
			jsonObject.put("PassengerGender", userInfo.getSex() == 1 ? "男" : "女");//乘客性别
			jsonObject.put("PassengerGender", null != userInfo.getSex() && userInfo.getSex() == 1 ? "男" : "女");//乘客性别
			jsonObject.put("State", 0);//状态（0：有效，1：失效）
			jsonObject.put("Flag", 1);//操作标识（1：新增，2：更新，3：删除）
			jsonObject.put("UpdateTime", new Date());
			@@ -111,14 +112,16 @@
			e.printStackTrace();
			}
			Map<String, String> geocode = null;
			try {
			geocode = gdMapGeocodingUtil.geocode(orderPrivateCar.getBoardingLon().toString(),
			orderPrivateCar.getBoardingLat().toString());
			} catch (Exception e) {
			e.printStackTrace();
			if(ToolUtil.isNotEmpty(orderPrivateCar.getBoardingLon())){
			try {
			geocode = gdMapGeocodingUtil.geocode(orderPrivateCar.getBoardingLon().toString(),
			orderPrivateCar.getBoardingLat().toString());
			} catch (Exception e) {
			e.printStackTrace();
			}
			}
			JSONObject jsonObject = new JSONObject();
			jsonObject.put("Address", Integer.valueOf(geocode.get("districtCode")));//上车地点行政区划代码
			jsonObject.put("Address", null != geocode ? Integer.valueOf(geocode.get("districtCode")) : "");//上车地点行政区划代码
			jsonObject.put("OrderId", orderPrivateCar.getOrderNum());//订单编号
			jsonObject.put("OrderTime", orderPrivateCar.getOrderNum());//订单时间YYYYMMDDhhmmss
			jsonObject.put("CancelTime", query.getInsertTime());//订单撤销时间YYYYMMDDhhmmss

	ManagementFBTravel/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver_info.js	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	UserFBTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OpenCityServiceImpl.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	UserFBTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushMinistryOfTransportUtil.java	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -735,9 +735,9 @@
			*/
			YesDriverInfoDlg.companyTypeClick = function (e) {
			if (1 == e){
			$("#companyDiv").hide();
			$(".companyDiv").hide();
			} else if (2 == e){
			$("#companyDiv").show();
			$(".companyDiv").show();
			}
			}

			@@ -52,6 +52,9 @@
			*/
			@Override
			public boolean openCity(String code) throws Exception {
			if(ToolUtil.isEmpty(code)){
			return false;
			}
			String province = code.substring(0, 2) + "0000";
			String city = code.substring(0, 4) + "00";
			List<OpenCity> openCities = openCityMapper.queryByCode(code);