diff --git a/src/main/java/com/youlai/boot/admin/controller/AdoptionApplicationManageController.java b/src/main/java/com/youlai/boot/admin/controller/AdoptionApplicationManageController.java index 38fc2cf..cb0839e 100644 --- a/src/main/java/com/youlai/boot/admin/controller/AdoptionApplicationManageController.java +++ b/src/main/java/com/youlai/boot/admin/controller/AdoptionApplicationManageController.java @@ -30,13 +30,6 @@ public class AdoptionApplicationManageController { return PageResult.success(adoptionApplicationService.getAllApplications(query)); } - @Operation(summary = "获取领养申请详情") - @GetMapping("/detail/{applicationUuid}") - @Log(module = LogModuleEnum.ADOPTION_APPLICATION, value = ActionTypeEnum.LIST) - public Result getApplicationDetail(@PathVariable String applicationUuid) { - return Result.success(adoptionApplicationService.getApplicationDetail(applicationUuid)); - } - @Operation(summary = "审核领养申请") @PostMapping("/audit") @Log(module = LogModuleEnum.ADOPTION_APPLICATION, value = ActionTypeEnum.UPDATE) diff --git a/src/main/java/com/youlai/boot/mini/controller/AdoptionApplicationController.java b/src/main/java/com/youlai/boot/mini/controller/AdoptionApplicationController.java index 15e317f..9bce49c 100644 --- a/src/main/java/com/youlai/boot/mini/controller/AdoptionApplicationController.java +++ b/src/main/java/com/youlai/boot/mini/controller/AdoptionApplicationController.java @@ -13,7 +13,12 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RequestPart; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; @Tag(name = "领养申请相关接口") @@ -43,9 +48,4 @@ public class AdoptionApplicationController { return PageResult.success(adoptionApplicationService.getMyApplications(query)); } - @Operation(summary = "获取领养申请详情") - @GetMapping("/detail/{applicationUuid}") - public Result getApplicationDetail(@PathVariable String applicationUuid) { - return Result.success(adoptionApplicationService.getApplicationDetail(applicationUuid)); - } } diff --git a/src/main/java/com/youlai/boot/mini/model/query/AdoptionApplicationQuery.java b/src/main/java/com/youlai/boot/mini/model/query/AdoptionApplicationQuery.java index cd58136..8ec7b33 100644 --- a/src/main/java/com/youlai/boot/mini/model/query/AdoptionApplicationQuery.java +++ b/src/main/java/com/youlai/boot/mini/model/query/AdoptionApplicationQuery.java @@ -15,6 +15,6 @@ public class AdoptionApplicationQuery extends BaseQuery { @Schema(description = "动物类型") private String animalType; - @Schema(description = "申请人用户ID", hidden = true) - private Long miniUserId; + @Schema(description = "申请人用户UUID", hidden = true) + private String miniUserUuid; } diff --git a/src/main/java/com/youlai/boot/mini/service/impl/AdoptionApplicationServiceImpl.java b/src/main/java/com/youlai/boot/mini/service/impl/AdoptionApplicationServiceImpl.java index 7339916..231e490 100644 --- a/src/main/java/com/youlai/boot/mini/service/impl/AdoptionApplicationServiceImpl.java +++ b/src/main/java/com/youlai/boot/mini/service/impl/AdoptionApplicationServiceImpl.java @@ -16,6 +16,8 @@ import com.youlai.boot.mini.model.form.AdoptionApplicationAuditForm; import com.youlai.boot.mini.model.query.AdoptionApplicationQuery; import com.youlai.boot.mini.model.vo.AdoptionApplicationVO; import com.youlai.boot.mini.service.AdoptionApplicationService; +import com.youlai.boot.system.mapper.UserMapper; +import com.youlai.boot.system.model.entity.SysUser; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FilenameUtils; @@ -35,6 +37,7 @@ public class AdoptionApplicationServiceImpl extends ServiceImpl getMyApplications(AdoptionApplicationQuery query) { Long userId = SecurityUtils.getUserId(); - query.setMiniUserId(userId); + SysUser user = userMapper.selectById(userId); + if (user != null) { + query.setMiniUserUuid(user.getUuid()); + } Page page = new Page<>(query.getPageNum(), query.getPageSize()); return baseMapper.getApplicationPage(page, query); } diff --git a/src/main/resources/mapper/mini/MiniAdoptionApplicationMapper.xml b/src/main/resources/mapper/mini/MiniAdoptionApplicationMapper.xml index 55acf10..b460842 100644 --- a/src/main/resources/mapper/mini/MiniAdoptionApplicationMapper.xml +++ b/src/main/resources/mapper/mini/MiniAdoptionApplicationMapper.xml @@ -29,8 +29,8 @@ AND sa.animal_type = #{query.animalType} - - AND app.mini_user_id = #{query.miniUserId} + + AND u.uuid = #{query.miniUserUuid} ORDER BY app.create_time DESC