java/IgoTravel.git

			@@ -9,6 +9,7 @@
			import com.stylefeng.guns.modular.system.model.ServerCarModel;
			import com.stylefeng.guns.modular.system.service.ICompanyCityService;
			import com.stylefeng.guns.modular.system.service.IServerCarModelService;
			import com.stylefeng.guns.modular.system.service.IUserInfoService;
			import com.stylefeng.guns.modular.system.util.GDMapElectricFenceUtil;
			import com.stylefeng.guns.modular.system.util.GDMapGeocodingUtil;
			import com.stylefeng.guns.modular.system.util.GoogleMap.AddressComponentsVo;
			@@ -43,6 +44,9 @@
			@Autowired
			private ICompanyCityService companyCityService;

			@Autowired
			private IUserInfoService userInfoService;




			@@ -57,11 +61,14 @@
			* @throws Exception
			*/
			@Override
			public ResultUtil<List<ServerCarModelWarpper>> queryServerCarModel(String startLonLat, String endLonLat, Integer type) throws Exception {
			public ResultUtil<List<ServerCarModelWarpper>> queryServerCarModel(String startLonLat, String endLonLat, Integer type, Integer language) throws Exception {
			//查找与起点匹配的企业（经营范围）
			ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(Double.valueOf(startLonLat.split(",")[1]), Double.valueOf(startLonLat.split(",")[0]));
			if(null == language){
			language = 2;
			}
			if(null == reverseGeocode){
			return ResultUtil.error("获取地址信息失败");
			return ResultUtil.error(language == 1 ? "获取地址信息失败" : language == 2 ? "Failed to get address information" : "Impossible d'obtenir les informations d'adresse");
			}
			AddressComponentsVo[] addressComponentsVos = reverseGeocode.getAddressComponentsVos();
			String[] city = new String[addressComponentsVos.length];
			@@ -70,15 +77,17 @@
			}
			Company query = companyCityService.query(city);
			if(null == query){
			return ResultUtil.error("起点暂无企业提供服务", new ArrayList<>());
			return ResultUtil.error(language == 1 ? "起点暂无企业提供服务" : language == 2 ? "The starting point has no enterprises to provide services" : "Le point de départ n'a pas d'entreprises pour fournir des services", new ArrayList<>());
			}
			Double slnt = Double.valueOf(startLonLat.split(",")[0]);
			Double slat = Double.valueOf(startLonLat.split(",")[1]);
			Double elnt = Double.valueOf(startLonLat.split(",")[0]);
			Double elat = Double.valueOf(startLonLat.split(",")[1]);
			Double elnt = Double.valueOf(endLonLat.split(",")[0]);
			Double elat = Double.valueOf(endLonLat.split(",")[1]);
			DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(slat, slnt, elat, elnt);
			if(null == distancematrix){
			return ResultUtil.error("获取预估距离出错", new ArrayList<>());
			return ResultUtil.error(language == 1 ? "获取预估距离出错" : language == 2 ? "Error getting estimated distance" : "Erreur lors de l'obtention de la distance estimée", new ArrayList<>());
			}else if(distancematrix.getDistance() == 0){
			return ResultUtil.error(language == 1 ? "未获取到有效的距离" : language == 2 ? "A valid distance was not obtained" : "La distance effective n’est pas acquise", new ArrayList<>());
			}
			long distance1 = distancematrix.getDistance();//距离（米）
			double distance1_ = Double.valueOf(distance1).doubleValue();
			@@ -87,7 +96,7 @@

			List<ServerCarModelWarpper> price = this.getPrice(query.getId(), distance1_, duration_, 0, 1);
			if(price.size() == 0){
			return ResultUtil.error("未获取到可服务的车型", new ArrayList<>());
			return ResultUtil.error(language == 1 ? "未获取到可服务的车型" : language == 2 ? "No serviceable model available" : "Aucun modèle réparable disponible", new ArrayList<>());
			}
			return ResultUtil.success(price);
			}
			@@ -169,34 +178,34 @@


			//夜间服务处理逻辑
			Calendar s = Calendar.getInstance();
			s.setTime(date);
			s.set(Calendar.HOUR_OF_DAY, Integer.valueOf(num16.split(" - ")[0].split(":")[0]));
			s.set(Calendar.MINUTE, Integer.valueOf(num16.split(" - ")[0].split(":")[1]));

			Calendar e = Calendar.getInstance();
			e.setTime(date);
			e.set(Calendar.HOUR_OF_DAY, Integer.valueOf(num16.split(" - ")[1].split(":")[0]));
			e.set(Calendar.MINUTE, Integer.valueOf(num16.split(" - ")[1].split(":")[1]));

			if(date.getTime() > s.getTimeInMillis() && date.getTime() < e.getTimeInMillis()){
			if(d > num8.doubleValue()){
			yt1 = num20 * (num9 - num8);
			}
			if(d > num11.doubleValue()){
			yt2 = num21 * (num12 - num11);
			}
			if(d > num14.doubleValue()){
			yt3 = num22 * (d - num14);
			}
			amount = num17 + (d1 * num18) + (t1 * num19) + (wait * num7) + yt1 + yt2 + yt3;
			ServerCarModelWarpper serverCarModelWarpper = ServerCarModelWarpper.getServerCarModelWarpper(map);
			serverCarModelWarpper.setAmount(new BigDecimal(amount).setScale(BigDecimal.ROUND_HALF_EVEN, 2).doubleValue());
			serverCarModelWarpper.setMileage(d);
			serverCarModelWarpper.setDuration(t);
			data.add(serverCarModelWarpper);
			continue;
			}
			// Calendar s = Calendar.getInstance();
			// s.setTime(date);
			// s.set(Calendar.HOUR_OF_DAY, Integer.valueOf(num16.split(" - ")[0].split(":")[0]));
			// s.set(Calendar.MINUTE, Integer.valueOf(num16.split(" - ")[0].split(":")[1]));
			//
			// Calendar e = Calendar.getInstance();
			// e.setTime(date);
			// e.set(Calendar.HOUR_OF_DAY, Integer.valueOf(num16.split(" - ")[1].split(":")[0]));
			// e.set(Calendar.MINUTE, Integer.valueOf(num16.split(" - ")[1].split(":")[1]));
			//
			// if(date.getTime() > s.getTimeInMillis() && date.getTime() < e.getTimeInMillis()){
			// if(d > num8.doubleValue()){
			// yt1 = num20 * (num9 - num8);
			// }
			// if(d > num11.doubleValue()){
			// yt2 = num21 * (num12 - num11);
			// }
			// if(d > num14.doubleValue()){
			// yt3 = num22 * (d - num14);
			// }
			// amount = num17 + (d1 * num18) + (t1 * num19) + (wait * num7) + yt1 + yt2 + yt3;
			// ServerCarModelWarpper serverCarModelWarpper = ServerCarModelWarpper.getServerCarModelWarpper(map);
			// serverCarModelWarpper.setAmount(new BigDecimal(amount).setScale(BigDecimal.ROUND_HALF_EVEN, 2).doubleValue());
			// serverCarModelWarpper.setMileage(d);
			// serverCarModelWarpper.setDuration(t);
			// data.add(serverCarModelWarpper);
			// continue;
			// }


			//高峰时段处理逻辑