提交

hotels_api/src/main/java/com/tripto/api/supplier/cnbooking/service/CNBookingStaticInforServiceImpl.java

@@ -1,436 +0,0 @@
-package com.tripto.api.supplier.cnbooking.service;
-
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-import org.dom4j.Element;
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.json.XML;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-
-import com.tripto.api.supplier.service.entity.BedTypeEntity;
-import com.tripto.api.supplier.service.entity.DistrictEntity;
-import com.tripto.api.supplier.service.entity.HoltelEnty;
-import com.tripto.api.supplier.service.entity.RoomEntity;
-import com.tripto.api.supplier.service.entity.RoomTypeEntity;
-import com.tripto.api.util.HttpRequestUtil;
-import com.tripto.api.util.ParseRequestUtil;
-import com.tripto.api.util.PropertiesUtil;
-import com.tripto.api.util.SignatureUtil;
-
-/**
- * 龙腾捷旅ServiceImpl
- * @author zhx
- *
- */
-public class CNBookingStaticInforServiceImpl implements CNBookingStaticInforService {
-	
-	/**
-	 * 获取区域静态信息
-	 * @return 区域信息集合
-	 * @throws Exception
-	 */
-	public List<DistrictEntity> cityQuery() throws Exception {	
-		String url = PropertiesUtil.readValueFromProp("properties/URL.properties", "CNBookingURL");
-		String auth = SignatureUtil.getCNBookingAuth();
-		String html = HttpRequestUtil.CNBoookingGet(url + "?ActionName=CityQuery" + "&auth=" + auth);
-		Document document = Jsoup.parse(html);
-		String text = document.select("pre[id=xmlPrview]").get(0).text();
-
-		DistrictEntity districtEntity = null;
-		List<DistrictEntity> list = new ArrayList<DistrictEntity>();
-		
-		Element element = ParseRequestUtil.parseCNBookingXMl(text);
-		List<Element> countrys = element.element("Countrys").elements("Country");
-		for (Element country : countrys) {
-			List<Element> provinces = country.elements("Province");
-			if (!provinces.isEmpty()) {
-				for (Element province : provinces) {
-					List<Element> citys = province.elements("City");
-					if (!citys.isEmpty()) {
-						for (Element city : citys) {
-							List<Element> locations = city.elements("Location");
-							if (!locations.isEmpty()) {
-								for (Element location : locations) {
-									districtEntity = new DistrictEntity();
-									list.add(districtEntity);
-									districtEntity.setCountryId(country.attributeValue("CountryId"));
-									districtEntity.setCountryName(country.attributeValue("CountryName"));
-									districtEntity.setProvinceId(province.attributeValue("ProvinceId"));
-									districtEntity.setProvinceName(province.attributeValue("ProvinceName"));
-									districtEntity.setCityId(city.attributeValue("CityId"));
-									districtEntity.setCityName(city.attributeValue("CityName"));
-									districtEntity.setDistrictId(Long.valueOf(location.attributeValue("LocationId")));
-									districtEntity.setDistrictName(location.attributeValue("LocationName"));
-								}
-							} else {
-								districtEntity = new DistrictEntity();
-								list.add(districtEntity);
-								districtEntity.setCountryId(country.attributeValue("CountryId"));
-								districtEntity.setCountryName(country.attributeValue("CountryName"));
-								districtEntity.setProvinceId(province.attributeValue("ProvinceId"));
-								districtEntity.setProvinceName(province.attributeValue("ProvinceName"));
-								districtEntity.setCityId(city.attributeValue("CityId"));
-								districtEntity.setCityName(city.attributeValue("CityName"));
-								districtEntity.setDistrictId(null);
-								districtEntity.setDistrictName(null);
-							}
-						}
-					} else {
-						districtEntity = new DistrictEntity();
-						list.add(districtEntity);
-						districtEntity.setCountryId(country.attributeValue("CountryId"));
-						districtEntity.setCountryName(country.attributeValue("CountryName"));
-						districtEntity.setProvinceId(province.attributeValue("ProvinceId"));
-						districtEntity.setProvinceName(province.attributeValue("ProvinceName"));
-						districtEntity.setCityId(null);
-						districtEntity.setCityName(null);
-						districtEntity.setDistrictId(null);
-						districtEntity.setDistrictName(null);
-					}
-				}
-			} else {
-				districtEntity = new DistrictEntity();
-				list.add(districtEntity);
-				districtEntity.setCountryId(country.attributeValue("CountryId"));
-				districtEntity.setCountryName(country.attributeValue("CountryName"));
-				districtEntity.setProvinceId(null);
-				districtEntity.setProvinceName(null);
-				districtEntity.setCityId(null);
-				districtEntity.setCityName(null);
-				districtEntity.setDistrictId(null);
-				districtEntity.setDistrictName(null);
-			}
-		}
-		return list;
-	}
-	
-	/**
-	 * 获取床型静态信息
-	 * @return 床型信息集合
-	 * @throws Exception
-	 */
-	public List<BedTypeEntity> bedTypeQuery() throws Exception {
-		String url = PropertiesUtil.readValueFromProp("properties/URL.properties", "CNBookingURL");
-		String auth = SignatureUtil.getCNBookingAuth();
-		String html = HttpRequestUtil.CNBoookingGet(url + "?ActionName=BedTypeQuery" + "&auth=" + auth);
-		Document document = Jsoup.parse(html);
-		String text = document.select("pre[id=xmlPrview]").get(0).text();
-		
-		BedTypeEntity bedTypeEntity = null;
-		List<BedTypeEntity> list = new ArrayList<BedTypeEntity>();
-		
-		Element element = ParseRequestUtil.parseCNBookingXMl(text);
-		List<Element> bedTypes = element.element("BedTypes").elements("BedType");
-		for (Element bedType : bedTypes) {
-			bedTypeEntity = new BedTypeEntity();
-			list.add(bedTypeEntity);
-			bedTypeEntity.setBedTypeName(bedType.attributeValue("BedTypeName"));
-			bedTypeEntity.setBedTypeId(bedType.attributeValue("BedTypeId"));
-		}
-		return list;
-	}
-	
-	/**
-	 * 获取房型静态信息
-	 * @return 房型信息集合
-	 * @throws Exception
-	 */
-	public List<RoomTypeEntity> roomTypeQuery() throws Exception {
-		String url = PropertiesUtil.readValueFromProp("properties/URL.properties", "CNBookingURL");
-		String auth = SignatureUtil.getCNBookingAuth();
-		String html = HttpRequestUtil.CNBoookingGet(url + "?ActionName=RoomTypeQuery" + "&auth=" + auth);
-		Document document = Jsoup.parse(html);
-		String text = document.select("pre[id=xmlPrview]").get(0).text();
-		
-		RoomTypeEntity roomEntity = null;
-		List<RoomTypeEntity> list = new ArrayList<RoomTypeEntity>();
-		
-		Element element = ParseRequestUtil.parseCNBookingXMl(text);
-		List<Element> roomTypes = element.element("RoomTypes").elements("RoomType");
-		for (Element roomType : roomTypes) {
-			roomEntity = new RoomTypeEntity();
-			list.add(roomEntity);
-			roomEntity.setRoomTypeId(roomType.attributeValue("RoomTypeId"));
-			roomEntity.setRoomTypeName(roomType.attributeValue("RoomTypeName"));
-		}
-		return list;
-	}
-	
-	/**
-	 * 获取酒店总数
-	 * @param countryId 国家id
-	 * @return 酒店数量
-	 * @throws Exception
-	 */
-	public int getHotelCount(Long countryId) throws Exception {
-		Element element = HttpRequestUtil.getCNBookingIdentityInfo(1, 1);
-		//请求接口
-		element.addElement("ActionName").addText("HotelSearch");
-		//查询条件，设置国家id，语言
-		Element searchConditions = element.addElement("SearchConditions");
-		searchConditions.addElement("CountryId").addText(countryId.toString());
-		searchConditions.addElement("Lang").addText("GB");
-		//请求数据
-		String result = HttpRequestUtil.CNBoookingPost(element.asXML()); 
-		//解析
-		element = ParseRequestUtil.parseCNBookingXMl(result);
-		return Integer.valueOf(element.element("Hotels").elementTextTrim("HotelCount"));
-	}
-	
-	/**
-	 * 获取酒店静态信息
-	 * @param pageItems 每页条数
-	 * @param pageNo 页码
-	 * @param countryId 国家id
-	 * @return 酒店信息集合
-	 * @throws Exception
-	 */
-	public List<HoltelEnty> hotelSearch(int pageItems, int pageNo, Long countryId) throws Exception {	
-		Element element = HttpRequestUtil.getCNBookingIdentityInfo(pageItems, pageNo);
-		//请求接口
-		element.addElement("ActionName").addText("HotelSearch");
-		//查询条件，设置国家id，语言
-		Element searchConditions = element.addElement("SearchConditions");
-		searchConditions.addElement("CountryId").addText(countryId.toString());
-		searchConditions.addElement("Lang").addText("GB");
-		//请求
-		String result = HttpRequestUtil.CNBoookingPost(element.asXML()); 
-		//解析
-		element = ParseRequestUtil.parseCNBookingXMl(result);
-		HoltelEnty holtelEnty = null;
-		List<HoltelEnty> list = new ArrayList<HoltelEnty>();
-		Element hotel = null;
-		List<Element> hotels = element.element("Hotels").elements("Hotel");
-		for (int i = 0; i < hotels.size(); i++) {
-			if (hotel.elementTextTrim("Lon") == null  || hotel.elementTextTrim("Lat") == null) {
-				break;
-			}
-			if (Double.valueOf(hotel.elementTextTrim("Lon")) == 0 || Double.valueOf(hotel.elementTextTrim("Lat")) == 0) {
-				break;
-			}
-			hotel = hotels.get(i);
-			holtelEnty = new HoltelEnty();
-			list.add(holtelEnty);
-			holtelEnty.setHotelId(hotel.elementTextTrim("HotelId"));
-			holtelEnty.setHotelName(hotel.elementTextTrim("HotelName"));
-			holtelEnty.setCountryId(hotel.elementTextTrim("CountryId"));
-			holtelEnty.setCountryName(hotel.elementTextTrim("CountryName"));
-			holtelEnty.setProvinceId(hotel.elementTextTrim("ProvinceId"));
-			holtelEnty.setProvinceName(hotel.elementTextTrim("ProvinceName"));
-			holtelEnty.setCityId(hotel.elementTextTrim("CityId"));
-			holtelEnty.setCityName(hotel.elementTextTrim("CityName"));
-			holtelEnty.setAddress(hotel.elementTextTrim("Address"));
-			holtelEnty.setPostCode(hotel.elementTextTrim("PostCode"));
-			holtelEnty.setEmail(hotel.elementTextTrim("Email"));
-			holtelEnty.setStartBusinessDate(hotel.elementTextTrim("StartBusinessDate"));
-			holtelEnty.setRepairdate(hotel.elementTextTrim("Repairdate"));
-			holtelEnty.setRecommendedLevel(hotel.elementTextTrim("RecommendedLevel"));
-			holtelEnty.setStar(hotel.elementTextTrim("Star"));
-			holtelEnty.setGoogleLon(hotel.elementTextTrim("Lon"));
-			holtelEnty.setGoogleLat(hotel.elementTextTrim("Lat"));
-			holtelEnty.setIntro(hotel.elementTextTrim("Intro"));
-			holtelEnty.setAllowWebSale(hotel.elementTextTrim("AllowWebSale"));
-			holtelEnty.setGuide(hotel.elementTextTrim("Guide"));
-			holtelEnty.setReserve2(hotel.elementTextTrim("Reserve2"));
-			holtelEnty.setImages(XML.toJSONObject(hotel.element("Reserve1").element("Images").asXML()).toString());
-			holtelEnty.setLandmarks(XML.toJSONObject(hotel.element("Landmarks").asXML()).toString());
-		}
-		return list;
-	}
-	
-	/**
-	 * 房间查询
-	 * @param pageItems 每页条数
-	 * @param pageNo 页码
-	 * @param countryId 国家id
-	 * @return 房间信息集合
-	 * @throws Exception
-	 */
-	public List<RoomEntity> roomSearch(int pageItems, int pageNo, Long countryId) throws Exception {	
-		Element element = HttpRequestUtil.getCNBookingIdentityInfo(pageItems, pageNo);
-		//请求接口
-		element.addElement("ActionName").addText("RoomSearch");
-		//查询条件，设置国家，语言
-		Element searchConditions = element.addElement("SearchConditions");
-		searchConditions.addElement("CountryId").addText("0001");
-		searchConditions.addElement("Lang").addText("GB");
-		//请求
-		String result = HttpRequestUtil.CNBoookingPost(element.asXML());
-		//解析
-		element = ParseRequestUtil.parseCNBookingXMl(result);
-		Element data = element.element("Hotels");
-		RoomEntity roomEntity = null;
-		List<RoomEntity> list = new ArrayList<RoomEntity>();
-		if (!"0".equals(data.elementTextTrim("HotelCount"))) {
-			List<Element> hotels = data.elements("Hotel");
-			List<Element> rooms = null;
-			for (Element hotel : hotels) {
-				data = hotel.element("Rooms");
-				if (!"0".equals(data.elementTextTrim("RoomCount"))) {
-					rooms = data.elements("Room");
-					for (Element room : rooms) {
-						roomEntity = new RoomEntity();
-						list.add(roomEntity);
-						roomEntity.setHotelId(hotel.elementTextTrim("HotelId"));
-						roomEntity.setRoomId(room.elementTextTrim("RoomId"));
-						roomEntity.setRoomName(room.elementTextTrim("RoomName"));
-						roomEntity.setRoomTypeId(room.elementTextTrim("RoomTypeId"));
-						roomEntity.setRoomType(room.elementTextTrim("RoomType"));
-						roomEntity.setBedTypeId(room.elementTextTrim("BedTypeId"));
-						roomEntity.setBedType(room.elementTextTrim("BedType"));
-						roomEntity.setAcreage(room.elementTextTrim("Acreage"));
-						roomEntity.setFloor(room.elementTextTrim("Floor"));
-						roomEntity.setRoomAcount(room.elementTextTrim("RoomAcount"));
-						roomEntity.setMaxAdult(room.elementTextTrim("MaxAdult"));
-						roomEntity.setMaxChild(room.elementTextTrim("MaxChild"));
-						roomEntity.setHasWindow(room.elementTextTrim("HasWindow"));
-						roomEntity.setAllowAddBed(room.elementTextTrim("AllowAddBed"));
-						roomEntity.setAllowAddBedNum(room.elementTextTrim("AllowAddBedNum"));
-						roomEntity.setAllowSmoke(room.elementTextTrim("AllowSmoke"));
-						roomEntity.setHasNet(room.elementTextTrim("HasNet"));
-						roomEntity.setIsNetFee(room.elementTextTrim("IsNetFee"));
-						roomEntity.setNetFee(room.elementTextTrim("NetFee"));
-						roomEntity.setNetFee(room.elementTextTrim("Intro"));
-						roomEntity.setGuide(room.elementTextTrim("Guide"));
-					}
-				}
-			}
-		} 
-		return list;
-	}
-	
-	/**
-	 * 数据字典静态信息
-	 */
-	public void loadCNBookingDictionary() throws Exception {
-		Properties properties = new Properties();
-		InputStreamReader reader = new InputStreamReader(new FileInputStream(""), "utf-8");
-		properties.load(reader);// 加载属性文件 
-		List<Object> params = new ArrayList<Object>();
-		List<List<Object>> paramsList = new ArrayList<List<Object>>();
-		for (Object key : properties.keySet()) {
-			params = new ArrayList<Object>();
-			params.add(key);
-			params.add(properties.get(key));
-			params.add(1);
-			paramsList.add(params);
-		}    
-	}
-	
-	/**
-	 * 获取价格计划静态信息
-	 * @param xml
-	 */
-	public void RatePlanSearch(String xml){	
-		try {
-			String result = HttpRequestUtil.CNBoookingPost(xml); 
-			System.out.println("龙腾捷旅数据处理开始。。。");
-			JSONObject resultJson = XML.toJSONObject(result);
-			JSONObject cnResponse = resultJson.getJSONObject("CNResponse");
-			if(cnResponse.getJSONObject("MessageInfo").getInt("Code") == 30000) {
-				JSONObject hotel = null;
-				JSONArray hotels = null;
-				JSONObject room = null;
-				JSONArray rooms = null;
-				JSONObject ratePlan = null;
-				JSONArray ratePlans = null;
-				JSONObject rate = null;
-				JSONArray rates = null;
-				JSONObject priceAndStatu = null;
-				JSONArray priceAndStatus = null;
-				List<Object> params = new ArrayList<Object>();
-				List<List<Object>> paramsList = new ArrayList<List<Object>>();
-				List<Object> rateParams = new ArrayList<Object>();
-				List<List<Object>> rateParamsList = new ArrayList<List<Object>>();
-				JSONObject data = cnResponse.getJSONObject("Data").getJSONObject("Hotels");
-				if (data.getInt("HotelCount") != 0) {
-					if (data.getInt("HotelCount") == 1) {
-						hotels = new JSONArray("[" + data.getJSONObject("Hotel").toString() + "]");
-					} else {
-						hotels = cnResponse.getJSONObject("Data").getJSONObject("Hotels").getJSONArray("Hotel");
-					}
-					for (int i = 0; i < hotels.length(); i++) {
-						hotel = hotels.getJSONObject(i);
-						if (hotel.getJSONObject("Rooms").getInt("RoomCount") != 0) {
-							if (hotel.getJSONObject("Rooms").getInt("RoomCount") == 1) {
-								rooms = new JSONArray("[" + hotel.getJSONObject("Rooms").getJSONObject("Room").toString() + "]");
-							}else {
-								rooms = hotel.getJSONObject("Rooms").getJSONArray("Room");
-							}
-							for (int j = 0; j < rooms.length(); j++) {
-								room = rooms.getJSONObject(j);
-								if (room.getJSONObject("RatePlans").getInt("RatePlanCount") != 0) {
-									if (room.getJSONObject("RatePlans").getInt("RatePlanCount") == 1) {
-										ratePlans = new JSONArray("[" + room.getJSONObject("RatePlans").getJSONObject("RatePlan").toString() + "]");
-									} else {
-										ratePlans = room.getJSONObject("RatePlans").getJSONArray("RatePlan");
-									}
-									for (int m = 0; m < ratePlans.length(); m++) {
-										ratePlan = ratePlans.getJSONObject(m);
-										params = new ArrayList<Object>();
-										params.add(room.get("RoomId"));
-										params.add(ratePlan.get("RatePlanId"));
-										params.add(ratePlan.get("RatePlanName"));
-										params.add(ratePlan.get("CutOffDay"));
-										params.add(ratePlan.get("CutOffTime"));
-										params.add(ratePlan.get("Breakfast"));
-										params.add(ratePlan.get("BreakfastType"));
-										params.add(ratePlan.get("MinRoomCount"));
-										params.add(ratePlan.get("PersonCount"));
-										params.add(ratePlan.get("MinDay"));
-										params.add(ratePlan.get("BedLimit"));
-										params.add(ratePlan.get("Nationality"));
-										params.add(ratePlan.get("Description"));
-										paramsList.add(params);
-										params.add(1);
-									}
-									if (room.getJSONObject("Rates").getInt("RateCount") != 0) {
-										if (room.getJSONObject("Rates").getInt("RateCount") == 1) {
-											rates = new JSONArray("[" + room.getJSONObject("Rates").getJSONObject("Rate") + "]");
-										} else {
-											rates = room.getJSONObject("Rates").getJSONArray("Rate");
-										}
-										for (int n = 0; n < rates.length(); n++) {
-											rate = rates.getJSONObject(n);
-											if (rate.getJSONObject("PriceAndStatus").getInt("PriceAndStatuCount") != 0) {
-												if (rate.getJSONObject("PriceAndStatus").getInt("PriceAndStatuCount") == 1) {
-													priceAndStatus = new JSONArray("[" + rate.getJSONObject("PriceAndStatus").getJSONObject("PriceAndStatu") + "]");
-												} else {
-													priceAndStatus = rate.getJSONObject("PriceAndStatus").getJSONArray("PriceAndStatu");
-												}
-												for (int k = 0; k < priceAndStatus.length(); k++) {
-													priceAndStatu = priceAndStatus.getJSONObject(k);
-													rateParams = new ArrayList<Object>();
-													rateParams.add(ratePlan.get("RatePlanId"));
-													rateParams.add(priceAndStatu.get("RateId"));
-													rateParams.add(priceAndStatu.get("Date"));
-													rateParams.add(priceAndStatu.get("Price"));
-													rateParams.add(priceAndStatu.get("Currency"));
-													rateParams.add(priceAndStatu.get("Count"));
-													rateParams.add(priceAndStatu.get("Statu"));
-													rateParams.add(priceAndStatu.get("LastCancelTime"));
-													rateParams.add(1);
-													rateParamsList.add(rateParams);
-												}
-											}
-										}
-									}
-								}
-							}	
-						}
-					}
-				}	
-			}else {
-				throw new Exception("Code" + cnResponse.getJSONObject("MessageInfo").getInt("Code") + ", Description" + cnResponse.getJSONObject("MessageInfo").get("Description"));
-			}
-		} catch (Exception e) {
-		
-		}	         
-	}
-}

