diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreResVO.java index b38210a3c..77063d6f1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreResVO.java @@ -25,10 +25,10 @@ public class StoreResVO { private String storeName; @ApiModelProperty(value = "档口负责人ID") private Long userId; + @ApiModelProperty(value = "档口logo") + private SFileVO storeLogo; @ApiModelProperty(value = "档口负责人ID") private String userName; - @ApiModelProperty(value = "品牌名称") - private String brandName; @ApiModelProperty(value = "联系人") private String contactName; @ApiModelProperty(value = "联系电话") @@ -61,4 +61,17 @@ public class StoreResVO { @ApiModelProperty(value = "档口模板ID") private Integer templateNum; + @Data + public static class SFileVO { + @ApiModelProperty(value = "文件名称") + private String fileName; + @ApiModelProperty(value = "文件路径") + private String fileUrl; + @ApiModelProperty(value = "文件类型（4 人脸照片 5 国徽照片 6档口营业执照）") + private Integer fileType; + @ApiModelProperty(value = "文件大小") + private BigDecimal fileSize; + } + + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreUpdateVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreUpdateVO.java index 484e8d2de..9897391bd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreUpdateVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreUpdateVO.java @@ -25,9 +25,6 @@ public class StoreUpdateVO { @ApiModelProperty(value = "档口名称", required = true) @NotBlank(message = "档口名称不能为空") private String storeName; - @ApiModelProperty(value = "品牌名称", required = true) - @NotBlank(message = "品牌名称不能为空") - private String brandName; @ApiModelProperty(value = "联系人", required = true) @NotBlank(message = "联系人不能为空") private String contactName; diff --git a/sql/ry_20240629.sql b/sql/ry_20240629.sql index e872446eb..85c8ffc4d 100644 --- a/sql/ry_20240629.sql +++ b/sql/ry_20240629.sql @@ -3119,7 +3119,6 @@ CREATE TABLE `store` `contact_back_phone` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备选联系电话', `wechat_account` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '微信账号', `qq_account` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'QQ账号', - `alipay_account` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '支付宝账号', `operate_years` int UNSIGNED NULL DEFAULT NULL COMMENT '经营年限', `store_address` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '档口地址', `fac_address` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '工厂地址', diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/Store.java b/xkt/src/main/java/com/ruoyi/xkt/domain/Store.java index 5cb6e7aae..9cec31708 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/Store.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/Store.java @@ -75,12 +75,6 @@ public class Store extends XktBaseEntity { @Excel(name = "QQ账号") private String qqAccount; - /** - * 支付宝账号 - */ - @Excel(name = "支付宝账号") - private String alipayAccount; - /** * 经营年限 */ diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreApproveResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreApproveResDTO.java index 5afdcd306..5c954c81f 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreApproveResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreApproveResDTO.java @@ -4,6 +4,7 @@ import com.ruoyi.xkt.dto.storeCertificate.StoreCertResDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.experimental.Accessors; /** * @author liujiang @@ -12,6 +13,7 @@ import lombok.Data; */ @ApiModel("档口基本信息") @Data +@Accessors(chain = true) public class StoreApproveResDTO { @ApiModelProperty(value = "档口基本信息") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreResDTO.java index 18570d7af..bdf4480f6 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreResDTO.java @@ -27,10 +27,10 @@ public class StoreResDTO { private String storeName; @ApiModelProperty(value = "档口负责人ID") private Long userId; + @ApiModelProperty(value = "档口logo") + private SFileDTO storeLogo; @ApiModelProperty(value = "档口负责人ID") private String userName; - @ApiModelProperty(value = "品牌名称") - private String brandName; @ApiModelProperty(value = "联系人") private String contactName; @ApiModelProperty(value = "联系电话") @@ -63,4 +63,17 @@ public class StoreResDTO { @ApiModelProperty(value = "档口模板ID") private Integer templateNum; + @Data + @Accessors(chain = true) + public static class SFileDTO { + @ApiModelProperty(value = "文件名称") + private String fileName; + @ApiModelProperty(value = "文件路径") + private String fileUrl; + @ApiModelProperty(value = "文件类型") + private Integer fileType; + @ApiModelProperty(value = "文件大小") + private BigDecimal fileSize; + } + } diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreUpdateDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreUpdateDTO.java index 0c6f92352..78d3c0400 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreUpdateDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreUpdateDTO.java @@ -19,8 +19,6 @@ public class StoreUpdateDTO { private Long storeId; @ApiModelProperty(value = "档口名称", required = true) private String storeName; - @ApiModelProperty(value = "品牌名称", required = true) - private String brandName; @ApiModelProperty(value = "联系人", required = true) private String contactName; @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 9bfdca020..682cd3f07 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 @@ -168,9 +168,15 @@ public class StoreCertificateServiceImpl implements IStoreCertificateService { (Objects.equals(x.getId(), storeCert.getIdCardEmblemFileId()) ? FileType.ID_CARD_EMBLEM.getValue() : FileType.BUSINESS_LICENSE.getValue()))) .collect(Collectors.toList()); - return new StoreCertStepResDTO().setStoreCert(BeanUtil.toBean(storeCert, StoreCertStepResDTO.SCSStoreCertDTO.class) - .setStoreCertId(storeCert.getId()).setFileList(fileDTOList)) + StoreCertStepResDTO certStepDTO = new StoreCertStepResDTO() + .setStoreCert(BeanUtil.toBean(storeCert, StoreCertStepResDTO.SCSStoreCertDTO.class).setStoreCertId(storeCert.getId()).setFileList(fileDTOList)) .setStoreBasic(BeanUtil.toBean(store, StoreCertStepResDTO.SCSStoreBasicDTO.class)); + // 设置档口LOGO + if (ObjectUtils.isNotEmpty(store.getStoreLogoId())) { + SysFile storeLogo = this.fileMapper.selectById(store.getStoreLogoId()); + certStepDTO.getStoreBasic().setStoreLogo(BeanUtil.toBean(storeLogo, StoreCertStepResDTO.SCStoreFileDTO.class)); + } + return certStepDTO; } @@ -210,6 +216,10 @@ public class StoreCertificateServiceImpl implements IStoreCertificateService { store.setUserId(SecurityUtils.getUserId()); // 默认档口状态为：待审核 store.setStoreStatus(StoreStatus.UN_AUDITED.getValue()); + // 设置已使用空间为0 + store.setStorageUsage(BigDecimal.ZERO); + // 默认使用第一个模板 + store.setTemplateNum(1); // 当前时间往后推1年为试用期时间 Date oneYearAfter = Date.from(LocalDate.now().plusYears(1).atStartOfDay(ZoneId.systemDefault()).toInstant()); store.setTrialEndTime(oneYearAfter); diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java index 7f427297f..5c73b9c17 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java @@ -26,6 +26,7 @@ import com.ruoyi.system.service.ISysUserService; import com.ruoyi.xkt.domain.*; import com.ruoyi.xkt.dto.store.*; import com.ruoyi.xkt.dto.storeCertificate.StoreCertResDTO; +import com.ruoyi.xkt.enums.FileType; import com.ruoyi.xkt.enums.StoreStatus; import com.ruoyi.xkt.mapper.*; import com.ruoyi.xkt.service.IAssetService; @@ -174,6 +175,10 @@ public class StoreServiceImpl implements IStoreService { .eq(Store::getId, storeId))).orElseThrow(() -> new ServiceException("档口不存在!", HttpStatus.ERROR)); StoreResDTO resDTO = BeanUtil.toBean(store, StoreResDTO.class); resDTO.setStoreId(storeId); + if (ObjectUtils.isNotEmpty(store.getStoreLogoId())) { + SysFile file = this.fileMapper.selectById(store.getStoreLogoId()); + resDTO.setStoreLogo(BeanUtil.toBean(file, StoreResDTO.SFileDTO.class)); + } // 获取用户登录账号 SysUser user = this.userMapper.selectOne(new LambdaQueryWrapper() .eq(SysUser::getUserId, store.getUserId()).eq(SysUser::getDelFlag, Constants.UNDELETED)); @@ -189,27 +194,13 @@ public class StoreServiceImpl implements IStoreService { @Override @Transactional(readOnly = true) public StoreApproveResDTO getApproveInfo(Long storeId) { - StoreApproveResDTO approveResDTO = new StoreApproveResDTO(); - approveResDTO.setBasic(this.getInfo(storeId)); - approveResDTO.setCertificate(this.getStoreCertificateInfo(storeId)); - return approveResDTO; + return new StoreApproveResDTO() + // 档口基本信息 + .setBasic(this.getInfo(storeId)) + // 档口认证信息 + .setCertificate(this.getStoreCertificateInfo(storeId)); } - private StoreCertResDTO getStoreCertificateInfo(Long storeId) { - StoreCertificate storeCert = this.storeCertMapper.selectOne(new LambdaQueryWrapper() - .eq(StoreCertificate::getStoreId, storeId).eq(StoreCertificate::getDelFlag, Constants.UNDELETED)); - if (ObjectUtils.isEmpty(storeCert)) { - return new StoreCertResDTO(); - } - List fileList = Optional.ofNullable(this.fileMapper.selectList(new LambdaQueryWrapper() - .in(SysFile::getId, Arrays.asList(storeCert.getIdCardFaceFileId(), storeCert.getIdCardEmblemFileId(), storeCert.getLicenseFileId())) - .eq(SysFile::getDelFlag, Constants.UNDELETED))).orElseThrow(() -> new ServiceException("文件不存在!", HttpStatus.ERROR)); - List fileDTOList = fileList.stream().map(x -> BeanUtil.toBean(x, StoreCertResDTO.StoreCertFileDTO.class) - .setFileType(Objects.equals(x.getId(), storeCert.getIdCardFaceFileId()) ? 4 : - (Objects.equals(x.getId(), storeCert.getIdCardEmblemFileId()) ? 5 : 6))).collect(Collectors.toList()); - return BeanUtil.toBean(storeCert, StoreCertResDTO.class).setStoreCertId(storeCert.getId()).setFileList(fileDTOList); - - } /** * 获取APP档口基本信息 @@ -541,5 +532,28 @@ public class StoreServiceImpl implements IStoreService { return count; } + /** + * 设置 档口 认证基本信息 + * + * @param storeId 档口ID + * @return StoreCertResDTO + */ + private StoreCertResDTO getStoreCertificateInfo(Long storeId) { + StoreCertificate storeCert = this.storeCertMapper.selectOne(new LambdaQueryWrapper() + .eq(StoreCertificate::getStoreId, storeId).eq(StoreCertificate::getDelFlag, Constants.UNDELETED)); + if (ObjectUtils.isEmpty(storeCert)) { + return new StoreCertResDTO(); + } + List fileList = Optional.ofNullable(this.fileMapper.selectList(new LambdaQueryWrapper() + .in(SysFile::getId, Arrays.asList(storeCert.getIdCardFaceFileId(), storeCert.getIdCardEmblemFileId(), storeCert.getLicenseFileId())) + .eq(SysFile::getDelFlag, Constants.UNDELETED))).orElseThrow(() -> new ServiceException("文件不存在!", HttpStatus.ERROR)); + List fileDTOList = fileList.stream().map(x -> BeanUtil.toBean(x, StoreCertResDTO.StoreCertFileDTO.class) + .setFileType(Objects.equals(x.getId(), storeCert.getIdCardFaceFileId()) ? FileType.ID_CARD_FACE.getValue() : + (Objects.equals(x.getId(), storeCert.getIdCardEmblemFileId()) + ? FileType.ID_CARD_EMBLEM.getValue() : FileType.BUSINESS_LICENSE.getValue()))) + .collect(Collectors.toList()); + return BeanUtil.toBean(storeCert, StoreCertResDTO.class).setStoreCertId(storeCert.getId()).setFileList(fileDTOList); + } + }