master：推广营销风格榜返回数据字段添加；

ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/AdRoundStoreCreateVO.java

@@ -42,6 +42,8 @@ public class AdRoundStoreCreateVO {
     private Integer picDesignType;
     @ApiModelProperty(value = "推广商品ID列表")
     private String prodIdStr;
+    @ApiModelProperty(value = "风格榜风格类型")
+    private Integer styleType;
     @NotBlank(message = "对象锁符号不能为空!")
     @ApiModelProperty(value = "对象锁符号", required = true)
     private String symbol;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/advertRound/pc/index/PCIndexMidStyleVO.java

@@ -26,6 +26,10 @@ public class PCIndexMidStyleVO {
     private Integer displayType;
     @ApiModelProperty(value = "推广图路径")
     private String picUrl;
+    @ApiModelProperty(value = "风格类型")
+    private Integer styleType;
+    @ApiModelProperty(value = "风格类型名称")
+    private String styleTypeName;
     @ApiModelProperty(value = "排序")
     private Integer orderNum;
     @ApiModelProperty(value = "风格榜列表")

xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/AdRoundStoreCreateDTO.java

@@ -34,6 +34,8 @@ public class AdRoundStoreCreateDTO {
     private Integer picDesignType;
     @ApiModelProperty(value = "推广商品ID列表")
     private String prodIdStr;
+    @ApiModelProperty(value = "风格榜风格类型")
+    private Integer styleType;
     @ApiModelProperty(value = "对象锁符号")
     private String symbol;
     @ApiModelProperty(value = "支付方式")

xkt/src/main/java/com/ruoyi/xkt/dto/advertRound/pc/index/PCIndexMidStyleDTO.java

@@ -29,6 +29,10 @@ public class PCIndexMidStyleDTO {
     private String picUrl;
     @ApiModelProperty(value = "1推广图")
     private Integer displayType;
+    @ApiModelProperty(value = "风格类型")
+    private Integer styleType;
+    @ApiModelProperty(value = "风格类型名称")
+    private String styleTypeName;
     @ApiModelProperty(value = "排序")
     private Integer orderNum;
     @ApiModelProperty(value = "档口出的推广价格")

xkt/src/main/java/com/ruoyi/xkt/enums/AdStyleType.java

@@ -0,0 +1,55 @@
+package com.ruoyi.xkt.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 推广营销风格类型
+ *
+ * @author liujiang
+ * @date 2025-04-02 23:42
+ */
+@Getter
+@AllArgsConstructor
+public enum AdStyleType {
+
+    ELEGANT_CONCISE_FLOW(1, "优雅精致风"),
+    RELAXED_MINIMALISM_FLOW(2, "休闲简约风"),
+    CLASSIC_FLOW(3, "复古风"),
+    PROFESSIONAL_COMMUTE_FLOW(4, "职业通勤风"),
+    MINIMALISM_FLOW(5, "极简主义风"),
+    COLLEGE_FLOW(6, "学院风"),
+    CLASSY_WORK_FLOW(7, "简约职场风"),
+    BANQUET_NIGHT_FLOW(8, "宴会晚装风"),
+    STREET_CURRENT_FLOW(9, "街头潮流风"),
+    SPORTS_FLOW(10, "运动风"),
+    CUTE_AND_SWEET_FLOW(11, "可爱甜美风"),
+    LORDA_FLOW(12, "洛丽塔风"),
+    ROMANTIC_GIRL_FLOW(13, "浪漫少女风"),
+    FUTURE_FLOW(14, "未来主义风"),
+    SEXY_FLOW(15, "性感魅惑风"),
+    GOTHIC_FLOW(16, "哥特风"),
+    PONK_FLOW(17, "朋克风"),
+    TRAVEL_FLOW(18, "度假风"),
+    TOWN_FLOW(19, "田园风"),
+    MILITARY_FLOW(20, "军旅风"),
+    CHEN_FLOW(21, "禅意风"),
+    CLASSIC_SPORT_FLOW(22, "复古运动风"),
+    MODERN_STYLE_FLOW(23, "摩登时髦风"),
+    MIX_FLOW(24, "混搭风"),
+
+    ;
+
+    private final Integer value;
+    private final String label;
+
+    public static AdStyleType of(Integer value) {
+        for (AdStyleType e : AdStyleType.values()) {
+            if (e.getValue().equals(value)) {
+                return e;
+            }
+        }
+        // 默认风格
+        return AdStyleType.ELEGANT_CONCISE_FLOW;
+    }
+}

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

@@ -671,7 +671,7 @@ public class AdvertRoundServiceImpl implements IAdvertRoundService {
             // 更新广告位数据
             minPriceAdvert
                     // 档口购买的推广位一律设置为 非拦截
-                    .setSysIntercept(AdSysInterceptType.UN_INTERCEPT.getValue())
+                    .setSysIntercept(AdSysInterceptType.UN_INTERCEPT.getValue()).setStyleType(createDTO.getStyleType())
                     .setStoreId(createDTO.getStoreId()).setPayPrice(createDTO.getPayPrice()).setVoucherDate(java.sql.Date.valueOf(LocalDate.now()))
                     .setBiddingStatus(AdBiddingStatus.BIDDING.getValue()).setBiddingTempStatus(AdBiddingStatus.BIDDING_SUCCESS.getValue())
                     .setPicSetType(this.hasPic(minPriceAdvert.getDisplayType()) ? AdPicSetType.UN_SET.getValue() : null)

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

@@ -38,10 +38,7 @@ import com.ruoyi.xkt.dto.storeProductFile.StoreProdFileResDTO;
 import com.ruoyi.xkt.dto.useSearchHistory.UserSearchHistoryDTO;
 import com.ruoyi.xkt.dto.website.IndexSearchDTO;
 import com.ruoyi.xkt.dto.website.StoreSearchDTO;
-import com.ruoyi.xkt.enums.AdBiddingStatus;
+import com.ruoyi.xkt.enums.*;
-import com.ruoyi.xkt.enums.AdDisplayType;
-import com.ruoyi.xkt.enums.AdLaunchStatus;
-import com.ruoyi.xkt.enums.SearchPlatformType;
 import com.ruoyi.xkt.mapper.*;
 import com.ruoyi.xkt.service.IPictureService;
 import com.ruoyi.xkt.service.IWebsitePCService;
@@ -1642,7 +1639,8 @@ public class WebsitePCServiceImpl implements IWebsitePCService {
                     }
                     StoreMember storeMember = this.redisCache.getCacheObject(CacheConstants.STORE_MEMBER + storeId);
                     midStyleList.add(new PCIndexMidStyleDTO().setStoreId(storeId).setStoreName(storeMap.get(storeId).getStoreName())
-                            .setDisplayType(AdDisplayType.PICTURE.getValue()).setStyleList(styleList)
+                            .setDisplayType(AdDisplayType.PICTURE.getValue()).setStyleList(styleList).setStyleType(advertRound.getStyleType())
+                            .setStyleTypeName(ObjectUtils.isNotEmpty(advertRound.getStyleType()) ? AdStyleType.of(advertRound.getStyleType()).getLabel() : "")
                             .setPayPrice(ObjectUtils.defaultIfNull(advertRound.getPayPrice(), BigDecimal.ZERO))
                             .setMemberLevel(ObjectUtils.isNotEmpty(storeMember) ? storeMember.getLevel() : null)
                             .setPicUrl(ObjectUtils.isNotEmpty(fileMap.get(advertRound.getPicId())) ? fileMap.get(advertRound.getPicId()).getFileUrl() : ""));