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

optimize codes

Browse Source
This commit is contained in:
Mauve
2026-09-20 15:27:36 +08:00
parent 41e6b9bb29
commit c017b597b6
6 changed files with 11 additions and 2255 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/mgm/mcrm/basesetting/agebucket/services/AgebucketService.java
+3 -3
View File
@@ -3,7 +3,7 @@ package com.mgm.mcrm.basesetting.agebucket.services;
import com.mgm.mcrm.basesetting.agebucket.models.SysAgebucket; import com.mgm.mcrm.basesetting.agebucket.models.SysAgebucket;
import com.mgm.mcrm.basesetting.agebucket.repositories.SysAgebucketDao; import com.mgm.mcrm.basesetting.agebucket.repositories.SysAgebucketDao;
import com.mgm.mcrm.basesetting.daylight.dtos.response.AgebucketResponse; import com.mgm.mcrm.basesetting.daylight.dtos.response.AgebucketResponse;
import com.mgm.mcrm.basesetting.daylight.services.DaylightService; import com.mgm.mcrm.basesetting.daylight.services.DaylightApiService;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -21,13 +21,13 @@ public class AgebucketService {
@Lazy @Lazy
@Resource @Resource
private DaylightService daylightService; private DaylightApiService daylightApiService;
@Resource @Resource
private SysAgebucketDao sysAgebucketDao; private SysAgebucketDao sysAgebucketDao;
public void syncDaylightAgebuckets(String dlPropertyId) { public void syncDaylightAgebuckets(String dlPropertyId) {
List<AgebucketResponse> agebucketResponses = daylightService.daylightAgebucketResponseList(dlPropertyId); List<AgebucketResponse> agebucketResponses = daylightApiService.daylightAgebucketResponseList(dlPropertyId);
if (isEmpty(agebucketResponses)) { if (isEmpty(agebucketResponses)) {
return; return;
} }
src/main/java/com/mgm/mcrm/basesetting/daylight/services/DaylightService.java
-2229
View File
File diff suppressed because it is too large Load Diff
src/main/java/com/mgm/mcrm/booking/controllers/BookingController.java
+4 -4
View File
@@ -13,7 +13,7 @@ import com.mgm.mcrm.authorization.services.MgmUserService;
import com.mgm.mcrm.authorization.services.SysGroupPermissionService; import com.mgm.mcrm.authorization.services.SysGroupPermissionService;
import com.mgm.mcrm.authorization.utils.JwtTokenUtil; import com.mgm.mcrm.authorization.utils.JwtTokenUtil;
import com.mgm.mcrm.basesetting.daylight.dtos.response.ProfileDetailResponse; import com.mgm.mcrm.basesetting.daylight.dtos.response.ProfileDetailResponse;
import com.mgm.mcrm.basesetting.daylight.services.DaylightService; import com.mgm.mcrm.basesetting.daylight.services.DaylightApiService;
import com.mgm.mcrm.booking.dtos.BookingDto; import com.mgm.mcrm.booking.dtos.BookingDto;
import com.mgm.mcrm.booking.dtos.daylight.requests.ChangeMiscChargeRequest; import com.mgm.mcrm.booking.dtos.daylight.requests.ChangeMiscChargeRequest;
import com.mgm.mcrm.booking.dtos.search.*; import com.mgm.mcrm.booking.dtos.search.*;
@@ -81,7 +81,7 @@ public class BookingController {
@Resource @Resource
private WaitlistBookingService waitlistBookingService; private WaitlistBookingService waitlistBookingService;
@Autowired @Autowired
private DaylightService daylightService; private DaylightApiService daylightApiService;
@Resource @Resource
private BookingServiceMockup bookingServiceMockup; private BookingServiceMockup bookingServiceMockup;
@@ -471,12 +471,12 @@ public class BookingController {
List<BookingDto> daylightResult = new ArrayList<>(); List<BookingDto> daylightResult = new ArrayList<>();
//去Daylight查ProfileId //去Daylight查ProfileId
stepStartTime = System.currentTimeMillis(); stepStartTime = System.currentTimeMillis();
BaseApiResponse<List<ProfileDetailResponse>> profileResult = daylightService.dayLightGetProfileByPlayerId(playerId); BaseApiResponse<List<ProfileDetailResponse>> profileResult = daylightApiService.dayLightGetProfileByPlayerId(playerId);
List<ProfileDetailResponse> returnData = profileResult.getData(); List<ProfileDetailResponse> returnData = profileResult.getData();
if (profileResult.isSuccess()) { if (profileResult.isSuccess()) {
//Daylight存在 则去Daylight查Record 在Daylight不存在的话 跳过 //Daylight存在 则去Daylight查Record 在Daylight不存在的话 跳过
ProfileDetailResponse profileDetailResponse = returnData.getFirst(); ProfileDetailResponse profileDetailResponse = returnData.getFirst();
daylightResult = daylightService.getBookingRecordByProfileId_Optimize(profileDetailResponse.getId(), playerId); daylightResult = daylightApiService.getBookingRecordByProfileId_Optimize(profileDetailResponse.getId(), playerId);
} else { } else {
LogUtil.warn(BookingService.class, "[recordSearch] Daylight profile lookup failed, message=" + profileResult.getMessage() + ", playerId=" + playerId); LogUtil.warn(BookingService.class, "[recordSearch] Daylight profile lookup failed, message=" + profileResult.getMessage() + ", playerId=" + playerId);
} }
src/main/java/com/mgm/mcrm/booking/services/BookingService.java
+2 -2
View File
@@ -23,7 +23,7 @@ import com.mgm.mcrm.basesetting.daylight.dtos.response.ProfileDetailResponse;
import com.mgm.mcrm.basesetting.daylight.dtos.response.ReservationNoteResponse; import com.mgm.mcrm.basesetting.daylight.dtos.response.ReservationNoteResponse;
import com.mgm.mcrm.basesetting.daylight.models.*; import com.mgm.mcrm.basesetting.daylight.models.*;
import com.mgm.mcrm.basesetting.daylight.repositories.*; import com.mgm.mcrm.basesetting.daylight.repositories.*;
import com.mgm.mcrm.basesetting.daylight.services.DaylightService; import com.mgm.mcrm.basesetting.daylight.services.DaylightApiService;
import com.mgm.mcrm.basesetting.property.models.CfgProperties; import com.mgm.mcrm.basesetting.property.models.CfgProperties;
import com.mgm.mcrm.basesetting.property.repositories.PropertyDao; import com.mgm.mcrm.basesetting.property.repositories.PropertyDao;
import com.mgm.mcrm.basesetting.property.services.PropertyCache; import com.mgm.mcrm.basesetting.property.services.PropertyCache;
@@ -160,7 +160,7 @@ public class BookingService {
@Resource @Resource
private SourceCodeDao sourceCodeDao; private SourceCodeDao sourceCodeDao;
@Resource @Resource
private DaylightService dlService; private DaylightApiService dlService;
@Resource @Resource
private AgebucketService agebucketService; private AgebucketService agebucketService;
@Resource @Resource
src/main/java/com/mgm/mcrm/player/services/TodoService.java
+2 -2
View File
@@ -10,7 +10,7 @@ import com.mgm.mcrm.appsetting.services.SysSettingService;
import com.mgm.mcrm.authorization.dtos.LoginUserInfo; import com.mgm.mcrm.authorization.dtos.LoginUserInfo;
import com.mgm.mcrm.basesetting.daylight.dtos.response.ReservationDoorKeyResponse; import com.mgm.mcrm.basesetting.daylight.dtos.response.ReservationDoorKeyResponse;
import com.mgm.mcrm.basesetting.daylight.dtos.response.ReservationQueueResponse; import com.mgm.mcrm.basesetting.daylight.dtos.response.ReservationQueueResponse;
import com.mgm.mcrm.basesetting.daylight.services.DaylightService; import com.mgm.mcrm.basesetting.daylight.services.DaylightApiService;
import com.mgm.mcrm.basesetting.property.models.CfgProperties; import com.mgm.mcrm.basesetting.property.models.CfgProperties;
import com.mgm.mcrm.basesetting.property.repositories.PropertyDao; import com.mgm.mcrm.basesetting.property.repositories.PropertyDao;
import com.mgm.mcrm.basesetting.room.models.CfgOtherRoomStatus; import com.mgm.mcrm.basesetting.room.models.CfgOtherRoomStatus;
@@ -120,7 +120,7 @@ public class TodoService {
private BookingService bookingService; private BookingService bookingService;
@Resource @Resource
private DaylightService dlService; private DaylightApiService dlService;
@Resource @Resource
private BookingMapper bookingMapper; private BookingMapper bookingMapper;
src/test/java/com/mgm/mcrm/booking/controllers/BookingControllerRecordSearchTest.java
-15
View File
@@ -2,27 +2,12 @@ package com.mgm.mcrm.booking.controllers;
import com.mgm.mcrm.appsetting.models.CfgSettings; import com.mgm.mcrm.appsetting.models.CfgSettings;
import com.mgm.mcrm.appsetting.services.SettingService; import com.mgm.mcrm.appsetting.services.SettingService;
import com.mgm.mcrm.appsetting.services.SysSettingService;
import com.mgm.mcrm.authorization.dtos.LoginUserInfo;
import com.mgm.mcrm.basesetting.daylight.dtos.response.ProfileDetailResponse;
import com.mgm.mcrm.basesetting.daylight.services.DaylightService;
import com.mgm.mcrm.booking.dtos.BookingDto; import com.mgm.mcrm.booking.dtos.BookingDto;
import com.mgm.mcrm.booking.dtos.search.BookingSearchRequest;
import com.mgm.mcrm.booking.services.BookingService;
import com.mgm.mcrm.booking.services.NonMGMBookingService;
import com.mgm.mcrm.booking.services.OperaDBBookingService;
import com.mgm.mcrm.booking.services.WaitlistBookingService;
import com.mgm.mcrm.booking.services.mockup.BookingServiceMockup;
import com.mgm.mcrm.common.constants.SysConstants;
import com.mgm.mcrm.common.dtos.BaseApiResponse;
import com.mgm.mcrm.common.dtos.mgm_api.PlayerProfileEntry;
import com.mgm.mcrm.player.services.PlayerService;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.test.util.ReflectionTestUtils; import org.springframework.test.util.ReflectionTestUtils;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;