java/IgoTravel.git

			@@ -69,7 +69,7 @@
			UserInfo userInfo = userInfoService.selectById(uid);
			Company company = companyCityService.query1(uid, lon.toString(), lat.toString());
			if(null != userInfo && null != company){
			System.err.println("-----更新用户所属公司-----");
			System.err.println("-----更新用户所属公司-----lon：" + lon + "---lat：" + lat);
			userInfo.setCompanyId(company.getId());
			userInfoService.updateById(userInfo);
			}

			@@ -189,6 +189,19 @@
			// orderStatusWarpper.setTripId(orderPrivateCar.getTripId());
			data.add(orderStatusWarpper);
			}
			List<OrderLogistics> orderLogistics = orderLogisticsService.selectList(new EntityWrapper<OrderLogistics>().eq("userId", uid)
			.in("state", Arrays.asList(1, 2, 3, 4, 5, 6, 7, 11, 12)).eq("isDelete", 1));
			for(OrderLogistics orderLogistics1 : orderLogistics){
			if(orderLogistics1.getState() == 11){
			orderLogistics1.setState(orderLogistics1.getOldState());
			}
			OrderStatusWarpper orderStatusWarpper = new OrderStatusWarpper();
			orderStatusWarpper.setOrderId(orderLogistics1.getId());
			orderStatusWarpper.setOrderType(4);
			orderStatusWarpper.setState(orderLogistics1.getState());
			orderStatusWarpper.setTripId(orderLogistics1.getTripId());
			data.add(orderStatusWarpper);
			}
			return ResultUtil.success(data);
			}catch (Exception e){
			e.printStackTrace();

			@@ -68,7 +68,15 @@
			String englishName = city1.getEnglishName();
			String frenchName = city1.getFrenchName();
			for (String s : city) {
			if(s.indexOf(chineseName) != -1 \|\| s.indexOf(englishName) != -1 \|\| s.indexOf(frenchName) != -1){
			if(s.indexOf(chineseName) != -1){
			collect.add(city1.getId());
			break;
			}
			if(s.indexOf(englishName) != -1){
			collect.add(city1.getId());
			break;
			}
			if(s.indexOf(frenchName) != -1){
			collect.add(city1.getId());
			break;
			}
			@@ -90,7 +98,15 @@
			String englishName = city1.getEnglishName();
			String frenchName = city1.getFrenchName();
			for (String s : city) {
			if(s.indexOf(chineseName) != -1 \|\| s.indexOf(englishName) != -1 \|\| s.indexOf(frenchName) != -1){
			if(s.indexOf(chineseName) != -1){
			collect.add(city1.getId());
			break;
			}
			if(s.indexOf(englishName) != -1){
			collect.add(city1.getId());
			break;
			}
			if(s.indexOf(frenchName) != -1){
			collect.add(city1.getId());
			break;
			}
			@@ -120,7 +136,15 @@
			String englishName = city1.getEnglishName();
			String frenchName = city1.getFrenchName();
			for (String s : city) {
			if(s.indexOf(chineseName) != -1 \|\| s.indexOf(englishName) != -1 \|\| s.indexOf(frenchName) != -1){
			if(s.indexOf(chineseName) != -1){
			collect.add(city1.getId());
			break;
			}
			if(s.indexOf(englishName) != -1){
			collect.add(city1.getId());
			break;
			}
			if(s.indexOf(frenchName) != -1){
			collect.add(city1.getId());
			break;
			}

	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyCityServiceImpl.java	30 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史