Mauve/mgm-daylight-mcrm-api-cms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Mauve
2026-10-12 15:16:50 +08:00
parent 92858be8bd
commit dde0d60825
48 changed files with 880 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/mgm/mcrm/allotment/services/RoomCriteriaDaylightService.java
+5 -8
View File
@@ -10,7 +10,6 @@ import com.mgm.mcrm.allotment.dtos.request.*;
import com.mgm.mcrm.basesetting.agebucket.models.SysAgebucket;
import com.mgm.mcrm.basesetting.agebucket.services.AgebucketService;
import com.mgm.mcrm.basesetting.room.models.CfgRoomsRoomTypes;
import com.mgm.mcrm.common.constants.SettingConstants;
import com.mgm.mcrm.common.dtos.AjaxResult;
import com.mgm.mcrm.common.dtos.CheckCalendarDaylightRequest;
import com.mgm.mcrm.common.dtos.dataimport.appsetting.AppChannelDaylightImportRow;
@@ -53,8 +52,6 @@ import com.mgm.mcrm.reservation.models.BookingsView;
import com.mgm.mcrm.reservation.repositories.BookingViewDao;
import jakarta.annotation.Resource;
import jakarta.persistence.criteria.Predicate;
import jakarta.validation.constraints.NotBlank;
import lombok.extern.log4j.Log4j;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.hc.core5.http.Header;
@@ -339,7 +336,7 @@ public class RoomCriteriaDaylightService {
if (dow != null) {
for (int i = 0; i < dow.size(); i++) {
int num = Integer.parseInt(String.valueOf(dow.get(i)));
dow.set(i, num - 1);
dow.set(i, num);
}
}
for (int i = 0; i < getCriterias.size(); i++) {
@@ -1258,9 +1255,9 @@ public class RoomCriteriaDaylightService {
return cacheData;
}
private Map<String,Long> cacheDlBlockCodeMapping(){
private Map<String,Long> cacheDlBlockCodeMapping(Long propertyId){
Map<String,Long> cacheData = new HashMap<String,Long>();
List<CfgBlockCodes> dlBlockCodes = blockCodeDao.findAllByDlBlockIdIsNotNull();
List<CfgBlockCodes> dlBlockCodes = blockCodeDao.findAllByPropertyIdAndDlBlockIdIsNotNull(propertyId);
for(CfgBlockCodes blockCode: dlBlockCodes){
cacheData.put(blockCode.getDlBlockId(),blockCode.getId());
}
@@ -1350,7 +1347,7 @@ public class RoomCriteriaDaylightService {
MappingDataCache cacheMapping = new MappingDataCache();
cacheMapping.setCacheRoomTypeIds(this.cacheDlRoomTypeMapping());
cacheMapping.setCachePropertyRoomCate(this.cachePropertyRoomCategory(propertyId));
cacheMapping.setCacheBlockCodes(this.cacheDlBlockCodeMapping());
cacheMapping.setCacheBlockCodes(this.cacheDlBlockCodeMapping(propertyId));
String url = "/api-gateway/data-api/v1/blocks/availability";
Header[] headers = HttpHeaderBuilder.create()
@@ -1359,7 +1356,7 @@ public class RoomCriteriaDaylightService {
.build();
Map<String, Object> queryParams = new HashMap<>();
queryParams.put("blockIds", String.join(",", syncRequest.getDlBlockCodeIds()));
queryParams.put("blockIds", String.join(",", cacheMapping.getCacheBlockCodes().keySet()));
queryParams.put("startDate", syncRequest.getFromDate());
queryParams.put("endDate", syncRequest.getToDate());