Merge branch 'dev-wyf-v1.8.0-goblin' into test

docu/zhengzai-v1.8.0-goblin.sql

@@ -38,7 +38,8 @@ CREATE TABLE `goblin_artist_topic` (
     `on_sale_end`         datetime     DEFAULT NULL COMMENT '上架区间结束',
     `status`              tinyint(4)   NOT NULL DEFAULT 0 COMMENT '0待上架 1已上架 2已下架',
     `sort`                int(11)      NOT NULL DEFAULT 0 COMMENT 'Admin排序值，越小越靠前',
-    `recommend_position`  tinyint(4)   NOT NULL DEFAULT 0 COMMENT '0无推荐 1~5推荐位',
+    `recommend_position`  tinyint(4)   NOT NULL DEFAULT 0 COMMENT '0无推荐 1~10推荐位',
+    `tag`                 varchar(32)  DEFAULT NULL COMMENT '专题标签，如HOT/上新',
     `del_flg`             tinyint(4)   NOT NULL DEFAULT 0 COMMENT '0正常 1删除',
     `created_at`          datetime     NOT NULL COMMENT '创建时间',
     `updated_at`          datetime     NOT NULL COMMENT '更新时间',
@@ -64,3 +65,30 @@ CREATE TABLE `goblin_artist_topic_goods` (
     UNIQUE KEY `uk_topic_spu` (`topic_id`, `spu_id`),
     KEY `idx_topic_sort` (`topic_id`, `sort`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='艺人专题商品关联表';
+
+
+-- ----------------------------
+-- Admin 菜单权限（线上 prod，基于 prod_sys_menu.sql）
+-- 执行前确认：SELECT MAX(menu_id) FROM sys_menu; 当前导出最大为 2218
+-- parent：2000=正在映画
+-- ----------------------------
+INSERT INTO `sys_menu` VALUES (2219, '艺人管理', 2000, 4, '#', 'menuItem', 'M', '0', '1', NULL, 'fa fa-address-book', 'admin', '2026-08-14 14:30:00', '', NULL, '艺人授权审核/专题管理目录');
+INSERT INTO `sys_menu` VALUES (2220, '艺人授权审核', 2219, 1, 'goblin/artist/auth', 'menuItem', 'C', '0', '1', 'goblin:artist:auth:list', '#', 'admin', '2026-08-14 14:30:00', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2221, '艺人专题管理', 2219, 2, 'goblin/artist/topic', 'menuItem', 'C', '0', '1', 'goblin:artist:topic:list', '#', 'admin', '2026-08-14 14:30:00', '', NULL, '');
+
+-- 艺人授权审核按钮（parent=2220）
+INSERT INTO `sys_menu` VALUES (2222, '申请列表', 2220, 1, '#', 'menuItem', 'F', '0', '1', 'goblin:artist:auth:list', '#', 'admin', '2026-08-14 14:30:00', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2223, '申请详情', 2220, 2, '#', 'menuItem', 'F', '0', '1', 'goblin:artist:auth:info', '#', 'admin', '2026-08-14 14:30:00', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2224, '审核通过', 2220, 3, '#', 'menuItem', 'F', '0', '1', 'goblin:artist:auth:approve', '#', 'admin', '2026-08-14 14:30:00', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2225, '审核驳回', 2220, 4, '#', 'menuItem', 'F', '0', '1', 'goblin:artist:auth:reject', '#', 'admin', '2026-08-14 14:30:00', '', NULL, '');
+
+-- 艺人专题管理按钮（parent=2221）
+INSERT INTO `sys_menu` VALUES (2226, '专题列表', 2221, 1, '#', 'menuItem', 'F', '0', '1', 'goblin:artist:topic:list', '#', 'admin', '2026-08-14 14:30:00', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2227, '专题详情', 2221, 2, '#', 'menuItem', 'F', '0', '1', 'goblin:artist:topic:info', '#', 'admin', '2026-08-14 14:30:00', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2228, '推荐设置', 2221, 3, '#', 'menuItem', 'F', '0', '1', 'goblin:artist:topic:recommend', '#', 'admin', '2026-08-14 14:30:00', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2229, '设置标签', 2221, 4, '#', 'menuItem', 'F', '0', '1', 'goblin:artist:topic:tag', '#', 'admin', '2026-08-14 14:30:00', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2230, '上下架', 2221, 5, '#', 'menuItem', 'F', '0', '1', 'goblin:artist:topic:status', '#', 'admin', '2026-08-14 14:30:00', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2231, '设置排序', 2221, 6, '#', 'menuItem', 'F', '0', '1', 'goblin:artist:topic:sort', '#', 'admin', '2026-08-14 14:30:00', '', NULL, '');
+INSERT INTO `sys_menu` VALUES (2232, '删除专题', 2221, 7, '#', 'menuItem', 'F', '0', '1', 'goblin:artist:topic:delete', '#', 'admin', '2026-08-14 14:30:00', '', NULL, '');
+
+-- TODO 再将“演出管理”下的”艺人管理“菜单移动到新增的“艺人管理”目录下
\ No newline at end of file

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/constant/GoblinArtistConst.java

@@ -40,4 +40,9 @@ public final class GoblinArtistConst {
     public static final int DEL_YES = 1;
 
     public static final int DEFAULT_BANNER_HEIGHT = 240;
+
+    /** 推荐位最小值 */
+    public static final int RECOMMEND_MIN = 1;
+    /** 推荐位最大值 */
+    public static final int RECOMMEND_MAX = 10;
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinArtistTopicVo.java

@@ -25,6 +25,8 @@ public class GoblinArtistTopicVo implements Serializable {
     private Integer status;
     private Integer sort;
     private Integer recommendPosition;
+    /** 专题标签，如 HOT/上新 */
+    private String tag;
     private Integer delFlg;
     private LocalDateTime createdAt;
     private LocalDateTime updatedAt;

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinFrontArtistTopicDetailVo.java

@@ -20,6 +20,8 @@ public class GoblinFrontArtistTopicDetailVo implements Serializable {
     private String topicId;
     @ApiModelProperty("专题名称")
     private String topicName;
+    @ApiModelProperty("专题标签，如HOT/上新")
+    private String tag;
     @ApiModelProperty("关联艺人ID")
     private String artistId;
     @ApiModelProperty("艺人名称")

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinFrontArtistTopicHomeVo.java

@@ -33,8 +33,10 @@ public class GoblinFrontArtistTopicHomeVo implements Serializable {
         private String bannerUrl;
         @ApiModelProperty("banner高度px")
         private Integer bannerHeight;
-        @ApiModelProperty("推荐号位1~5")
+        @ApiModelProperty("推荐号位1~10")
         private Integer recommendPosition;
+        @ApiModelProperty("专题标签，如HOT/上新")
+        private String tag;
         @ApiModelProperty("关联艺人ID")
         private String artistId;
         @ApiModelProperty("艺人名称")

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinFrontArtistTopicListPageVo.java

@@ -36,8 +36,10 @@ public class GoblinFrontArtistTopicListPageVo implements Serializable {
         private String bannerUrl;
         @ApiModelProperty("banner高度px")
         private Integer bannerHeight;
-        @ApiModelProperty("推荐号位1~5")
+        @ApiModelProperty("推荐号位1~10")
         private Integer recommendPosition;
+        @ApiModelProperty("专题标签，如HOT/上新")
+        private String tag;
         @ApiModelProperty("关联艺人ID")
         private String artistId;
         @ApiModelProperty("艺人名称")

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/goblin/artist/GoblinArtistTopicAdminController.java

@@ -93,6 +93,7 @@ public class GoblinArtistTopicAdminController extends BaseController {
             row.put("status", item.getStatus());
             row.put("sort", item.getSort());
             row.put("recommendPosition", item.getRecommendPosition());
+            row.put("tag", item.getTag());
             row.put("goodsCount", goodsCounts.getOrDefault(item.getTopicId(), 0));
             row.put("createdAt", formatTime(item.getCreatedAt()));
             row.put("onSaleStart", formatDate(item.getOnSaleStart()));
@@ -156,6 +157,15 @@ public class GoblinArtistTopicAdminController extends BaseController {
         return toAjax(topicAdminService.setRecommend(topicId, position));
     }
 
+    @Log(title = "艺人专题:设置标签", businessType = BusinessType.UPDATE)
+    @RequiresPermissions("goblin:artist:topic:tag")
+    @PostMapping("tag")
+    @ResponseBody
+    public AjaxResult setTag(@RequestParam String topicId,
+                             @RequestParam(required = false, defaultValue = "") String tag) {
+        return toAjax(topicAdminService.setTag(topicId, tag));
+    }
+
     /** 查询推荐位当前占用专题（用于替换确认提示） */
     @RequiresPermissions("goblin:artist:topic:recommend")
     @GetMapping("recommendOwner")

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/goblin/artist/topic/detail.html

@@ -152,6 +152,10 @@
                 <span class="label-text">关联艺人：</span>
                 <span class="value-text" th:text="${artist != null ? artist.artistName : '-'}">-</span>
             </div>
+            <div class="detail-item">
+                <span class="label-text">专题标签：</span>
+                <span class="value-text" th:text="*{tag} ?: '-'">-</span>
+            </div>
             <div class="detail-item">
                 <span class="label-text">创建时间：</span>
                 <span class="value-text" th:text="*{createdAt} ?: '-'">-</span>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/goblin/artist/topic/topic.html

@@ -158,6 +158,7 @@
     var recommendFlg = [[${@permission.hasPermi('goblin:artist:topic:recommend')}]];
     var statusFlg = [[${@permission.hasPermi('goblin:artist:topic:status')}]];
     var infoFlg = [[${@permission.hasPermi('goblin:artist:topic:info')}]];
+    var tagFlg = [[${@permission.hasPermi('goblin:artist:topic:tag')}]];
 
     function statusHtml(v) {
         if (v == 1) {
@@ -172,6 +173,10 @@
         return v ? '<span class="badge-rec badge-rec-active">推荐' + v + '号位</span>'
                  : '<span class="badge-rec badge-rec-none">无推荐</span>';
     }
+    function tagHtml(v) {
+        return v ? '<span class="badge-rec badge-rec-active">' + v + '</span>'
+                 : '<span class="badge-rec badge-rec-none">无</span>';
+    }
     function saleTimeHtml(row) {
         if (!row.onSaleStart && !row.onSaleEnd) return '-';
         return (row.onSaleStart || '--') + ' 至 ' + (row.onSaleEnd || '--');
@@ -192,6 +197,7 @@
                 { field: 'onSaleStart', title: '上架时间', formatter: function(v, row) { return saleTimeHtml(row); }},
                 { field: 'status', title: '专题状态', align: 'center', formatter: function(v) { return statusHtml(v); }},
                 { field: 'recommendPosition', title: '推荐状态', align: 'center', formatter: function(v) { return recommendHtml(v); }},
+                { field: 'tag', title: '标签', align: 'center', formatter: function(v) { return tagHtml(v); }},
                 { title: '操作', align: 'center', formatter: function(v, row) {
                     var html = '<div class="action-cell">';
                     html += '<div class="action-row-top">';
@@ -201,6 +207,8 @@
                     }
                     html += '</div>';
                     html += '<a class="btn-act btn-act-rec ' + recommendFlg + '" onclick="openRecMenu(event, \'' + row.topicId + '\',' + (row.recommendPosition || 0) + ')">推荐设置 <i class="fa fa-caret-down"></i></a>';
+                    var safeTag = (row.tag || '').replace(/\\/g, '\\\\').replace(/'/g, "\\'");
+                    html += '<a class="btn-act btn-act-rec ' + tagFlg + '" onclick="openSetTag(\'' + row.topicId + '\',\'' + safeTag + '\')">设置标签</a>';
                     html += '</div>';
                     return html;
                 }}
@@ -241,7 +249,7 @@
     }
 
     // ---------- 推荐设置下拉菜单 ----------
-    var recPositions = [1, 2, 3, 4, 5];
+    var recPositions = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
     var $recMenu = null;
 
     function openRecMenu(event, topicId, curPos) {
@@ -326,6 +334,37 @@
             error: function() { $.modal.closeLoading(); }
         });
     }
+
+    // ---------- 设置标签 ----------
+    function openSetTag(topicId, curTag) {
+        layer.prompt({
+            title: '设置专题标签（如 HOT / 上新，可清空）',
+            formType: 0,
+            value: curTag || '',
+            maxlength: 32
+        }, function(value, index) {
+            layer.close(index);
+            doSetTag(topicId, value == null ? '' : value);
+        });
+    }
+
+    function doSetTag(topicId, tag) {
+        $.modal.loading("正在保存标签...");
+        $.ajax({
+            type: 'post', url: prefix + "/tag",
+            data: { topicId: topicId, tag: tag },
+            success: function(res) {
+                $.modal.closeLoading();
+                if (res.code == 0) {
+                    $.modal.msgSuccess("标签已更新");
+                    $.table.refresh();
+                } else {
+                    $.modal.alertError(res.msg);
+                }
+            },
+            error: function() { $.modal.closeLoading(); }
+        });
+    }
 </script>
 </body>
 </html>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/IGoblinArtistTopicAdminService.java

@@ -17,10 +17,15 @@ public interface IGoblinArtistTopicAdminService extends IService<GoblinArtistTop
     boolean setSort(String topicId, int sort);
 
     /**
-     * 设置推荐位，0~5，同步写 MongoDB + MySQL
+     * 设置推荐位，0 或 1~10，同步写 MongoDB + MySQL
      */
     boolean setRecommend(String topicId, int position);
 
+    /**
+     * 设置专题标签，同步写 MongoDB + MySQL；空串视为清空
+     */
+    boolean setTag(String topicId, String tag);
+
     /**
      * 上下架，同步写 MongoDB + MySQL
      */

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/impl/GoblinArtistTopicAdminServiceImpl.java

@@ -70,6 +70,10 @@ public class GoblinArtistTopicAdminServiceImpl
     @Override
     @Transactional
     public boolean setRecommend(String topicId, int position) {
+        if (position != 0 && (position < GoblinArtistConst.RECOMMEND_MIN
+                || position > GoblinArtistConst.RECOMMEND_MAX)) {
+            return false;
+        }
         LocalDateTime now = LocalDateTime.now();
 
         if (position > 0) {
@@ -96,6 +100,28 @@ public class GoblinArtistTopicAdminServiceImpl
         return true;
     }
 
+    @Override
+    @Transactional
+    public boolean setTag(String topicId, String tag) {
+        LocalDateTime now = LocalDateTime.now();
+        String normalized = StringUtils.isBlank(tag) ? null : tag.trim();
+        if (normalized != null && normalized.length() > 32) {
+            normalized = normalized.substring(0, 32);
+        }
+
+        this.update(new LambdaUpdateWrapper<GoblinArtistTopic>()
+                .eq(GoblinArtistTopic::getTopicId, topicId)
+                .set(GoblinArtistTopic::getTag, normalized)
+                .set(GoblinArtistTopic::getUpdatedAt, now));
+
+        mongoTemplate.updateFirst(Query.query(Criteria.where("topicId").is(topicId)),
+                Update.update("tag", normalized).set("updatedAt", now),
+                GoblinArtistTopicVo.class.getSimpleName());
+
+        redisDataSourceUtil.getRedisGoblinUtil().del(GoblinRedisConst.ARTIST_TOPIC + topicId);
+        return true;
+    }
+
     @Override
     @Transactional
     public boolean setStatus(String topicId, int status) {
@@ -156,6 +182,7 @@ public class GoblinArtistTopicAdminServiceImpl
         result.put("status", topic.getStatus());
         result.put("sort", topic.getSort());
         result.put("recommendPosition", topic.getRecommendPosition());
+        result.put("tag", topic.getTag());
         result.put("createdAt", topic.getCreatedAt());
         result.put("updatedAt", topic.getUpdatedAt());
         result.put("goods", buildGoods(relations));

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinArtistTopic.java

@@ -46,6 +46,9 @@ public class GoblinArtistTopic implements Serializable {
 
     private Integer recommendPosition;
 
+    /** 专题标签，如 HOT/上新 */
+    private String tag;
+
     /** 0正常 1删除 */
     private Integer delFlg;
 

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinFrontArtistTopicServiceImpl.java

@@ -44,8 +44,6 @@ public class GoblinFrontArtistTopicServiceImpl {
     private static final long TOPIC_TTL = 86400L;
     private static final String SORT_PRICE = "price";
     private static final String ORDER_DESC = "desc";
-    private static final int RECOMMEND_MIN = 1;
-    private static final int RECOMMEND_MAX = 5;
 
     @Autowired
     private MongoTemplate mongoTemplate;
@@ -61,8 +59,8 @@ public class GoblinFrontArtistTopicServiceImpl {
 
         List<GoblinArtistTopicVo> recommended = visible.stream()
                 .filter(t -> t.getRecommendPosition() != null
-                        && t.getRecommendPosition() >= RECOMMEND_MIN
-                        && t.getRecommendPosition() <= RECOMMEND_MAX)
+                        && t.getRecommendPosition() >= GoblinArtistConst.RECOMMEND_MIN
+                        && t.getRecommendPosition() <= GoblinArtistConst.RECOMMEND_MAX)
                 .sorted(Comparator.comparing(GoblinArtistTopicVo::getRecommendPosition))
                 .collect(Collectors.toList());
 
@@ -99,6 +97,7 @@ public class GoblinFrontArtistTopicServiceImpl {
         GoblinFrontArtistTopicDetailVo vo = new GoblinFrontArtistTopicDetailVo();
         vo.setTopicId(topic.getTopicId());
         vo.setTopicName(topic.getTopicName());
+        vo.setTag(topic.getTag());
         vo.setArtistId(topic.getArtistId());
         vo.setTemplateType(topic.getTemplateType());
         vo.setBannerUrl(topic.getBannerUrl());
@@ -274,6 +273,7 @@ public class GoblinFrontArtistTopicServiceImpl {
             item.setBannerUrl(t.getBannerUrl());
             item.setBannerHeight(t.getBannerHeight());
             item.setRecommendPosition(t.getRecommendPosition());
+            item.setTag(t.getTag());
             item.setArtistId(t.getArtistId());
             KylinArtist artist = artistMap.get(t.getArtistId());
             if (artist != null) {
@@ -293,6 +293,7 @@ public class GoblinFrontArtistTopicServiceImpl {
             item.setBannerUrl(t.getBannerUrl());
             item.setBannerHeight(t.getBannerHeight());
             item.setRecommendPosition(t.getRecommendPosition());
+            item.setTag(t.getTag());
             item.setArtistId(t.getArtistId());
             KylinArtist artist = artistMap.get(t.getArtistId());
             if (artist != null) {

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreMgtArtistServiceImpl.java

@@ -458,6 +458,7 @@ public class GoblinStoreMgtArtistServiceImpl implements IGoblinStoreMgtArtistSer
         topicVo.setStatus(GoblinArtistConst.TOPIC_PENDING);
         topicVo.setSort(0);
         topicVo.setRecommendPosition(0);
+        topicVo.setTag(null);
         topicVo.setDelFlg(GoblinArtistConst.DEL_NO);
         topicVo.setCreatedAt(now);
         topicVo.setUpdatedAt(now);