mindol1004/spring-jwt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(store-service): solve conflict

Browse Source 
머지 후 error 해결
This commit is contained in:
hoon7566
2022-03-07 18:49:09 +09:00
parent c345af1ed5
commit 0ae88dba41
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
store-service/src/main/java/com/justpickup/storeservice/domain/store/web/StoreCustomerApiController.java
View File

@@ -9,7 +9,6 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.SliceImpl;
import org.springframework.data.web.PageableDefault;
@@ -38,19 +37,19 @@ public class StoreCustomerApiController {
List<SearchStoreResult> favoriteStore = storeService.findFavoriteStore(condition,Long.parseLong(userId));
List<StoreCustomerApiController.SearchStoreResponse> searchStoreResponse
= favoriteStore.stream().map(SearchStoreResponse::new).collect(Collectors.toList());
List<FavoriteStoreResponse> searchStoreResponse
= favoriteStore.stream().map(FavoriteStoreResponse::new).collect(Collectors.toList());
return ResponseEntity.status(HttpStatus.OK).body(Result.createSuccessResult(searchStoreResponse));
}
@Data @NoArgsConstructor
static class SearchStoreResponse {
static class FavoriteStoreResponse {
private Long id;
private String name;
private String distance;
public SearchStoreResponse(SearchStoreResult storeResult) {
public FavoriteStoreResponse(SearchStoreResult storeResult) {
this.id = storeResult.getStoreId();
this.name = storeResult.getStoreName();
this.distance = storeResult.convertDistanceToString();