From 537122f7d988035e44b616234fd5e454b4b91eb1 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Wed, 20 Aug 2025 22:13:43 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E5=95=86=E5=9F=8E=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E6=A1=A3=E5=8F=A3=E7=9B=B8=E5=85=B3=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=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/store/StoreSimpleResVO.java | 16 ++++++++++++++++ .../xkt/vo/userShoppingCart/ShopCartResVO.java | 11 ++++++----- .../ruoyi/xkt/dto/store/StoreSimpleResDTO.java | 18 ++++++++++++++++++ .../xkt/service/impl/StoreServiceImpl.java | 8 +++++++- xkt/src/main/resources/mapper/StoreMapper.xml | 3 ++- 5 files changed, 49 insertions(+), 7 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreSimpleResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreSimpleResVO.java index 343b892ab..c70679ace 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreSimpleResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreSimpleResVO.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + /** * @author liujiang * @version v1.0 @@ -37,5 +39,19 @@ public class StoreSimpleResVO { private String licenseName; @ApiModelProperty(value = "是否关注") private Boolean focus; + @ApiModelProperty(value = "档口logo") + private SSFileVO logo; + + @Data + public static class SSFileVO { + @ApiModelProperty(value = "文件名称") + private String fileName; + @ApiModelProperty(value = "文件路径") + private String fileUrl; + @ApiModelProperty(value = "文件类型") + private Integer fileType; + @ApiModelProperty(value = "文件大小") + private BigDecimal fileSize; + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartResVO.java index 0de07b834..186f6bca7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/userShoppingCart/ShopCartResVO.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.experimental.Accessors; import java.math.BigDecimal; import java.util.List; @@ -18,21 +19,21 @@ import java.util.List; @JsonInclude(JsonInclude.Include.NON_NULL) public class ShopCartResVO { - @ApiModelProperty(value = "进货车ID") - private Long shoppingCartId; @ApiModelProperty(value = "档口ID") private Long storeId; @ApiModelProperty(value = "档口名称") private String storeName; - @ApiModelProperty(value = "商品货号") - private String prodArtNum; @ApiModelProperty(value = "档口商品ID") private Long storeProdId; + @ApiModelProperty(value = "商品货号") + private String prodArtNum; + @ApiModelProperty(value = "商品主图") + private String mainPicUrl; @ApiModelProperty(value = "进货车明细列表") List detailList; @Data - @ApiModel + @Accessors(chain = true) public static class SCDetailVO { @ApiModelProperty(value = "档口商品颜色尺寸ID") private Long storeProdColorSizeId; diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreSimpleResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreSimpleResDTO.java index b71235489..1b82a08f7 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreSimpleResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreSimpleResDTO.java @@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; +import java.math.BigDecimal; + /** * @author liujiang * @version v1.0 @@ -37,5 +39,21 @@ public class StoreSimpleResDTO { private String licenseName; @ApiModelProperty(value = "是否关注") private Boolean focus; + @ApiModelProperty(value = "档口LOGO ID") + private Long storeLogoId; + @ApiModelProperty(value = "档口logo") + private SSFileDTO logo; + + @Data + public static class SSFileDTO { + @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 732d38151..792d2a83f 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 @@ -457,7 +457,13 @@ public class StoreServiceImpl implements IStoreService { .eq(UserSubscriptions::getUserId, SecurityUtils.getUserId()) .eq(UserSubscriptions::getStoreId, storeId) .eq(UserSubscriptions::getDelFlag, Constants.UNDELETED)); - return simpleDTO.setFocus(ObjectUtils.isNotEmpty(userSub) ? Boolean.TRUE : Boolean.FALSE); + simpleDTO.setFocus(ObjectUtils.isNotEmpty(userSub) ? Boolean.TRUE : Boolean.FALSE); + // 获取档口LOGO + if (ObjectUtils.isNotEmpty(simpleDTO.getStoreLogoId())) { + SysFile logo = this.fileMapper.selectById(simpleDTO.getStoreLogoId()); + simpleDTO.setLogo(BeanUtil.toBean(logo, StoreSimpleResDTO.SSFileDTO.class)); + } + return simpleDTO; } @Override diff --git a/xkt/src/main/resources/mapper/StoreMapper.xml b/xkt/src/main/resources/mapper/StoreMapper.xml index b40cf869d..60a410e27 100644 --- a/xkt/src/main/resources/mapper/StoreMapper.xml +++ b/xkt/src/main/resources/mapper/StoreMapper.xml @@ -32,7 +32,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" s.qq_account, s.store_address, sc.legal_name, - sc.license_name + sc.license_name, + s.store_logo_id FROM store s JOIN store_certificate sc ON s.id = sc.store_id WHERE