hotels_api/src/main/java/com/tripto/api/supplier/elong/service/ElongStaticInforServiceImpl.java

@@ -1,295 +0,0 @@
-package com.tripto.api.supplier.elong.service;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.dom4j.Document;
-import org.dom4j.DocumentHelper;
-import org.dom4j.Element;
-import org.json.XML;
-
-import com.tripto.api.supplier.service.entity.DistrictEntity;
-import com.tripto.api.supplier.service.entity.HoltelEnty;
-import com.tripto.api.supplier.service.entity.RoomEntity;
-import com.tripto.api.util.HttpRequestUtil;
-
-/**
- * 艺龙ServiceImpl
- * @author zhx
- *
- */
-public class ElongStaticInforServiceImpl implements ElongStaticInforService{
-
-	/**	
-	 * 行政区域，商业区域，标志建筑信息获取
-	 * @return 区域信息集合
-	 * @throws Exception
-	 */
-	public Map<String, List<DistrictEntity>> queryLocation() throws Exception {
-		String url = "http://api.test.lohoo.com/xml/v2.0/hotel/geo_cn.xml";
-		String result = HttpRequestUtil.elongGet(url);
-		Document document = DocumentHelper.parseText(result);
-		List<Element> citys = document.getRootElement().element("HotelGeoList").elements("HotelGeo");
-		DistrictEntity districtEntity = null;
-		List<DistrictEntity> districtEntities = new ArrayList<DistrictEntity>();
-		List<DistrictEntity> commericals = new ArrayList<DistrictEntity>();
-		List<DistrictEntity> landmarks = new ArrayList<DistrictEntity>();
-		List<DistrictEntity> others = new ArrayList<DistrictEntity>();
-		List<Element> districts = null;
-		List<Element> locations = null;
-		for (Element city : citys) {
-			districts = city.elements();
-			for (Element  district: districts) {
-				locations = district.elements();
-				for (Element location : locations) {
-					districtEntity = new DistrictEntity();
-					districtEntity.setCountryName(city.attributeValue("Country"));
-					districtEntity.setProvinceId(city.attributeValue("ProvinceId"));
-					districtEntity.setProvinceName(city.attributeValue("ProvinceName"));
-					districtEntity.setCityId(city.attributeValue("CityCode"));
-					districtEntity.setCityName(city.attributeValue("CityName"));
-					districtEntity.setDistrictId(Long.valueOf(location.attributeValue("Id")));
-					districtEntity.setDistrictName(location.attributeValue("Name"));
-					if ("Districts".equals(district.getName())){
-						districtEntities.add(districtEntity);
-					}else if ("CommericalLocations".equals(district.getName())){
-						commericals.add(districtEntity);
-					}else if ("LandmarkLocations".equals(district.getName())){
-						landmarks.add(districtEntity);
-					}else {
-						others.add(districtEntity);
-					}
-				}
-			}
-		}
-		Map<String, List<DistrictEntity>> data = new HashMap<String, List<DistrictEntity>>();
-		if (districtEntities.size() != 0) {
-			data.put("Districts", districtEntities);
-		}
-		if (commericals.size() != 0) {
-			data.put("CommericalLocations", commericals);
-		}
-		if (landmarks.size() != 0) {
-			data.put("LandmarkLocations", landmarks);
-		}
-		if (others.size() != 0) {
-			data.put("others", others);
-		}
-		return data;
-	}
-	
-	/**
-	 * 酒店列表获取
-	 * @param updateTime 更新时间
-	 * @return 酒店列表信息集合
-	 * @throws Exception
-	 */
-	public List<HoltelEnty> queryHotelList(String updateTime) throws Exception{
-		String url = "http://api.test.lohoo.com/xml/v2.0/hotel/hotellist.xml";
-		String result = HttpRequestUtil.elongGet(url);
-		System.out.println(result);
-		Document document = DocumentHelper.parseText(result);
-		List<Element> elements = document.getRootElement().element("Hotels").elements("Hotel");
-		HoltelEnty holtelEnty = null;
-		List<HoltelEnty> holtelEnties = new ArrayList<HoltelEnty>();
-		for (Element element : elements) {
-			if (updateTime == null || element.elementTextTrim("UpdatedTime").compareTo(updateTime) > 0) {
-				holtelEnty = new HoltelEnty();
-				holtelEnties.add(holtelEnty);
-				holtelEnty.setHotelId(element.elementTextTrim("HotelId"));
-				holtelEnty.setModification(element.elementTextTrim("Modification"));
-				holtelEnty.setProducts(element.elementTextTrim("Products"));
-				holtelEnty.setHotelStatus(element.elementTextTrim("Status"));
-				holtelEnty.setUpdateTime(element.elementTextTrim("UpdatedTime"));
-			}
-		}
-		return holtelEnties;
-	}
-	
-	/**
-	 * 酒店，房型详情信息获取
-	 * @param hotel 酒店基本信息
-	 * @return 酒店，房型详细信息
-	 * @throws Exception
-	 */
-	public HoltelEnty queryHotelDetailById(HoltelEnty hotel) throws Exception{
-		String hotelId = hotel.getHotelId().toString();
-		String url = "http://api.test.lohoo.com/xml/v2.0/hotel/cn/"+hotelId.substring(hotelId.length() - 2, hotelId.length()) + "/" + hotelId + ".xml";
-		String result = HttpRequestUtil.elongGet(url);
-		Document document = DocumentHelper.parseText(result);
-		//酒店
-		Element root = document.getRootElement();
-		//酒店详情
-		Element detail = root.element("Detail");
-		//房型
-		Element rooms = root.element("Rooms");
-		//酒店图片，包含房型图片
-		Element images = root.element("Images");
-		//点评
-		root.element("Review");
-		
-		if ((getElementText(detail.element("GoogleLat")) == null || getElementText(detail.element("GoogleLon")) == null)
-				&& (getElementText(detail.element("BaiduLat")) == null || getElementText(detail.element("BaiduLon")) == null)) {
-			return null;
-		}
-		if ((Double.valueOf(getElementText(detail.element("GoogleLat"))) == 0 || Double.valueOf(getElementText(detail.element("GoogleLon"))) == 0)
-				&& (Double.valueOf(getElementText(detail.element("BaiduLat"))) == 0 || Double.valueOf(getElementText(detail.element("BaiduLon"))) == 0)) {
-			return null;
-		}
-		
-		HoltelEnty holtelEnty = new HoltelEnty();
-		//id
-		holtelEnty.setHotelId(root.attributeValue("Id"));
-		//名称
-		holtelEnty.setHotelName(getElementText(detail.element("Name")));
-		//地址
-		holtelEnty.setAddress(getElementText(detail.element("Address")));
-		//邮编
-		holtelEnty.setPostCode(getElementText(detail.element("PostalCode")));
-		//挂牌等级 此为酒店对外的挂牌星级，0-无星级；1-一星级；2-二星级；3-三星级；4-四星级；5-五星级
-		holtelEnty.setStar(getElementText(detail.element("StarRate")));
-		//艺龙等级 艺龙推荐星级，而非酒店挂牌星级。对应值含义为：0,1,2：客栈；3：舒适；4：高档；5：豪华。如果StarRate和Category都为空或0，可展示暂无数据
-		holtelEnty.setRecommendedLevel(getElementText(detail.element("Category")));
-		//电话
-		holtelEnty.setPhone(getElementText(detail.element("Phone")));
-		//传真
-		holtelEnty.setFax(getElementText(detail.element("Fax")));
-		//开业时间 年-月。“1900-01”表示无值
-		holtelEnty.setStartBusinessDate(getElementText(detail.element("EstablishmentDate")));	
-		//装修时间 年-月。“1900-01”表示无值
-		holtelEnty.setRepairdate(getElementText(detail.element("RenovationDate")));
-		//集团编号 参考酒店品牌-静态信息
-		holtelEnty.setGroupId(getElementText(detail.element("GroupId")));
-		//品牌编号
-		holtelEnty.setBrandId(getElementText(detail.element("BrandId")));
-		//是否经济型 默认值为0，1代表是经济型酒店
-		holtelEnty.setIsEconomic(getElementText(detail.element("IsEconomic")));
-		//是否公寓 默认值为0，1代表是酒店式公寓
-		holtelEnty.setIsApartment(getElementText(detail.element("IsApartment")));
-		//最早入住时间 酒店入住的最早时间，例如14表示酒店在入住日当天14:00之后允许客人入住
-		holtelEnty.setArrivalTime(getElementText(detail.element("ArrivalTime")));
-		//最晚离店时间 酒店离店的最晚时间，例如12表示客人必须在离店日当天12:00之前离店
-		holtelEnty.setDepartureTime(getElementText(detail.element("DepartureTime")));
-		//谷歌纬度
-		holtelEnty.setGoogleLat(getElementText(detail.element("GoogleLat")));
-		//谷歌经度
-		holtelEnty.setGoogleLon(getElementText(detail.element("GoogleLon")));
-		//百度纬度
-		holtelEnty.setBaiduLat(getElementText(detail.element("BaiduLat")));
-		//百度经度
-		holtelEnty.setBaiduLon(getElementText(detail.element("BaiduLon")));
-		//主城市编码
-		holtelEnty.setCityId(getElementText(detail.element("CityId")));
-		//关联城市 可能多个城市，逗号分隔；也可能包含CityId
-		holtelEnty.setCityId2(getElementText(detail.element("CityId2")));
-		//行政区编码
-		holtelEnty.setDistrictId(getElementText(detail.element("District")));
-		//商业圈编码
-		holtelEnty.setBusinessZoneId(getElementText(detail.element("BusinessZone")));
-		//附属商业圈编码
-		holtelEnty.setBusinessZoneId2(getElementText(detail.element("BusinessZone2")));
-		//支持的信用卡
-		holtelEnty.setCreditCards(getElementText(detail.element("CreditCards")));
-		//简介
-		holtelEnty.setIntro(getElementText(detail.element("IntroEditor")));
-		//描述
-		holtelEnty.setDescription(getElementText(detail.element("Description")));
-		//接机服务
-		holtelEnty.setAirportPickUpService(getElementText(detail.element("AirportPickUpService")));
-		//服务设施
-		holtelEnty.setGeneralAmenities(getElementText(detail.element("GeneralAmenities")));
-		//房间设施
-		holtelEnty.setRoomAmenities(getElementText(detail.element("RoomAmenities")));
-		//休闲设施
-		holtelEnty.setRecreationAmenities(getElementText(detail.element("RecreationAmenities")));
-		//会议设施
-		holtelEnty.setConferenceAmenities(getElementText(detail.element("ConferenceAmenities")));
-		//餐饮设施
-		holtelEnty.setDiningAmenities(getElementText(detail.element("DiningAmenities")));
-		//周边交通
-		holtelEnty.setTraffic(getElementText(detail.element("Traffic")));
-		//周边信息
-		holtelEnty.setSurroundings(getElementText(detail.element("Surroundings")));
-		//特色信息
-		holtelEnty.setFeatures(getElementText(detail.element("Features")));
-		//设施列表
-		holtelEnty.setFacilities(getElementText(detail.element("Facilities")));
-		//供应商
-		holtelEnty.setSuppliers(getElementJson(detail.element("Suppliers")));
-		//酒店服务指数
-		holtelEnty.setServiceRank(getElementJson(detail.element("ServiceRank")));
-		//是否返现
-		holtelEnty.setHasCoupon(getElementText(detail.element("HasCoupon")));
-		//酒店设施信息
-		holtelEnty.setFacilitiesV2(getElementJson(detail.element("FacilitiesV2")));
-		//酒店主题
-		holtelEnty.setThemes(getElementText(detail.element("Themes")));
-		//客房总数量
-		holtelEnty.setRoomTotalAmount(getElementText(detail.element("RoomTotalAmount")));
-		//酒店图片，包含房型图片
-		holtelEnty.setImages(getElementJson(images));
-		//更新内容:0-酒店、1-房型、2-图片；逗号分隔；仅反映最后一次更新的内容
-		holtelEnty.setModification(hotel.getModification());
-		//包含产品:0-现付、1-预付、2-今日特价、3-限时抢购、4-钟点房（酒店不可用时为空）
-		holtelEnty.setProducts(hotel.getProducts());
-		//酒店状态 为空默认为OPEN。OPEN: 可以销售；CLOSE: 已经关闭。
-		holtelEnty.setHotelStatus(getElementText(detail.element("HotelStatus")));
-		//更新时间
-		holtelEnty.setUpdateTime(hotel.getUpdateTime());
-		
-		RoomEntity roomEntity = null;
-		List<RoomEntity> roomEntities = new ArrayList<RoomEntity>();
-		Element room = null;
-		for (int i = 0; i < rooms.elements("Room").size(); i++) {
-			room = (Element) rooms.elements("Room").get(i);
-			roomEntity = new RoomEntity();
-			roomEntities.add(roomEntity);
-			//酒店id
-			roomEntity.setHotelId(root.attributeValue("Id"));
-			//房间id
-			roomEntity.setRoomId(room.attributeValue("Id"));
-			//房间名称
-			roomEntity.setRoomName(room.attributeValue("Name"));
-			//面积
-			roomEntity.setAcreage(room.attributeValue("Area"));
-			//楼层
-			roomEntity.setFloor(room.attributeValue("Floor"));
-			//上网情况 0表示无宽带，1 表示有宽带, 2 表示有WIFI
-			roomEntity.setHasNet(room.attributeValue("BroadnetAccess"));
-			// 上网费用 0表示免费，1 表示收费
-			roomEntity.setNetFee(room.attributeValue("BroadnetFee"));
-			// 床型
-			roomEntity.setBedType(room.attributeValue("BedType"));
-			//描述 包括床型、宽带等信息，可自行从Facilities中解析
-			roomEntity.setDescription(room.attributeValue("Description"));
-			//备注
-			roomEntity.setComments(room.attributeValue("Comments"));
-			// 最大入住人数 如没有提供请根据房间名称判断：单人间或有单字的为1人，三人间的为3人，其他的默认2人；7表示6人以上；精确的请参考下方的Facilities。床位房购买的为床位，与此处的入住人数无关。
-			roomEntity.setMaxAdult(room.attributeValue("Capacity"));
-			//房间设施
-			roomEntity.setFacilities(room.attributeValue("Facilities"));
-			//房型数量
-			roomEntity.setRoomAcount(room.attributeValue("Amount"));
-		}
-		holtelEnty.setRoomEntities(roomEntities);
-		return holtelEnty;
-	}
-	
-	//获取节点内容
-	private String getElementText(Element element) {
-		if (element != null) {
-			return element.getText();
-		}
-		return null;
-	}
-	
-	//获取节点内容
-	private String getElementJson(Element element) {
-		if (element != null) {
-			return XML.toJSONObject(element.asXML(), true).toString();
-		}
-		return null;
-	}
-}

