From 84574c905a1ce2aa980a9ae944bdf839c984f7d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 24 Jun 2025 18:08:34 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9AapplyType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/service/PreFryQualificationApplyService.java | 4 ++-- .../service/impl/PreFryQualificationApplyServiceImpl.java | 8 ++++---- .../webc/MiniPreFryQualificationApplyController.java | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/PreFryQualificationApplyService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/PreFryQualificationApplyService.java index e2643aaaa..1ce7d540b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/PreFryQualificationApplyService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/PreFryQualificationApplyService.java @@ -22,7 +22,7 @@ public interface PreFryQualificationApplyService { * @param user * @return */ - Boolean submitApply(ApplyDTO request, PartnerUserInfoVO user); + Long submitApply(ApplyDTO request, PartnerUserInfoVO user); /** * 重新提交预炸资质申请 @@ -30,7 +30,7 @@ public interface PreFryQualificationApplyService { * @param user * @return */ - Boolean reSubmitApply(ApplyDTO request, PartnerUserInfoVO user); + Long reSubmitApply(ApplyDTO request, PartnerUserInfoVO user); /** * 根据门店编码和申请类型查询 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreFryQualificationApplyServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreFryQualificationApplyServiceImpl.java index 9ceb66dee..9bcde9eb6 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreFryQualificationApplyServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreFryQualificationApplyServiceImpl.java @@ -43,7 +43,7 @@ public class PreFryQualificationApplyServiceImpl implements PreFryQualificationA @Override - public Boolean submitApply(ApplyDTO request, PartnerUserInfoVO user) { + public Long submitApply(ApplyDTO request, PartnerUserInfoVO user) { // 1. 参数校验 validateRequest(request); @@ -60,11 +60,11 @@ public class PreFryQualificationApplyServiceImpl implements PreFryQualificationA // 4. 创建审批操作记录 createApprovalRecord(apply.getId(), AuditOperationTypeEnum.APPLY.getCode(),1, user.getUsername(),""); - return Boolean.TRUE; + return apply.getId(); } @Override - public Boolean reSubmitApply(ApplyDTO request, PartnerUserInfoVO user) { + public Long reSubmitApply(ApplyDTO request, PartnerUserInfoVO user) { // 1. 参数校验 validateRequest(request); // 2. 检查是否已有同类型申请 @@ -86,7 +86,7 @@ public class PreFryQualificationApplyServiceImpl implements PreFryQualificationA // 4. 创建审批操作记录 createApprovalRecord(old.getId(), AuditOperationTypeEnum.APPLY.getCode(),1, user.getUsername(),""); - return Boolean.TRUE; + return old.getId(); } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniPreFryQualificationApplyController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniPreFryQualificationApplyController.java index e8ecef3ba..618743784 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniPreFryQualificationApplyController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniPreFryQualificationApplyController.java @@ -32,14 +32,14 @@ public class MiniPreFryQualificationApplyController { @ApiOperation("预炸资质申请提交") @PostMapping("/submitApply") - public ResponseResult submitApply(@RequestBody @Validated ApplyDTO dto) { + public ResponseResult submitApply(@RequestBody @Validated ApplyDTO dto) { log.info("预炸资质申请提交:{}", JSONObject.toJSONString(dto)); return ResponseResult.success(preFryQualificationApplyService.submitApply( dto, PartnerUserHolder.getUser())); } @ApiOperation("预炸资质申请重新提交") @PostMapping("/reSubmitApply") - public ResponseResult reSubmitApply(@RequestBody @Validated ApplyDTO dto) { + public ResponseResult reSubmitApply(@RequestBody @Validated ApplyDTO dto) { log.info("预炸资质申请重新提交:{}", JSONObject.toJSONString(dto)); return ResponseResult.success(preFryQualificationApplyService.reSubmitApply( dto, PartnerUserHolder.getUser())); }