diff --git a/src/main/java/com/oya/kr/community/service/CommunityService.java b/src/main/java/com/oya/kr/community/service/CommunityService.java index c30f7d2..0314357 100644 --- a/src/main/java/com/oya/kr/community/service/CommunityService.java +++ b/src/main/java/com/oya/kr/community/service/CommunityService.java @@ -173,6 +173,7 @@ private CommunityResponse mapToCommunityResponses(User loginUser, List> login(@RequestBody * @since 2024.02.13 */ @PostMapping("/users/reissue") - public ResponseEntity> reissue(Principal principal) { + public ResponseEntity> reissue(Principal principal, @RequestBody AccessTokenRequest accessToken) { return ResponseEntity.ok(ApplicationResponse.success(userService.reissueAccessToken(principal.getName(), getAccessToken()))); } diff --git a/src/main/java/com/oya/kr/user/controller/dto/response/BusinessUserResponse.java b/src/main/java/com/oya/kr/user/controller/dto/response/BusinessUserResponse.java index 3004a28..2058f0d 100644 --- a/src/main/java/com/oya/kr/user/controller/dto/response/BusinessUserResponse.java +++ b/src/main/java/com/oya/kr/user/controller/dto/response/BusinessUserResponse.java @@ -9,6 +9,7 @@ public class BusinessUserResponse extends BasicUserResponse{ private final Long businessId; + private final String businessRegistrationNumber; private final String nameOfCompany; // 상호 private final String nameOfRepresentative; // 대표자 private final String dateOfBusinessCommencement; // 개업일 @@ -33,5 +34,6 @@ public BusinessUserResponse(BusinessMapperResponse businessMapperResponse){ this.businessAddress = businessMapperResponse.getBusinessAddress(); this.planCount = businessMapperResponse.getPlanCount(); this.popupCount = businessMapperResponse.getPopupCount(); + this.businessRegistrationNumber = businessMapperResponse.getBusinessRegistrationNumber(); } } diff --git a/src/main/java/com/oya/kr/user/mapper/dto/response/BusinessMapperResponse.java b/src/main/java/com/oya/kr/user/mapper/dto/response/BusinessMapperResponse.java index a5f2ddf..3e150aa 100644 --- a/src/main/java/com/oya/kr/user/mapper/dto/response/BusinessMapperResponse.java +++ b/src/main/java/com/oya/kr/user/mapper/dto/response/BusinessMapperResponse.java @@ -18,6 +18,7 @@ public class BusinessMapperResponse extends BasicMapperResponse{ private final String faxNumber; private final String zipCode; private final String businessAddress; // 사업장 소재지 + private final String businessRegistrationNumber; private final int planCount; private final int popupCount; @@ -26,7 +27,7 @@ public BusinessMapperResponse(Long userId, String nickname, String email, LocalD String registrationType, String userType, String profileUrl, LocalDateTime userCreatedDate, LocalDateTime userModifiedDate, boolean userDeleted, int communityCount, Long businessId, String nameOfCompany, String nameOfRepresentative, LocalDate dateOfBusinessCommencement, String businessItem, String connectedNumber, - String faxNumber, String zipCode, String businessAddress, int planCount, int popupCount) { + String faxNumber, String zipCode, String businessAddress, int planCount, int popupCount, String businessRegistrationNumber) { super(userId, nickname, email, birthDate, gender, registrationType, userType, profileUrl, userCreatedDate, userModifiedDate, userDeleted, communityCount); this.businessId = businessId; @@ -40,5 +41,6 @@ public BusinessMapperResponse(Long userId, String nickname, String email, LocalD this.businessAddress = businessAddress; this.planCount = planCount; this.popupCount = popupCount; + this.businessRegistrationNumber = businessRegistrationNumber; } } diff --git a/src/main/resources/com/oya/kr/user/mapper/UserMapper.xml b/src/main/resources/com/oya/kr/user/mapper/UserMapper.xml index 4f51a6a..1e266bb 100644 --- a/src/main/resources/com/oya/kr/user/mapper/UserMapper.xml +++ b/src/main/resources/com/oya/kr/user/mapper/UserMapper.xml @@ -123,6 +123,7 @@ +