hotels_api/src/main/java/com/tripto/api/supplier/qunar/service/QunarStaticInforServiceImpl.java

@@ -1,212 +0,0 @@
-package com.tripto.api.supplier.qunar.service;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.tripto.api.supplier.service.entity.DistrictEntity;
-import com.tripto.api.supplier.service.entity.HoltelEnty;
-import com.tripto.api.supplier.service.entity.RoomEntity;
-import com.tripto.api.util.HttpRequestUtil;
-import com.tripto.api.util.ParseRequestUtil;
-/**
- * 去哪儿ServiceImpl
- * @author zhx
- *
- */
-public class QunarStaticInforServiceImpl implements QunarStaticInforService{
-
-	/**
-	 * 城市信息获取
-	 * @return 城市信息集合
-	 * @throws Exception
-	 */
-	public List<DistrictEntity> queryCity() throws Exception {
-		Map<String, Object> reqData = HttpRequestUtil.getQunarRequestData();
-		String result = HttpRequestUtil.qunarPost("city/queryCity.json", JSON.toJSONString(reqData));
-		JSONObject jsonObject = ParseRequestUtil.parseQunarJson(result);
-		DistrictEntity districtEntity = null;
-		List<DistrictEntity> districtEntities = new ArrayList<DistrictEntity>();
-		JSONObject info = null;
-		JSONArray infoList = jsonObject.getJSONArray("hotelGeoList");
-		for (int i = 0; i < infoList.size(); i++) {
-			info = infoList.getJSONObject(i);
-			districtEntity = new DistrictEntity();
-			districtEntities.add(districtEntity);
-			districtEntity.setCountryName(info.getString("country"));
-			districtEntity.setProvinceId(info.getString("provinceId"));
-			districtEntity.setProvinceName(info.getString("provinceName"));
-			districtEntity.setCityId(info.getString("cityName"));
-			districtEntity.setCityName(info.getString("cityCode"));
-		}
-		return districtEntities;
-	}
-	
-	/**
-	 * 酒店列表获取
-	 * @param updatedTime 更新时间
-	 * @return 城市信息集合
-	 * @throws Exception
-	 */
-	public List<HoltelEnty> queryHotelList(String updatedTime) throws Exception {
-		Map<String, Object> reqData = HttpRequestUtil.getQunarRequestData();
-		if (updatedTime != null) {
-			Map<String, Object> data = new HashMap<String, Object>(1);
-			data.put("updatedTime", updatedTime);
-			reqData.put("data", data);
-		}
-		String result = HttpRequestUtil.qunarPost("hotel/queryHotelList.json", JSON.toJSONString(reqData));
-		JSONObject jsonObject = ParseRequestUtil.parseQunarJson(result);
-		JSONArray jsonArray = jsonObject.getJSONArray("hotels");
-		HoltelEnty holtelEnty = null;
-		List<HoltelEnty> list = new ArrayList<HoltelEnty>();
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
-		if (!jsonArray.isEmpty()) {
-			for (int i = 0; i < jsonArray.size(); i++) {
-				holtelEnty = new HoltelEnty();
-				list.add(holtelEnty);
-				holtelEnty.setHotelId(jsonArray.getJSONObject(i).getString("hotelId"));
-				holtelEnty.setUpdateTime(sdf.format(jsonArray.getJSONObject(i).getLong("hotelId")));
-			}
-			return list;
-		}
-		return null;
-	}
-	
-	/**
-	 * 酒店，房型详情获取
-	 * @param hotels
-	 * @param isNeedImage
-	 * @param isNeedRooms
-	 * @return 酒店，房型详情信息集合
-	 * @throws Exception
-	 */
-	public List<HoltelEnty> queryHotelDetail(List<HoltelEnty> hotels, boolean isNeedImage, boolean isNeedRooms) throws Exception {
-			Map<String, String> hotelIdMap = new HashMap<String, String>();
-			for (HoltelEnty holtel : hotels) {
-				hotelIdMap.put(holtel.getHotelId(), holtel.getUpdateTime());
-			}
-			Map<String, Object> reqData = HttpRequestUtil.getQunarRequestData();
-			Map<String, Object> data = new HashMap<String, Object>();
-			data.put("hotelIds", hotelIdMap.keySet());
-			data.put("isNeedImage", isNeedImage);
-			data.put("isNeedRooms", isNeedRooms);
-			reqData.put("data", data);
-			String result = HttpRequestUtil.qunarPost("hotel/queryHotelDetail.json", JSON.toJSONString(reqData));
-			JSONObject jsonObject = ParseRequestUtil.parseQunarJson(result);
-			JSONObject info = null;
-			JSONArray infoList = jsonObject.getJSONArray("hotelDetail");
-			HoltelEnty holtel = null;
-			RoomEntity room = null;
-			List<HoltelEnty> list = new ArrayList<HoltelEnty>();
-			List<RoomEntity> roomList = new ArrayList<RoomEntity>();
-			JSONObject roonInfo = null;
-			JSONArray roomInfoList = null;
-			for (int i = 0; i < infoList.size(); i++) {
-				info = infoList.getJSONObject(i);
-				if (info.getJSONObject("detail").getString("baiduLat") == null ||
-						info.getJSONObject("detail").getString("baiduLon") == null) {
-					break;
-				}
-				if (Double.valueOf(info.getJSONObject("detail").getString("baiduLat")) == 0 ||
-						Double.valueOf(info.getJSONObject("detail").getString("baiduLon")) == null) {
-					break;
-				}
-				holtel = new HoltelEnty();
-				holtel.setRoomEntities(roomList);
-				list.add(holtel);
-				//酒店id
-				holtel.setHotelId(info.getString("hotelId"));
-				//酒店名称
-				holtel.setHotelName(info.getJSONObject("detail").getString("name"));
-				//酒店英文名称
-				//holtel.setHotelNameEn(info.getJSONObject("detail").getString("enName"));
-				//城市code
-				holtel.setCityName(info.getJSONObject("detail").getString("city"));
-				//商业圈
-				holtel.setBusinessZoneName(info.getJSONObject("detail").getString("businessZone"));
-				//行政区
-				holtel.setDistrictName(info.getJSONObject("detail").getString("district"));
-				//酒店地址
-				holtel.setAddress(info.getJSONObject("detail").getString("address"));
-				//电话
-				holtel.setPhone(info.getJSONObject("detail").getString("phone"));
-				//传真
-				holtel.setFax(info.getJSONObject("detail").getString("fax"));
-				//开业时间
-				holtel.setStartBusinessDate(info.getJSONObject("detail").getString("establishmentDate"));
-				//装修时间
-				holtel.setRepairdate(info.getJSONObject("detail").getString("renovationDate"));
-				//去哪儿推荐星级/档次 1-经济型，2-三星及舒适，3-四星及高档，4-五星及豪华，5-二星及其他
-				holtel.setRecommendedLevel(info.getJSONObject("detail").getString("category"));
-				//酒店星级
-				holtel.setStar(info.getJSONObject("detail").getString("starRate"));
-				//纬度
-				holtel.setBaiduLat(info.getJSONObject("detail").getString("baiduLat"));
-				//经度
-				holtel.setBaiduLon(info.getJSONObject("detail").getString("baiduLon"));
-				//介绍信息
-				holtel.setIntro(info.getJSONObject("detail").getString("introEditor"));
-				//一句话描述
-				holtel.setDescription(info.getJSONObject("detail").getString("description"));
-				//接机服务
-				holtel.setAirportPickUpService(info.getJSONObject("detail").getString("airportPickUpService"));
-				//服务设施
-				holtel.setGeneralAmenities(info.getJSONObject("detail").getString("generalAmenities"));
-				//房间设施
-				holtel.setRoomAmenities(info.getJSONObject("detail").getString("roomAmenities"));
-				//酒店头图地址
-				holtel.setThumbnailId(info.getJSONObject("detail").getString("thumbnailId"));
-				//酒店评分，满分5分
-				holtel.setCommentScore(info.getJSONObject("detail").getString("commentScore"));
-				//地标
-				holtel.setLandmarks(info.getJSONObject("detail").getString("landmarks"));
-				if (isNeedImage) {
-					holtel.setImages(info.getJSONObject("detail").getString("images"));
-				}else {
-					holtel.setImages(null);
-				}
-				holtel.setUpdateTime(hotelIdMap.get(info.get("hotelId")));
-
-				if (isNeedRooms) {
-					roomInfoList = info.getJSONArray("rooms");
-					for (int j = 0; j < roomInfoList.size(); j++) {
-						room = new RoomEntity(); 
-						roomList.add(room);
-						roonInfo = roomInfoList.getJSONObject(j);
-						//酒店id
-						room.setHotelId(info.getString("hotelId"));
-						//房型id
-						room.setRoomId(roonInfo.getString("roomTypeId"));
-						//房型名称
-						room.setRoomName(roonInfo.getString("name"));
-						//床型，BIG-大床，DOUBLE-双人床，BIG_DOUBLE-大双床，OTHER-其他
-						room.setBedType(roonInfo.getString("bedType"));
-						//面积
-						room.setAcreage(roonInfo.getString("area"));
-						//楼层数
-						room.setFloor(roonInfo.getString("floor"));
-						//最大入住人数，0-不设置
-						room.setMaxAdult(roonInfo.getString("maxCustomers"));
-						//窗户
-						room.setHasWindow(roonInfo.getString("window"));
-						//网络
-						Map<String, Object> map = new HashMap<String, Object>();
-						map.put("wifi", roonInfo.get("wifi"));
-						map.put("broadnet", roonInfo.get("broadnet"));
-						room.setNetFee(JSON.toJSONString(map));
-						//洗澡
-						room.setBath(roonInfo.getString("bath"));
-						//房间特色
-						room.setHighLights(roonInfo.getString("highLights"));
-					}
-				}
-			}
-			return list;
-	}
-}

