diff --git a/src/main/java/com/jangburich/domain/order/domain/repository/OrdersRepository.java b/src/main/java/com/jangburich/domain/order/domain/repository/OrdersRepository.java index b3a8ab5..3b1ddb8 100644 --- a/src/main/java/com/jangburich/domain/order/domain/repository/OrdersRepository.java +++ b/src/main/java/com/jangburich/domain/order/domain/repository/OrdersRepository.java @@ -29,7 +29,8 @@ List findOrdersByStoreAndDateAndStatusNative( "WHERE o.store.id = :storeId " + "AND o.updatedAt >= :startOfDay " + "AND o.updatedAt < :endOfDay " + - "AND o.orderStatus = :orderStatus") + "AND o.orderStatus = :orderStatus " + + "ORDER BY o.createdAt DESC") List findOrdersByStoreAndTodayDateAndStatus( @Param("storeId") Long storeId, @Param("startOfDay") LocalDateTime startOfDay, diff --git a/src/main/java/com/jangburich/domain/team/domain/repository/TeamQueryDslRepositoryImpl.java b/src/main/java/com/jangburich/domain/team/domain/repository/TeamQueryDslRepositoryImpl.java index 327db7b..085ecc3b5 100644 --- a/src/main/java/com/jangburich/domain/team/domain/repository/TeamQueryDslRepositoryImpl.java +++ b/src/main/java/com/jangburich/domain/team/domain/repository/TeamQueryDslRepositoryImpl.java @@ -245,7 +245,6 @@ public IndividualStoreDetailsResponse findIndividualStoreDetails(Long userId, Lo .leftJoin(store).on(storeTeam.store.id.eq(store.id)) .leftJoin(team).on(team.id.eq(storeTeam.team.id)) .leftJoin(pointTransaction).on(pointTransaction.store.id.eq(storeTeam.store.id), - pointTransaction.transactionType.eq(TransactionType.FOOD_PURCHASE), pointTransaction.user.userId.eq(userId)) .where(storeTeam.store.id.eq(storeId), storeTeam.team.id.eq(teamId)) @@ -299,7 +298,6 @@ public IndividualStoreDetailsResponse findIndividualStoreDetails(Long userId, Lo .leftJoin(store).on(storeTeam.store.id.eq(store.id)) .leftJoin(team).on(team.id.eq(storeTeam.team.id)) .leftJoin(pointTransaction).on(pointTransaction.store.id.eq(storeTeam.store.id), - pointTransaction.transactionType.eq(TransactionType.POINT_PURCHASE), pointTransaction.user.userId.eq(userId)) .where(storeTeam.store.id.eq(storeId), storeTeam.team.id.eq(teamId))