From 8d8384d36dd68055cb39d17650ac0bf24901ceea Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Fri, 8 Aug 2025 21:52:54 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E6=A1=A3=E5=8F=A3=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E6=9B=B4=E6=96=B0=E8=B0=83=E6=95=B4=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xkt/vo/storeCertificate/StoreCertUpdateVO.java | 5 +++-- .../com/ruoyi/xkt/dto/storeCertificate/StoreCertDTO.java | 4 ++-- .../ruoyi/xkt/service/impl/StoreCertificateServiceImpl.java | 4 +--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCertificate/StoreCertUpdateVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCertificate/StoreCertUpdateVO.java index 464355892..1fa91cf18 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCertificate/StoreCertUpdateVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCertificate/StoreCertUpdateVO.java @@ -28,6 +28,9 @@ public class StoreCertUpdateVO { @ApiModelProperty(value = "档口ID", required = true) @NotNull(message = "档口ID不能为空!") private Long storeId; + @ApiModelProperty(value = "档口认证ID") + @NotNull(message = "档口认证ID不能为空!") + private Long storeCertId; @Valid @ApiModelProperty(value = "档口认证信息", required = true) @NotNull(message = "档口认证信息不能为空!") @@ -69,8 +72,6 @@ public class StoreCertUpdateVO { @Data @ApiModel public static class SCStoreCertVO { - @ApiModelProperty(value = "档口认证ID（新增时不传，编辑必传）") - private Long storeCertId; @ApiModelProperty(value = "真实姓名", required = true) @NotBlank(message = "真实姓名不能为空") @Size(min = 0, max = 30, message = "真实姓名长度必须在1到30个字之间") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeCertificate/StoreCertDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeCertificate/StoreCertDTO.java index 0aa91f53f..7ed785674 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeCertificate/StoreCertDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeCertificate/StoreCertDTO.java @@ -21,6 +21,8 @@ public class StoreCertDTO { @ApiModelProperty(value = "档口ID", required = true) private Long storeId; + @ApiModelProperty(value = "档口认证ID（新增时不传，编辑必传）") + private Long storeCertId; @ApiModelProperty(value = "档口认证信息", required = true) private SCStoreCertDTO storeCert; @ApiModelProperty(value = "档口基础信息", required = true) @@ -52,8 +54,6 @@ public class StoreCertDTO { @Data public static class SCStoreCertDTO { - @ApiModelProperty(value = "档口认证ID（新增时不传，编辑必传）") - private Long storeCertId; @ApiModelProperty(value = "真实姓名", required = true) private String realName; @ApiModelProperty(value = "联系电话", required = true) diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCertificateServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCertificateServiceImpl.java index 682cd3f07..a84798342 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCertificateServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCertificateServiceImpl.java @@ -120,10 +120,8 @@ public class StoreCertificateServiceImpl implements IStoreCertificateService { @Override @Transactional public Integer update(StoreCertDTO certDTO) { - // 档口认证ID不能为空 - Optional.ofNullable(certDTO.getStoreCert().getStoreCertId()).orElseThrow(() -> new ServiceException("档口认证ID不能为空!", HttpStatus.ERROR)); StoreCertificate storeCert = Optional.ofNullable(this.storeCertMapper.selectOne(new LambdaQueryWrapper() - .eq(StoreCertificate::getId, certDTO.getStoreCert().getStoreCertId()).eq(StoreCertificate::getDelFlag, Constants.UNDELETED) + .eq(StoreCertificate::getId, certDTO.getStoreCertId()).eq(StoreCertificate::getDelFlag, Constants.UNDELETED) .eq(StoreCertificate::getStoreId, certDTO.getStoreId()))) .orElseThrow(() -> new ServiceException("档口认证不存在!", HttpStatus.ERROR)); // 先将旧的档口认证相关文件置为无效