hotels_rpc/src/main/java/com/tripto/api/platform/ctrip/service/CtripStaticInforService.java

@@ -1,71 +0,0 @@
-package com.tripto.api.platform.ctrip.service;
-
-import java.util.List;
-
-import com.tripto.api.supplier.service.entity.DistrictEntity; 
-
-public interface CtripStaticInforService {
-
-	/**
-	 * 获取国家集合
-	 * @return
-	 */
-	public List<DistrictEntity> getdltcountrylist() throws Exception;
-	
-	/**
-	 * 获取某一国家中城市总条数
-	 * @param countryId 国家信息
-	 * @return
-	 */
-	public int getdltcitylisttotal(String countryId) throws Exception;
-	
-	/**
-	 * 获取某一国家中城市
-	 * @param pageSize
-	 * @param currentPageIndex
-	 * @param countryId
-	 */
-	public List<DistrictEntity> getdltcitylist(int pageSize, int currentPageIndex, String countryId) throws Exception;
-	
-	/**
-	 * 获取母酒店总条数
-	 * @return
-	 */
-	public int getdltmasterhotellisttotal(String cityId) throws Exception;
-	
-	/**
-	 * 分页保存母酒店信息
-	 * @param pageSize
-	 * @param currentPageIndex
-	 * @param cityId
-	 * @throws Exception
-	 */
-	public void getdltmasterhotellist(int pageSize, int currentPageIndex, String cityId) throws Exception;
-	
-	/**
-	 * 获取子酒店总条数
-	 * @return
-	 */
-	public int getdlthotellisttotal() throws Exception;
-	
-	/**
-	 * 分页保存自酒店
-	 * @param pageSize
-	 * @param currentPageIndex
-	 */
-	public void getdlthotellist(int pageSize, int currentPageIndex) throws Exception;
-
-	/**
-	 * 保存母物理房型
-	 * @param hotelId
-	 * @throws Exception
-	 */
-	public void getdltbasicroomlist(Object hotelId) throws Exception;
-	
-	/**
-	 * 保存自物理房型信息
-	 * @param hotelId
-	 * @throws Exception
-	 */
-	public void gethotelroomstaticinfo(Object hotelId) throws Exception;
-}

