From dbe0c1683790f0c382fe836784a4fa84872f3d93 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Thu, 2 Oct 2025 22:19:08 +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=E5=90=8E=20=E8=BA=AB=E4=BB=BD=E8=AF=81=E4=BA=BA?= =?UTF-8?q?=E8=84=B8=E3=80=81=E5=9B=BD=E5=BE=BD=E5=8F=8A=E8=90=A5=E4=B8=9A?= =?UTF-8?q?=E6=89=A7=E7=85=A7=E6=96=87=E4=BB=B6=E7=9C=8B=E4=B8=8D=E8=A7=81?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/storeCertificate/StoreCertResVO.java | 2 +- .../impl/StoreCertificateServiceImpl.java | 35 ++++++++----------- 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCertificate/StoreCertResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCertificate/StoreCertResVO.java index de0713770..68db0547c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCertificate/StoreCertResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCertificate/StoreCertResVO.java @@ -71,7 +71,7 @@ public class StoreCertResVO { private String fileName; @ApiModelProperty(value = "文件路径") private String fileUrl; - @ApiModelProperty(value = "文件类型（4 人脸照片 5 国徽照片 6档口营业执照）") + @ApiModelProperty(value = "文件类型") private Integer fileType; @ApiModelProperty(value = "文件大小") private BigDecimal fileSize; 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 15e263e8d..77b03bed9 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 @@ -2,7 +2,6 @@ package com.ruoyi.xkt.service.impl; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.ruoyi.common.constant.CacheConstants; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.HttpStatus; import com.ruoyi.common.core.domain.model.ESystemRole; @@ -67,7 +66,7 @@ public class StoreCertificateServiceImpl implements IStoreCertificateService { StoreCertificate storeCert = BeanUtil.toBean(certDTO.getStoreCert(), StoreCertificate.class) .setStoreId(store.getId()); // 新增档口认证的文件列表 - this.handleStoreCertFileList(certDTO, storeCert); + storeCert = this.handleStoreCertFileList(certDTO, storeCert); int count = this.storeCertMapper.insert(storeCert); // 新增档口的单据编号初始化 销售出库、采购入库、需求单、订单 List vsList = new ArrayList<>(); @@ -135,7 +134,7 @@ public class StoreCertificateServiceImpl implements IStoreCertificateService { // 更新属性 BeanUtil.copyProperties(certDTO.getStoreCert(), storeCert); // 新增档口认证的文件列表 - this.handleStoreCertFileList(certDTO, storeCert); + storeCert = this.handleStoreCertFileList(certDTO, storeCert); // 更新档口信息 this.updateStore(certDTO.getStoreId(), certDTO.getStoreBasic()); return this.storeCertMapper.updateById(storeCert); @@ -186,23 +185,19 @@ public class StoreCertificateServiceImpl implements IStoreCertificateService { * @param certDTO 档口认证文件入参 * @param storeCert 档口认证对象 */ - private void handleStoreCertFileList(StoreCertDTO certDTO, StoreCertificate storeCert) { - // 档口认证文件类型与文件名映射 - Map typeNameTransMap = certDTO.getStoreCert().getFileList().stream().collect(Collectors - .toMap(StoreCertDTO.SCStoreFileDTO::getFileType, StoreCertDTO.SCStoreFileDTO::getFileName)); - // 上传的文件列表 - final List fileDTOList = certDTO.getStoreCert().getFileList(); - // 将文件插入到SysFile表中 - List fileList = BeanUtil.copyToList(fileDTOList, SysFile.class); - this.fileMapper.insert(fileList); - // 文件名称与文件ID映射 - Map fileMap = fileList.stream().collect(Collectors.toMap(SysFile::getFileName, SysFile::getId)); - // 设置身份证人脸文件ID - storeCert.setIdCardFaceFileId(fileMap.get(typeNameTransMap.get(FileType.ID_CARD_FACE.getValue()))); - // 设置身份证国徽文件ID - storeCert.setIdCardEmblemFileId(fileMap.get(typeNameTransMap.get(FileType.ID_CARD_EMBLEM.getValue()))); - // 设置营业执照文件ID - storeCert.setLicenseFileId(fileMap.get(typeNameTransMap.get(FileType.BUSINESS_LICENSE.getValue()))); + private StoreCertificate handleStoreCertFileList(StoreCertDTO certDTO, StoreCertificate storeCert) { + // 新增身份证人脸 + StoreCertDTO.SCStoreFileDTO idCardFace = certDTO.getStoreCert().getFileList().stream().filter(x -> Objects.equals(x.getFileType(), FileType.ID_CARD_FACE.getValue())) + .findFirst().orElseThrow(() -> new ServiceException("身份证人脸文件不存在!", HttpStatus.ERROR)); + StoreCertDTO.SCStoreFileDTO idCardEmblem = certDTO.getStoreCert().getFileList().stream().filter(x -> Objects.equals(x.getFileType(), FileType.ID_CARD_EMBLEM.getValue())) + .findFirst().orElseThrow(() -> new ServiceException("身份证国徽文件不存在!", HttpStatus.ERROR)); + StoreCertDTO.SCStoreFileDTO license = certDTO.getStoreCert().getFileList().stream().filter(x -> Objects.equals(x.getFileType(), FileType.BUSINESS_LICENSE.getValue())) + .findFirst().orElseThrow(() -> new ServiceException("营业执照文件不存在!", HttpStatus.ERROR)); + SysFile idCardFaceFile = BeanUtil.toBean(idCardFace, SysFile.class); + SysFile idCardEmblemFile = BeanUtil.toBean(idCardEmblem, SysFile.class); + SysFile licenseFile = BeanUtil.toBean(license, SysFile.class); + this.fileMapper.insert(Arrays.asList(idCardFaceFile, idCardEmblemFile, licenseFile)); + return storeCert.setIdCardFaceFileId(idCardFaceFile.getId()).setIdCardEmblemFileId(idCardEmblemFile.getId()).setLicenseFileId(licenseFile.getId()); } /**