diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreAppResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreAppResVO.java index 5ba8c59e4..411e903a3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreAppResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreAppResVO.java @@ -1,9 +1,11 @@ package com.ruoyi.web.controller.xkt.vo.store; +import com.ruoyi.xkt.dto.store.StoreAppResDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; import java.util.List; /** @@ -16,7 +18,7 @@ import java.util.List; public class StoreAppResVO { @ApiModelProperty(value = "档口头像") - private String storeLogo; + private SAFileVO logo; @ApiModelProperty(value = "档口ID") private Long storeId; @ApiModelProperty(value = "档口名称") @@ -32,4 +34,16 @@ public class StoreAppResVO { @ApiModelProperty(value = "备选联系电话") private String contactBackPhone; + @Data + public static class SAFileVO { + @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/StoreAppResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreAppResDTO.java index f35b6d2b7..e086ea48c 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreAppResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreAppResDTO.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; import java.util.List; /** @@ -18,7 +19,7 @@ import java.util.List; public class StoreAppResDTO { @ApiModelProperty(value = "档口头像") - private String storeLogo; + private SAFileDTO logo; @ApiModelProperty(value = "档口ID") private Long storeId; @ApiModelProperty(value = "档口名称") @@ -34,4 +35,17 @@ public class StoreAppResDTO { @ApiModelProperty(value = "备选联系电话") private String contactBackPhone; + @Data + public static class SAFileDTO { + @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/service/impl/StoreServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java index 4b9568317..1ded3fbaa 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 @@ -227,9 +227,15 @@ public class StoreServiceImpl implements IStoreService { UserSubscriptions userSub = this.userSubMapper.selectOne(new LambdaQueryWrapper() .eq(UserSubscriptions::getUserId, SecurityUtils.getUserId()).eq(UserSubscriptions::getStoreId, storeId) .eq(UserSubscriptions::getDelFlag, Constants.UNDELETED)); - return BeanUtil.toBean(store, StoreAppResDTO.class) + StoreAppResDTO appResDTO = BeanUtil.toBean(store, StoreAppResDTO.class).setStoreId(storeId) .setAttention(ObjectUtils.isNotEmpty(userSub) ? Boolean.TRUE : Boolean.FALSE) .setTagList(storeTagList.stream().map(DailyStoreTag::getTag).collect(Collectors.toList())); + // 获取档口LOGO + if (ObjectUtils.isNotEmpty(store.getStoreLogoId())) { + SysFile logo = this.fileMapper.selectById(store.getStoreLogoId()); + appResDTO.setLogo(ObjectUtils.isNotEmpty(logo) ? BeanUtil.toBean(logo, StoreAppResDTO.SAFileDTO.class) : null); + } + return appResDTO; } /**