hotels_rpc/src/main/java/com/tripto/api/supplier/cnbooking/service/CNBookingStaticInforService.java

@@ -1,71 +0,0 @@
-package com.tripto.api.supplier.cnbooking.service;
-
-import java.util.List;
-
-import com.tripto.api.supplier.service.entity.BedTypeEntity;
-import com.tripto.api.supplier.service.entity.DistrictEntity;
-import com.tripto.api.supplier.service.entity.HoltelEnty;
-import com.tripto.api.supplier.service.entity.RoomEntity;
-import com.tripto.api.supplier.service.entity.RoomTypeEntity;
-/**
- * 龙腾捷旅Service
- * @author zhx
- *
- */
-public interface CNBookingStaticInforService {
-	
-	/**
-	 * 查找区域
-	 * @return
-	 * @throws Exception
-	 */
-	public List<DistrictEntity> cityQuery() throws Exception;
-	
-	/**
-	 * 获取床型静态信息
-	 * @return
-	 * @throws Exception
-	 */
-	public List<BedTypeEntity> bedTypeQuery() throws Exception;
-	
-	/**
-	 * 获取房型静态信息
-	 * @return
-	 * @throws Exception
-	 */
-	public List<RoomTypeEntity> roomTypeQuery() throws Exception;
-	
-	/**
-	 * 获取酒店总数
-	 * @param countryId 国家id
-	 * @return 酒店数量
-	 * @throws Exception
-	 */
-	public int getHotelCount(Long countryId) throws Exception;
-	
-	/**
-	 * 获取酒店静态信息
-	 * @param pageItems 每页条数
-	 * @param pageNo 页码
-	 * @param countryId 国家id
-	 * @return 酒店信息集合
-	 * @throws Exception
-	 */
-	public List<HoltelEnty> hotelSearch(int pageItems, int pageNo, Long countryId) throws Exception;
-	
-	/**
-	 * 房间查询
-	 * @param pageItems 每页条数
-	 * @param pageNo 页码
-	 * @param countryId 国家id
-	 * @return 房间信息集合
-	 * @throws Exception
-	 */
-	public List<RoomEntity> roomSearch(int pageItems, int pageNo, Long countryId) throws Exception;
-	
-	/**
-	 * 数据字典静态信息
-	 * @throws Exception
-	 */
-	public void loadCNBookingDictionary() throws Exception;
-}

