master：档口首页装修调整；

ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeHomepage/StoreHomeDecorationVO.java

@@ -33,6 +33,8 @@ public class StoreHomeDecorationVO {
     public static class DecorationVO {
         @ApiModelProperty(value = "storeProdId")
         private Long storeProdId;
+        @ApiModelProperty(value = "档口ID")
+        private Long storeId;
         @ApiModelProperty(value = "业务名称")
         private String bizName;
         @ApiModelProperty(value = "1.档口（推广图） 2.商品  10.不跳转")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeHomepage/StoreHomeTemplateOneResVO.java

@@ -32,6 +32,8 @@ public class StoreHomeTemplateOneResVO {
     public static class SHTOTopBannerVO {
         @ApiModelProperty(value = "storeProdId")
         private Long storeProdId;
+        @ApiModelProperty(value = "档口id")
+        private Long storeId;
         @ApiModelProperty(value = "1.档口（推广图） 2.商品  10.不跳转")
         private Integer displayType;
         @ApiModelProperty(value = "跳转链接")

sql/ry_20240629.sql

@@ -3394,7 +3394,8 @@ CREATE TABLE `store_homepage`
     `store_id`      bigint UNSIGNED NOT NULL COMMENT '档口ID',
     `file_type`     int UNSIGNED NULL DEFAULT NULL COMMENT '档口各位置类型',
     `display_type`  int UNSIGNED NOT NULL COMMENT '跳转类型：1档口、2商品、10不跳转',
-    `store_prod_id` bigint UNSIGNED NOT NULL COMMENT '档口商品ID',
+    `jump_store_id` bigint UNSIGNED NULL DEFAULT NULL COMMENT '跳转档口ID',
+    `store_prod_id` bigint UNSIGNED NULL DEFAULT NULL COMMENT '档口商品ID',
     `file_id`       bigint UNSIGNED NULL DEFAULT NULL COMMENT '档口各位置文件ID',
     `order_num`     int UNSIGNED NULL DEFAULT NULL COMMENT '排序',
     `version`       bigint UNSIGNED NOT NULL COMMENT '版本号',
@@ -3404,7 +3405,7 @@ CREATE TABLE `store_homepage`
     `update_by`     varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者',
     `update_time`   datetime NULL DEFAULT NULL COMMENT '更新时间',
     PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '档口首页' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 57 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '档口首页' ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Table structure for store_member

xkt/src/main/java/com/ruoyi/xkt/domain/StoreHomepage.java

@@ -31,9 +31,14 @@ public class StoreHomepage extends XktBaseEntity {
     /**
      * 档口ID
      */
-    @Excel(name = "档口ID")
     private Long storeId;
 
+    /**
+     * 跳转档口ID
+     */
+    @Excel(name = "跳转档口ID")
+    private Long jumpStoreId;
+
     /**
      * 商品ID storeProdId
      */

xkt/src/main/java/com/ruoyi/xkt/dto/storeHomepage/StoreHomeDecorationDTO.java

@@ -31,6 +31,8 @@ public class StoreHomeDecorationDTO {
     public static class BigBannerDTO {
         @ApiModelProperty(value = "storeProdId")
         private Long storeProdId;
+        @ApiModelProperty(value = "档口ID")
+        private Long storeId;
         @ApiModelProperty(value = "业务名称")
         private String bizName;
         @ApiModelProperty(value = "1.档口（推广图） 2.商品  10.不跳转")

xkt/src/main/java/com/ruoyi/xkt/dto/storeHomepage/StoreHomeDecorationResDTO.java

@@ -32,6 +32,8 @@ public class StoreHomeDecorationResDTO {
     public static class DecorationDTO {
         @ApiModelProperty(value = "storeProdId")
         private Long storeProdId;
+        @ApiModelProperty(value = "跳转的档口ID")
+        private Long storeId;
         @ApiModelProperty(value = "业务名称")
         private String bizName;
         @ApiModelProperty(value = "1.档口（推广图） 2.商品  10.不跳转")

xkt/src/main/java/com/ruoyi/xkt/dto/storeHomepage/StoreHomeTemplateItemResDTO.java

@@ -13,7 +13,7 @@ import java.util.List;
  * @version v1.0
  * @date 2025/3/27 15:12
  */
-@ApiModel("档口首页模板一返回数据")
+@ApiModel
 @Data
 @Accessors(chain = true)
 public class StoreHomeTemplateItemResDTO {

xkt/src/main/java/com/ruoyi/xkt/dto/storeHomepage/StoreHomeTopBannerResDTO.java

@@ -17,6 +17,8 @@ public class StoreHomeTopBannerResDTO {
 
     @ApiModelProperty(value = "storeProdId")
     private Long storeProdId;
+    @ApiModelProperty(value = "档口id")
+    private Long storeId;
     @ApiModelProperty(value = "1.档口（推广图） 2.商品  10.不跳转")
     private Integer displayType;
     @ApiModelProperty(value = "跳转链接")

xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreHomepageServiceImpl.java

@@ -96,10 +96,12 @@ public class StoreHomepageServiceImpl implements IStoreHomepageService {
                             .setFileType(x.getFileType()).setFileUrl(fileMap.containsKey(x.getFileId()) ? fileMap.get(x.getFileId()).getFileUrl() : "");
                     // 跳转到商品
                     if (Objects.equals(x.getDisplayType(), HomepageJumpType.JUMP_PRODUCT.getValue())) {
-                        decorationDTO.setBizName(storeProdMap.containsKey(x.getStoreProdId()) ? storeProdMap.get(x.getStoreProdId()).getProdArtNum() : "");
+                        decorationDTO.setStoreId(x.getJumpStoreId()).setBizName(storeProdMap.containsKey(x.getStoreProdId())
+                                ? storeProdMap.get(x.getStoreProdId()).getProdArtNum() : "");
                         // 跳转到档口首页
                     } else if (Objects.equals(x.getDisplayType(), HomepageJumpType.JUMP_STORE.getValue())) {
-                        decorationDTO.setBizName(ObjectUtils.isEmpty(x.getStoreProdId()) ? "" : store.getStoreName());
+                        decorationDTO.setStoreId(x.getJumpStoreId())
+                                .setBizName(ObjectUtils.isEmpty(x.getStoreProdId()) ? "" : store.getStoreName());
                     }
                     return decorationDTO;
                 }).collect(Collectors.toList());
@@ -431,7 +433,7 @@ public class StoreHomepageServiceImpl implements IStoreHomepageService {
             this.fileMapper.insert(bigBannerFileList);
             Map<String, SysFile> bigBannerMap = bigBannerFileList.stream().collect(Collectors.toMap(SysFile::getFileUrl, Function.identity()));
             homePageList.addAll(homepageDTO.getBigBannerList().stream().map(x -> BeanUtil.toBean(x, StoreHomepage.class).setStoreId(homepageDTO.getStoreId())
-                            .setFileId(bigBannerMap.containsKey(x.getFileUrl()) ? bigBannerMap.get(x.getFileUrl()).getId() : null))
+                            .setJumpStoreId(x.getStoreId()).setFileId(bigBannerMap.containsKey(x.getFileUrl()) ? bigBannerMap.get(x.getFileUrl()).getId() : null))
                     .collect(Collectors.toList()));
         }
         if (CollectionUtils.isNotEmpty(homepageDTO.getDecorationList())) {

xkt/src/main/resources/mapper/StoreHomepageMapper.xml

@@ -4,9 +4,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.xkt.mapper.StoreHomepageMapper">
 
-    <select id="selectTopLeftList">
+    <select id="selectTopLeftList" resultType="com.ruoyi.xkt.dto.storeHomepage.StoreHomeTopBannerResDTO">
         SELECT
-            sh.biz_id,
+            sh.jump_store_id AS storeId,
+            sh.store_prod_id,
             sh.display_type,
             sh.order_num,
             CASE WHEN sh.display_type = 2 AND sh.file_id IS NULL THEN