master：商城首页档口相关返回数据调整；

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;
+    }
 
 }

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<SCDetailVO> detailList;
 
     @Data
-    @ApiModel
+    @Accessors(chain = true)
     public static class SCDetailVO {
         @ApiModelProperty(value = "档口商品颜色尺寸ID")
         private Long storeProdColorSizeId;

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;
+    }
 
 }

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

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