hotels_rpc/src/main/java/com/tripto/api/supplier/elong/service/ElongStaticInforService.java

@@ -1,39 +0,0 @@
-package com.tripto.api.supplier.elong.service;
-
-import java.util.List;
-import java.util.Map;
-
-import com.tripto.api.supplier.service.entity.DistrictEntity;
-import com.tripto.api.supplier.service.entity.HoltelEnty;
-
-/**
- * 艺龙Service
- * @author zhx
- *
- */
-public interface ElongStaticInforService {
-
-	/**
-	 * 获取区域信息
-	 * @return
-	 * @throws Exception
-	 */
-	public Map<String, List<DistrictEntity>> queryLocation() throws Exception;
-	
-	/**
-	 * 获取酒店列表
-	 * @param updateTime
-	 * @return
-	 * @throws Exception
-	 */
-	public List<HoltelEnty> queryHotelList(String updateTime) throws Exception;
-	
-	/**
-	 * 获取酒店详情
-	 * @param HoltelEnty
-	 * @return
-	 * @throws Exception
-	 */
-	public HoltelEnty queryHotelDetailById(HoltelEnty hotel) throws Exception;
-	
-}

hotels_rpc/src/main/java/com/tripto/api/supplier/qunar/service/QunarStaticInforService.java

@@ -1,39 +0,0 @@
-package com.tripto.api.supplier.qunar.service;
-
-import java.util.List;
-
-import com.tripto.api.supplier.service.entity.DistrictEntity;
-import com.tripto.api.supplier.service.entity.HoltelEnty;
-
-/**
- * 去哪儿网Service
- * @author zhx
- *
- */
-public interface QunarStaticInforService {
-
-	/**
-	 * 城市信息获取
-	 * @return
-	 * @throws Exception
-	 */
-	public List<DistrictEntity> queryCity() throws Exception;
-	
-	/**
-	 * 酒店信息列表获取
-	 * @param updatedTime
-	 * @return
-	 * @throws Exception
-	 */
-	public List<HoltelEnty> queryHotelList(String updatedTime) throws Exception;
-	
-	/**
-	 * 酒店，房型详情获取
-	 * @param hotels
-	 * @param isNeedImage
-	 * @param isNeedRooms
-	 * @return
-	 * @throws Exception
-	 */
-	public List<HoltelEnty> queryHotelDetail(List<HoltelEnty> hotels, boolean isNeedImage, boolean isNeedRooms) throws Exception;
-}

hotels_rpc/src/main/java/com/tripto/api/supplier/service/entity/BedTypeEntity.java

@@ -1,34 +0,0 @@
-package com.tripto.api.supplier.service.entity;
-
-import java.io.Serializable;
-
-public class BedTypeEntity implements Serializable {
-	
-	private static final long serialVersionUID = 2381574701111445048L;
-
-	/**
-	 * 床型id
-	 */
-	private String BedTypeId;
-	
-	/**
-	 * 床型名称
-	 */
-	private String BedTypeName;
-
-	public String getBedTypeId() {
-		return BedTypeId;
-	}
-
-	public void setBedTypeId(String bedTypeId) {
-		BedTypeId = bedTypeId;
-	}
-
-	public String getBedTypeName() {
-		return BedTypeName;
-	}
-
-	public void setBedTypeName(String bedTypeName) {
-		BedTypeName = bedTypeName;
-	}
-}

hotels_rpc/src/main/java/com/tripto/api/supplier/service/entity/DistrictEntity.java

@@ -1,112 +0,0 @@
-package com.tripto.api.supplier.service.entity;
-
-import java.io.Serializable;
-
-public class DistrictEntity implements Serializable {
-	
-	private static final long serialVersionUID = 3412642054554911553L;
-
-	/**
-	 * 国家id
-	 */
-	private String countryId;
-	
-	/**
-	 * 国家名称
-	 */
-	private String countryName;
-	
-	/**
-	 * 省份id
-	 */
-	private String provinceId;
-	
-	/**
-	 * 省份名称
-	 */
-	private String provinceName;
-	
-	/**
-	 * 城市id
-	 */
-	private String cityId;
-	
-	/**
-	 * 城市名称
-	 */
-	private String cityName;
-	
-	/**
-	 * 区域id
-	 */
-	private Long districtId;
-	
-	/**
-	 * 区域名称
-	 */
-	private String districtName;
-
-	public String getCountryId() {
-		return countryId;
-	}
-
-	public void setCountryId(String countryId) {
-		this.countryId = countryId;
-	}
-
-	public String getCountryName() {
-		return countryName;
-	}
-
-	public void setCountryName(String countryName) {
-		this.countryName = countryName;
-	}
-
-	public String getProvinceId() {
-		return provinceId;
-	}
-
-	public void setProvinceId(String provinceId) {
-		this.provinceId = provinceId;
-	}
-
-	public String getProvinceName() {
-		return provinceName;
-	}
-
-	public void setProvinceName(String provinceName) {
-		this.provinceName = provinceName;
-	}
-
-	public String getCityId() {
-		return cityId;
-	}
-
-	public void setCityId(String cityId) {
-		this.cityId = cityId;
-	}
-
-	public String getCityName() {
-		return cityName;
-	}
-
-	public void setCityName(String cityName) {
-		this.cityName = cityName;
-	}
-
-	public Long getDistrictId() {
-		return districtId;
-	}
-
-	public void setDistrictId(Long districtId) {
-		this.districtId = districtId;
-	}
-
-	public String getDistrictName() {
-		return districtName;
-	}
-
-	public void setDistrictName(String districtName) {
-		this.districtName = districtName;
-	}
-}

hotels_rpc/src/main/java/com/tripto/api/supplier/service/entity/HoltelEnty.java

