Merge branch 'dev' of GameCenter/game-center into master

game-gs-data/game-gs-data-serve/src/main/java/com/zanxiang/game/gs/data/serve/service/impl/AdsRoleAmountDataParentServiceImpl.java

@@ -20,6 +20,8 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -153,8 +155,8 @@ public class AdsRoleAmountDataParentServiceImpl extends ServiceImpl<AdsRoleAmoun
                 .and(ADS_ROLE_AMOUNT_DATA_PARENT.SERVER_ID.isNotNull().or(ADS_ROLE_AMOUNT_DATA_TODAY_PARENT.SERVER_ID.isNotNull()))
                 .ge(AdsRoleAmountDataTodayParent::getDay, dto.getDtBegin())
                 .le(AdsRoleAmountDataTodayParent::getDay, dto.getDtBegin())
-                .ge(AdsRoleAmountDataParent::getRoleTime, dto.getRoleCreateDayBegin())
-                .le(AdsRoleAmountDataParent::getRoleTime, dto.getRoleCreateDayEnd())
+                .ge(AdsRoleAmountDataParent::getRoleTime, LocalDateTime.of(dto.getRoleCreateDayBegin(), LocalTime.MIDNIGHT))
+                .le(AdsRoleAmountDataParent::getRoleTime, LocalDateTime.of(dto.getRoleCreateDayEnd(), LocalTime.MAX))
                 .in(AdsRoleAmountDataParent::getGsId, dto.getGsIdList(), CollectionUtils.isNotEmpty(dto.getGsIdList()))
                 .eq(AdsRoleAmountDataParent::getParentGameId, dto.getParentGameId(), null != dto.getParentGameId())
                 .like(AdsRoleAmountDataParent::getRoleName, dto.getRoleName(), StringUtils.isNotBlank(dto.getRoleName()))