update

src/main/java/com/mgm/mcrm/player/services/TodoService.java

@@ -307,7 +307,7 @@ public class TodoService {
 		boolean isDaylight = Strings.CS.equals("DAYLIGHT", category);
 		boolean isOther =  Strings.CS.equals("OTHER", category);
 
-		CfgProperties property = propertyDao.getByName(param.getPropertyName());
+		CfgProperties property = propertyDao.findByNameAndCategory(param.getPropertyName(), category);
 
 		String dlReservationId = null;
 
@@ -639,13 +639,13 @@ public class TodoService {
 			return missParameter(result);
 		}
 
-		CfgProperties property = propertyDao.getByLikeName(hotelName);
+		String category = bookingDao.findCategoryById(id);
+
+		CfgProperties property = propertyDao.findByLikeNameAndCategory(hotelName, category);
 		if (property == null) {
 			return noRecord(result);
 		}
 
-		String category = property.getCategory();
-
 		if (Strings.CI.equals("DAYLIGHT", category)) {
 			return handleDaylightETA(etaTime, confNo, property, id);
 		}