@@ -1,841 +0,0 @@
-package com.tripto.api.supplier.service.entity;
-
-import java.io.Serializable;
-import java.util.List;
-
-public class HoltelEnty implements Serializable {
-
-	private static final long serialVersionUID = -5338927227355803064L;
-
-	/**
-	 * 酒店id
-	 */
-	private String hotelId;
-	
-	/**
-	 * 酒店名称
-	 */
-	private String hotelName;
-	
-	/**
-	 * 国家id
-	 */
-	private String countryId;
-	
-	/**
-	 * 国家名称
-	 */
-	private String countryName;
-	
-	/**
-	 * 省份id
-	 */
-	private String provinceId;
-	
-	/**
-	 * 省份名号曾
-	 */
-	private String provinceName;
-	
-	/**
-	 * 城市id
-	 */
-	private String cityId;
-	
-	/**
-	 * 城市名称
-	 */
-	private String cityName;
-	
-	/**
-	 * 关联城市 可能多个城市，逗号分隔；也可能包含CityId
-	 */
-	private String CityId2;
-	
-	/**
-	 * 行政区id
-	 */
-	private String districtId;
-	
-	/**
-	 * 行政区名称
-	 */
-	private String districtName;
-	
-	/**
-	 * 商业区id
-	 */
-	private String businessZoneId;
-	
-	/**
-	 * 商业区名称名称
-	 */
-	private String businessZoneName;
-	
-	/**
-	 * 附属商业圈编码
-	 */
-	private String businessZoneId2;
-	
-	/**
-	 * 支持的信用卡
-	 */
-	private String creditCards;
-	
-	/**
-	 * 地址
-	 */
-	private String address;
-	
-	/**
-	 * 邮编
-	 */
-	private String postCode;
-	
-	/**
-	 * 邮箱
-	 */
-	private String email;
-	
-	/**
-	 * 电话
-	 */
-	private String phone;
-	
-	/**
-	 * 传真
-	 */
-	private String fax;
-	
-	/**
-	 * 开业时间
-	 */
-	private String startBusinessDate;
-	
-	/**
-	 * 装修时间
-	 */
-	private String repairdate;
-	
-	/**
-	 * 集团编号
-	 */
-	private String groupId;
-	
-	/**
-	 * 品牌编号
-	 */
-	private String brandId;
-	
-	/**
-	 * 是否经济型 默认值为0，1代表是经济型酒店
-	 */
-	private String isEconomic;
-	
-	/**
-	 * 是否公寓 默认值为0，1代表是酒店式公寓
-	 */
-	private String isApartment;
-	
-	/**
-	 * 最早入住时间 酒店入住的最早时间，例如14表示酒店在入住日当天14:00之后允许客人入住
-	 */
-	private String arrivalTime;
-	
-	/**
-	 * 最晚离店时间 酒店离店的最晚时间，例如12表示客人必须在离店日当天12:00之前离店
-	 */
-	private String departureTime;
-	
-	/**
-	 * 推荐等级
-	 */
-	private String recommendedLevel;
-	
-	/**
-	 * 星级
-	 */
-	private String star;
-	
-	/**
-	 * 纬度
-	 */
-	private String googleLon;
-	
-	/**
-	 * 经度
-	 */
-	private String googleLat;
-	
-	/**
-	 * 纬度
-	 */
-	private String baiduLon;
-	
-	/**
-	 * 经度
-	 */
-	private String baiduLat;
-	
-	/**
-	 * 简介
-	 */
-	private String intro;
-	
-	/**
-	 * 描述
-	 */
-	private String description;
-	
-	/**
-	 * 接机服务
-	 */
-	private String airportPickUpService;
-	
-	/**
-	 * 服务设施
-	 */
-	private String generalAmenities;
-	
-	/**
-	 * 房间设施
-	 */
-	private String roomAmenities;
-	
-	/**
-	 * 休闲设施
-	 */
-	private String recreationAmenities;
-	
-	/**
-	 * 会议设施
-	 */
-	private String conferenceAmenities;
-	
-	/**
-	 * 餐饮设施
-	 */
-	private String diningAmenities;
-	
-	/**
-	 * 周边交通
-	 */
-	private String traffic;
-	
-	/**
-	 * 周边信息
-	 */
-	private String surroundings;
-	
-	/**
-	 * 特色信息
-	 */
-	private String features;
-	
-	/**
-	 * 设施列表
-	 */
-	private String facilities;
-	
-	/**
-	 * 设施信息
-	 */
-	private String facilitiesV2;
-	
-	/**
-	 * 酒店头图地址
-	 */
-	private String thumbnailId;
-	
-	/**
-	 * 酒店评分
-	 */
-	private String commentScore;
-	
-	/**
-	 * 是否允许互联网销售，0：不允许 1：允许
-	 */
-	private String allowWebSale;
-	
-	/**
-	 * 客户指引
-	 */
-	private String guide;
-	
-	/**
-	 * 备用字段
-	 */
-	private String reserve2;
-	
-	/**
-	 * 图片
-	 */
-	private String images;
-	
-	/**
-	 * 标志建筑
-	 */
-	private String landmarks;
-	
-	/**
-	 * 服务指数
-	 */
-	private String serviceRank;
-	
-	/**
-	 * 是否返现
-	 */
-	private String hasCoupon;
-	
-	/**
-	 * 主题
-	 */
-	private String themes;
-	
-	/**
-	 * 酒店总量
-	 */
-	private String roomTotalAmount;
-	
-	/**
-	 * 供应商
-	 */
-	private String suppliers;
-	
-	/**
-	 * 更新内容
-	 */
-	private String modification;
-	
-	/**
-	 * 产品 包含产品:0-现付、1-预付、2-今日特价、3-限时抢购、4-钟点房（酒店不可用时为空）
-	 */
-	private String products;
-	
-	/**
-	 * 酒店状态
-	 */
-	private String hotelStatus;
-	
-	/**
-	 * 更新时间
-	 */
-	private String updateTime;
-	
-	/**
-	 * 房间信息
-	 */
-	private List<RoomEntity> roomEntities;
-
-	public String getHotelId() {
-		return hotelId;
-	}
-
-	public void setHotelId(String hotelId) {
-		this.hotelId = hotelId;
-	}
-
-	public String getHotelName() {
-		return hotelName;
-	}
-
-	public void setHotelName(String hotelName) {
-		this.hotelName = hotelName;
-	}
-
-	public String getCountryId() {
-		return countryId;
-	}
-
-	public void setCountryId(String countryId) {
-		this.countryId = countryId;
-	}
-
-	public String getCountryName() {
-		return countryName;
-	}
-
-	public void setCountryName(String countryName) {
-		this.countryName = countryName;
-	}
-
-	public String getProvinceId() {
-		return provinceId;
-	}
-
-	public void setProvinceId(String provinceId) {
-		this.provinceId = provinceId;
-	}
-
-	public String getProvinceName() {
-		return provinceName;
-	}
-
-	public void setProvinceName(String provinceName) {
-		this.provinceName = provinceName;
-	}
-
-	public String getCityId() {
-		return cityId;
-	}
-
-	public void setCityId(String cityId) {
-		this.cityId = cityId;
-	}
-
-	public String getCityName() {
-		return cityName;
-	}
-
-	public void setCityName(String cityName) {
-		this.cityName = cityName;
-	}
-
-	public String getAddress() {
-		return address;
-	}
-
-	public void setAddress(String address) {
-		this.address = address;
-	}
-
-	public String getPostCode() {
-		return postCode;
-	}
-
-	public void setPostCode(String postCode) {
-		this.postCode = postCode;
-	}
-
-	public String getEmail() {
-		return email;
-	}
-
-	public void setEmail(String email) {
-		this.email = email;
-	}
-
-	public String getStartBusinessDate() {
-		return startBusinessDate;
-	}
-
-	public void setStartBusinessDate(String startBusinessDate) {
-		this.startBusinessDate = startBusinessDate;
-	}
-
-	public String getRepairdate() {
-		return repairdate;
-	}
-
-	public void setRepairdate(String repairdate) {
-		this.repairdate = repairdate;
-	}
-
-	public String getRecommendedLevel() {
-		return recommendedLevel;
-	}
-
-	public void setRecommendedLevel(String recommendedLevel) {
-		this.recommendedLevel = recommendedLevel;
-	}
-
-	public String getStar() {
-		return star;
-	}
-
-	public void setStar(String star) {
-		this.star = star;
-	}
-
-	public String getGoogleLon() {
-		return googleLon;
-	}
-
-	public void setGoogleLon(String googleLon) {
-		this.googleLon = googleLon;
-	}
-
-	public String getGoogleLat() {
-		return googleLat;
-	}
-
-	public void setGoogleLat(String googleLat) {
-		this.googleLat = googleLat;
-	}
-
-	public String getBaiduLon() {
-		return baiduLon;
-	}
-
-	public void setBaiduLon(String baiduLon) {
-		this.baiduLon = baiduLon;
-	}
-
-	public String getBaiduLat() {
-		return baiduLat;
-	}
-
-	public void setBaiduLat(String baiduLat) {
-		this.baiduLat = baiduLat;
-	}
-
-	public String getIntro() {
-		return intro;
-	}
-
-	public void setIntro(String intro) {
-		this.intro = intro;
-	}
-
-	public String getAllowWebSale() {
-		return allowWebSale;
-	}
-
-	public void setAllowWebSale(String allowWebSale) {
-		this.allowWebSale = allowWebSale;
-	}
-
-	public String getGuide() {
-		return guide;
-	}
-
-	public void setGuide(String guide) {
-		this.guide = guide;
-	}
-
-	public String getReserve2() {
-		return reserve2;
-	}
-
-	public void setReserve2(String reserve2) {
-		this.reserve2 = reserve2;
-	}
-
-	public String getImages() {
-		return images;
-	}
-
-	public void setImages(String images) {
-		this.images = images;
-	}
-
-	public String getLandmarks() {
-		return landmarks;
-	}
-
-	public void setLandmarks(String landmarks) {
-		this.landmarks = landmarks;
-	}
-
-	public String getUpdateTime() {
-		return updateTime;
-	}
-
-	public void setUpdateTime(String updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public String getDistrictName() {
-		return districtName;
-	}
-
-	public void setDistrictName(String districtName) {
-		this.districtName = districtName;
-	}
-
-	public String getBusinessZoneName() {
-		return businessZoneName;
-	}
-
-	public void setBusinessZoneName(String businessZoneName) {
-		this.businessZoneName = businessZoneName;
-	}
-
-	public String getPhone() {
-		return phone;
-	}
-
-	public void setPhone(String phone) {
-		this.phone = phone;
-	}
-
-	public String getFax() {
-		return fax;
-	}
-
-	public void setFax(String fax) {
-		this.fax = fax;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public String getAirportPickUpService() {
-		return airportPickUpService;
-	}
-
-	public void setAirportPickUpService(String airportPickUpService) {
-		this.airportPickUpService = airportPickUpService;
-	}
-
-	public String getGeneralAmenities() {
-		return generalAmenities;
-	}
-
-	public void setGeneralAmenities(String generalAmenities) {
-		this.generalAmenities = generalAmenities;
-	}
-
-	public String getRoomAmenities() {
-		return roomAmenities;
-	}
-
-	public void setRoomAmenities(String roomAmenities) {
-		this.roomAmenities = roomAmenities;
-	}
-
-	public String getThumbnailId() {
-		return thumbnailId;
-	}
-
-	public void setThumbnailId(String thumbnailId) {
-		this.thumbnailId = thumbnailId;
-	}
-
-	public String getCommentScore() {
-		return commentScore;
-	}
-
-	public void setCommentScore(String commentScore) {
-		this.commentScore = commentScore;
-	}
-
-	public List<RoomEntity> getRoomEntities() {
-		return roomEntities;
-	}
-
-	public void setRoomEntities(List<RoomEntity> roomEntities) {
-		this.roomEntities = roomEntities;
-	}
-
-	public String getCityId2() {
-		return CityId2;
-	}
-
-	public void setCityId2(String cityId2) {
-		CityId2 = cityId2;
-	}
-
-	public String getDistrictId() {
-		return districtId;
-	}
-
-	public void setDistrictId(String districtId) {
-		this.districtId = districtId;
-	}
-
-	public String getBusinessZoneId() {
-		return businessZoneId;
-	}
-
-	public void setBusinessZoneId(String businessZoneId) {
-		this.businessZoneId = businessZoneId;
-	}
-
-	public String getBusinessZoneId2() {
-		return businessZoneId2;
-	}
-
-	public void setBusinessZoneId2(String businessZoneId2) {
-		this.businessZoneId2 = businessZoneId2;
-	}
-
-	public String getCreditCards() {
-		return creditCards;
-	}
-
-	public void setCreditCards(String creditCards) {
-		this.creditCards = creditCards;
-	}
-
-	public String getGroupId() {
-		return groupId;
-	}
-
-	public void setGroupId(String groupId) {
-		this.groupId = groupId;
-	}
-
-	public String getBrandId() {
-		return brandId;
-	}
-
-	public void setBrandId(String brandId) {
-		this.brandId = brandId;
-	}
-
-	public String getIsEconomic() {
-		return isEconomic;
-	}
-
-	public void setIsEconomic(String isEconomic) {
-		this.isEconomic = isEconomic;
-	}
-
-	public String getIsApartment() {
-		return isApartment;
-	}
-
-	public void setIsApartment(String isApartment) {
-		this.isApartment = isApartment;
-	}
-
-	public String getArrivalTime() {
-		return arrivalTime;
-	}
-
-	public void setArrivalTime(String arrivalTime) {
-		this.arrivalTime = arrivalTime;
-	}
-
-	public String getDepartureTime() {
-		return departureTime;
-	}
-
-	public void setDepartureTime(String departureTime) {
-		this.departureTime = departureTime;
-	}
-
-	public String getRecreationAmenities() {
-		return recreationAmenities;
-	}
-
-	public void setRecreationAmenities(String recreationAmenities) {
-		this.recreationAmenities = recreationAmenities;
-	}
-
-	public String getConferenceAmenities() {
-		return conferenceAmenities;
-	}
-
-	public void setConferenceAmenities(String conferenceAmenities) {
-		this.conferenceAmenities = conferenceAmenities;
-	}
-
-	public String getDiningAmenities() {
-		return diningAmenities;
-	}
-
-	public void setDiningAmenities(String diningAmenities) {
-		this.diningAmenities = diningAmenities;
-	}
-
-	public String getTraffic() {
-		return traffic;
-	}
-
-	public void setTraffic(String traffic) {
-		this.traffic = traffic;
-	}
-
-	public String getSurroundings() {
-		return surroundings;
-	}
-
-	public void setSurroundings(String surroundings) {
-		this.surroundings = surroundings;
-	}
-
-	public String getFeatures() {
-		return features;
-	}
-
-	public void setFeatures(String features) {
-		this.features = features;
-	}
-
-	public String getFacilities() {
-		return facilities;
-	}
-
-	public void setFacilities(String facilities) {
-		this.facilities = facilities;
-	}
-
-	public String getFacilitiesV2() {
-		return facilitiesV2;
-	}
-
-	public void setFacilitiesV2(String facilitiesV2) {
-		this.facilitiesV2 = facilitiesV2;
-	}
-
-	public String getServiceRank() {
-		return serviceRank;
-	}
-
-	public void setServiceRank(String serviceRank) {
-		this.serviceRank = serviceRank;
-	}
-
-	public String getHasCoupon() {
-		return hasCoupon;
-	}
-
-	public void setHasCoupon(String hasCoupon) {
-		this.hasCoupon = hasCoupon;
-	}
-
-	public String getThemes() {
-		return themes;
-	}
-
-	public void setThemes(String themes) {
-		this.themes = themes;
-	}
-
-	public String getRoomTotalAmount() {
-		return roomTotalAmount;
-	}
-
-	public void setRoomTotalAmount(String roomTotalAmount) {
-		this.roomTotalAmount = roomTotalAmount;
-	}
-
-	public String getModification() {
-		return modification;
-	}
-
-	public void setModification(String modification) {
-		this.modification = modification;
-	}
-
-	public String getProducts() {
-		return products;
-	}
-
-	public void setProducts(String products) {
-		this.products = products;
-	}
-
-	public String getHotelStatus() {
-		return hotelStatus;
-	}
-
-	public void setHotelStatus(String hotelStatus) {
-		this.hotelStatus = hotelStatus;
-	}
-
-	public String getSuppliers() {
-		return suppliers;
-	}
-
-	public void setSuppliers(String suppliers) {
-		this.suppliers = suppliers;
-	}
-}

hotels_rpc/src/main/java/com/tripto/api/supplier/service/entity/RoomEntity.java

@@ -1,345 +0,0 @@
-package com.tripto.api.supplier.service.entity;
-
-import java.io.Serializable;
-
-public class RoomEntity implements Serializable {
-
-	private static final long serialVersionUID = 1667571093810985145L;
-	/**
-	 * 酒店id
-	 */
-	private String hotelId;
-	
-	/**
-	 * 房间id
-	 */
-	private String roomId;
-	
-	/**
-	 * 房间名称
-	 */
-	private String roomName;
-	
-	/**
-	 * 房间类型id
-	 */
-	private String roomTypeId;
-	
-	/**
-	 * 房间类型名称
-	 */
-	private String roomType;
-	
-	/**
-	 * 床型id
-	 */
-	private String bedTypeId;
-	
-	/**
-	 * 床型名称
-	 */
-	private String bedType;
-	
-	/**
-	 * 面积
-	 */
-	private String acreage;
-	
-	/**
-	 * 楼层
-	 */
-	private String floor;
-	
-	/**
-	 * 房间数量
-	 */
-	private String roomAcount;
-	
-	/**
-	 * 最大成人数
-	 */
-	private String maxAdult;
-	
-	/**
-	 * 最大儿童数
-	 */
-	private String maxChild;
-	
-	/**
-	 * 是否有窗户
-	 */
-	private String hasWindow;
-	
-	/**
-	 * 是否允许加床
-	 */
-	private String allowAddBed;
-	
-	/**
-	 * 加床数量
-	 */
-	private String allowAddBedNum;
-	
-	/**
-	 * 是否允许吸烟
-	 */
-	private String allowSmoke;
-	
-	/**
-	 * 是否有网络, 0:无  1:宽带  2:WIFI 
-	 */
-	private String hasNet;
-	
-	/**
-	 * 如有网络,是否免费, 0:免费  1:收费 
-	 */
-	private String isNetFee;
-	
-	/**
-	 * 如网络收费,收费情况 
-	 */
-	private String netFee;
-	
-	/**
-	 * 洗澡
-	 */
-	private String bath;
-	
-	/**
-	 * 房间简介 
-	 */
-	private String intro;
-	
-	/**
-	 * 特色
-	 */
-	private String highLights;
-	
-	/**
-	 * 客户指引 
-	 */
-	private String guide;
-	
-	/**
-	 * 房间设施 
-	 */
-	private String facilities;
-	
-	/**
-	 * 备注
-	 */
-	private String comments;
-	
-	/**
-	 * 描述
-	 */
-	private String description;
-
-	public String getHotelId() {
-		return hotelId;
-	}
-
-	public void setHotelId(String hotelId) {
-		this.hotelId = hotelId;
-	}
-
-	public String getRoomId() {
-		return roomId;
-	}
-
-	public void setRoomId(String roomId) {
-		this.roomId = roomId;
-	}
-
-	public String getRoomName() {
-		return roomName;
-	}
-
-	public void setRoomName(String roomName) {
-		this.roomName = roomName;
-	}
-
-	public String getRoomTypeId() {
-		return roomTypeId;
-	}
-
-	public void setRoomTypeId(String roomTypeId) {
-		this.roomTypeId = roomTypeId;
-	}
-
-	public String getRoomType() {
-		return roomType;
-	}
-
-	public void setRoomType(String roomType) {
-		this.roomType = roomType;
-	}
-
-	public String getBedTypeId() {
-		return bedTypeId;
-	}
-
-	public void setBedTypeId(String bedTypeId) {
-		this.bedTypeId = bedTypeId;
-	}
-
-	public String getBedType() {
-		return bedType;
-	}
-
-	public void setBedType(String bedType) {
-		this.bedType = bedType;
-	}
-
-	public String getAcreage() {
-		return acreage;
-	}
-
-	public void setAcreage(String acreage) {
-		this.acreage = acreage;
-	}
-
-	public String getFloor() {
-		return floor;
-	}
-
-	public void setFloor(String floor) {
-		this.floor = floor;
-	}
-
-	public String getRoomAcount() {
-		return roomAcount;
-	}
-
-	public void setRoomAcount(String roomAcount) {
-		this.roomAcount = roomAcount;
-	}
-
-	public String getMaxAdult() {
-		return maxAdult;
-	}
-
-	public void setMaxAdult(String maxAdult) {
-		this.maxAdult = maxAdult;
-	}
-
-	public String getMaxChild() {
-		return maxChild;
-	}
-
-	public void setMaxChild(String maxChild) {
-		this.maxChild = maxChild;
-	}
-
-	public String getHasWindow() {
-		return hasWindow;
-	}
-
-	public void setHasWindow(String hasWindow) {
-		this.hasWindow = hasWindow;
-	}
-
-	public String getAllowAddBed() {
-		return allowAddBed;
-	}
-
-	public void setAllowAddBed(String allowAddBed) {
-		this.allowAddBed = allowAddBed;
-	}
-
-	public String getAllowAddBedNum() {
-		return allowAddBedNum;
-	}
-
-	public void setAllowAddBedNum(String allowAddBedNum) {
-		this.allowAddBedNum = allowAddBedNum;
-	}
-
-	public String getAllowSmoke() {
-		return allowSmoke;
-	}
-
-	public void setAllowSmoke(String allowSmoke) {
-		this.allowSmoke = allowSmoke;
-	}
-
-	public String getHasNet() {
-		return hasNet;
-	}
-
-	public void setHasNet(String hasNet) {
-		this.hasNet = hasNet;
-	}
-
-	public String getIsNetFee() {
-		return isNetFee;
-	}
-
-	public void setIsNetFee(String isNetFee) {
-		this.isNetFee = isNetFee;
-	}
-
-	public String getNetFee() {
-		return netFee;
-	}
-
-	public void setNetFee(String netFee) {
-		this.netFee = netFee;
-	}
-
-	public String getIntro() {
-		return intro;
-	}
-
-	public void setIntro(String intro) {
-		this.intro = intro;
-	}
-
-	public String getGuide() {
-		return guide;
-	}
-
-	public void setGuide(String guide) {
-		this.guide = guide;
-	}
-
-	public String getBath() {
-		return bath;
-	}
-
-	public void setBath(String bath) {
-		this.bath = bath;
-	}
-
-	public String getHighLights() {
-		return highLights;
-	}
-
-	public void setHighLights(String highLights) {
-		this.highLights = highLights;
-	}
-
-	public String getFacilities() {
-		return facilities;
-	}
-
-	public void setFacilities(String facilities) {
-		this.facilities = facilities;
-	}
-
-	public String getComments() {
-		return comments;
-	}
-
-	public void setComments(String comments) {
-		this.comments = comments;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-}

hotels_rpc/src/main/java/com/tripto/api/supplier/service/entity/RoomTypeEntity.java

@@ -1,34 +0,0 @@
-package com.tripto.api.supplier.service.entity;
-
-import java.io.Serializable;
-
-public class RoomTypeEntity implements Serializable {
-
-	private static final long serialVersionUID = 342584611452633534L;
-	
-	/**
-	 * 房型id
-	 */
-	private String roomTypeId;
-	
-	/**
-	 * 房型名称
-	 */
-	private String roomTypeName;
-
-	public String getRoomTypeId() {
-		return roomTypeId;
-	}
-
-	public void setRoomTypeId(String roomTypeId) {
-		this.roomTypeId = roomTypeId;
-	}
-
-	public String getRoomTypeName() {
-		return roomTypeName;
-	}
-
-	public void setRoomTypeName(String roomTypeName) {
-		this.roomTypeName = roomTypeName;
-	}
-}