福袋功能-banner列表

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/BannersParam.java

@@ -75,6 +75,9 @@ public class BannersParam implements Serializable {
     @ApiModelProperty(value = "推广省份 多选 数组", example = "[\"北京市\", \"天津市\", \"沈阳市\"]")
     private List provincesNameList;
 
+    @ApiModelProperty(value = "演出ID")
+    private String performanceId;
+
     @JsonIgnore
     public KylinBanners getFields(String bannersId, String createdAt) {
         KylinBanners fields = new KylinBanners();

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinBannersVo.java

@@ -77,4 +77,10 @@ public class KylinBannersVo implements Serializable {
     @ApiModelProperty(value = "修改时间")
     private String updatedAt;
 
+    @ApiModelProperty(value = "演出ID")
+    private String performanceId;
+
+    @ApiModelProperty(value = "演出名称")
+    private String performanceName;
+
 }

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/admin/IKylinPerformancesAdminService.java

@@ -9,6 +9,7 @@ import com.liquidnet.service.kylin.dto.param.PerformanceMemberAuditParam;
 import com.liquidnet.service.kylin.dto.param.SysDamaiParam;
 import com.liquidnet.service.kylin.dto.vo.admin.*;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
+import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformancesVo;
 import com.liquidnet.service.kylin.entity.KylinOrderImport;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
 
@@ -320,4 +321,6 @@ public interface IKylinPerformancesAdminService {
      * @return: com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceAgentVo
      **/
     List<KylinPerformanceSubscribeTicketStatisticalDao> getPerformanceSubscribe(String performancesId);
+
+    List<KylinPerformancesVo> searchPerformanceByTitle(String title);
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinBannersAdminController.java

@@ -69,7 +69,7 @@ public class KylinBannersAdminController extends BaseController {
         return prefix + "/create";
     }
 
-    @Log(title = "Banner列表", businessType = BusinessType.INSERT)
+    @Log(title = "创建Banner", businessType = BusinessType.INSERT)
     @RequiresPermissions("kylin:banners:create")
     @PostMapping("create")
     @ResponseBody
@@ -105,7 +105,7 @@ public class KylinBannersAdminController extends BaseController {
         return prefix + "/update";
     }
 
-    @Log(title = "Banner列表", businessType = BusinessType.UPDATE)
+    @Log(title = "修改Banner", businessType = BusinessType.UPDATE)
     @RequiresPermissions("kylin:banners:update")
     @PostMapping("update")
     @ResponseBody
@@ -142,7 +142,7 @@ public class KylinBannersAdminController extends BaseController {
         return getDataTable(result.getList());
     }
 
-    @Log(title = "Banner列表", businessType = BusinessType.DELETE)
+    @Log(title = "删除Banner", businessType = BusinessType.DELETE)
     @RequiresPermissions("kylin:banners:delete")
     @PostMapping("delete")
     @ResponseBody

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinPerformancesController.java

@@ -8,12 +8,10 @@ import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
 import com.liquidnet.client.admin.common.enums.BusinessType;
 import com.liquidnet.client.admin.common.utils.poi.ExcelUtil;
-import com.liquidnet.client.admin.zhengzai.kylin.dto.KylinOrderImportDto;
 import com.liquidnet.client.admin.zhengzai.kylin.dto.KylinPerformanceSubscribeTicketStatisticalExportDao;
 import com.liquidnet.client.admin.zhengzai.kylin.dto.PerformanceOrderStatisCountResp;
-import com.liquidnet.client.admin.zhengzai.stone.service.dto.StoneScoreListExportDto;
 import com.liquidnet.commons.lang.util.JsonUtils;
-import com.liquidnet.service.goblin.param.GoblinFrontCubeParam;
+import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dao.PerformanceAdminListDao;
 import com.liquidnet.service.kylin.dao.PerformanceMemberAuditDao;
 import com.liquidnet.service.kylin.dao.PerformanceOrderStatisticalDao;
@@ -23,6 +21,7 @@ import com.liquidnet.service.kylin.dto.param.PerformanceMemberAuditParam;
 import com.liquidnet.service.kylin.dto.param.SysDamaiParam;
 import com.liquidnet.service.kylin.dto.vo.admin.*;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
+import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformancesVo;
 import com.liquidnet.service.kylin.entity.KylinOrderImport;
 import com.liquidnet.service.kylin.service.admin.IKylinPerformancesAdminService;
 import com.liquidnet.service.kylin.service.other.DamaiService;
@@ -365,4 +364,11 @@ public class KylinPerformancesController extends BaseController {
         String result = kylinPerformancesService.changeTransferConfig(performancesId, isCanTransfer, transferStartTime, transferEndTime);
         return this.success(result);
     }
+
+    @GetMapping(value = "/search")
+    @ResponseBody
+    public ResponseDto<List<KylinPerformancesVo>> searchPerformanceByTitle(@RequestParam(value = "title") String title) {
+        List<KylinPerformancesVo> kylinPerformancesVoList = kylinPerformancesService.searchPerformanceByTitle(title);
+        return ResponseDto.success(kylinPerformancesVoList);
+    }
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/banners/banners.html

@@ -124,6 +124,10 @@
                     field: 'createdAt',
                     title: '创建时间'
                 },
+                {
+                    field: 'performanceName',
+                    title: '关联演出名称'
+                },
                 {
                     title: '操作',
                     align: 'center',

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/banners/create.html

@@ -155,39 +155,72 @@
     var url9 = "[[${url9}]]";
     var url14 = "[[${url14}]]";
     let count = 0;
-    function areaSelect (e) {
+    function areaSelect(e) {
         console.log(e.value, 'kan')
-        if (e.value == 9) {
+        // 清空之前的输入和选择
+        $("#searchIpt").val('').attr('data-id', '');
+        $("#selectActivity label").text("选择活动"); // 默认文本
+
+        if (e.value == 9 || e.value == 10) {
             count++;
             if (count % 2) {
-                console.log(count, 'dsa')
+                // 根据不同类型设置参数
+                let url, keyField, idField, searchTip;
+                if (e.value == 9) {
+                    url = '/goblin/marketing/zhengzai/list/get?pageSize=10&pageNum=1&orderByColumn=createdAt&isAsc=desc&status=-1&purchaseName=';
+                    keyField = 'name';
+                    idField = 'selfMarketId';
+                    searchTip = '请输入活动名称';
+                    $("#selectActivity label").text("选择活动");
+                } else if (e.value == 10) {
+                    url = '/kylin/performances/search?title='; // 演出搜索接口
+                    keyField = 'title';
+                    idField = 'performanceId';
+                    searchTip = '请输入演出名称';
+                    $("#selectActivity label").text("选择演出");
+                }
+
                 $("#selectActivity").show();
+                // 销毁旧的实例并重新初始化
+                $("#searchIpt").bsSuggest('destroy').attr('placeholder', searchTip);
+
                 $("#searchIpt").bsSuggest({
-                    idField: 'selfMarketId',                 // data.value 的第几个数据，作为input输入框的内容
-                    keyField: 'name',                // data.value 的第几个数据，作为input输入框的内容
-                    allowNoKeyword: false, //是否允许无关键字时请求数据
-                    showBtn:false,
-                    multiWord: true, //以分隔符号分割的多关键字支持
+                    idField: idField,
+                    keyField: keyField,
+                    allowNoKeyword: false,
+                    showBtn: false,
+                    multiWord: true,
                     hideOnSelect: true,
-                    getDataMethod: "url", //获取数据的方式，总是从 URL 获取
-                    effectiveFields: ['name'],
-                    url: '/goblin/marketing/zhengzai/list/get?pageSize=10&pageNum=1&orderByColumn=createdAt&isAsc=desc&status=-1&purchaseName=',
-                    /*如果从 url 获取数据，并且需要跨域，则该参数必须设置*/
-                    processData: function (json) { // url 获取数据时，对数据的处理，作为 getData 的回调函数
-                        //字符串转化为 js 对象
-                        console.log(json, 'json')
-                        let data = {};
-                        data.value = json.data
-                        return data
+                    getDataMethod: "url",
+                    effectiveFields: [keyField],
+                    url: url,
+                    processData: function(json) {
+                        // 统一处理接口返回数据
+                        let data = { value: json.data || [] };
+                        if (e.value == 10) {
+                            // 假设演出接口返回格式为 { data: [{id:1, title:"演出名称"},...] }
+                            data.value = json.data.map(item => ({
+                                [idField]: item.performancesId,
+                                [keyField]: item.title
+                            }));
+                        }
+                        return data;
                     }
-                }).on('onDataRequestSuccess', function (e, result) {
-                }).on('onSetSelectValue', function (e, selectedData,selectedRawData ) { // 当前行的所有值都能拿到
-                    
-                }).on('onUnsetSelectValue', function (e) {
-                });;
+                }).on('onSetSelectValue', function(e, selectedData, selectedRawData) {
+                    // 选中时存储ID
+                    const id = selectedRawData[idField];
+                    $(this).attr('data-id', id);
+                }).on('onUnsetSelectValue', function() {
+                    // 取消选择时清空ID
+                    $(this).attr('data-id', '');
+                });
             } else {
                 $("#selectActivity").hide();
+                $("#searchIpt").val('').attr('data-id', '');
             }
+        } else {
+            $("#selectActivity").hide();
+            $("#searchIpt").val('').attr('data-id', '');
         }
     }
     function submitHandler() {
@@ -202,6 +235,11 @@
             layer.msg("请选择展示位置");
             return false;
         }
+        // 新增校验：如果选择了位置10，必须选择演出
+        if (positionList.split(',').includes('10') && !$('#searchIpt').attr('data-id')) {
+            layer.msg('请选择演出！');
+            return false;
+        }
         var targetType = $('#targetType').select2('val');
         if (!targetType) {
             layer.msg("请选择跳转方式");
@@ -212,6 +250,13 @@
             if (positionList.split(',').includes('9')) {
                 data.push({"name": "marketId", "value": $('#searchIpt').attr('data-id')});
             }
+            // 添加演出ID到提交数据
+            if (positionList.split(',').includes('10')) {
+                data.push({
+                    "name": "performanceId",
+                    "value": $('#searchIpt').attr('data-id')
+                });
+            }
             var targetObj = '';
             var targetObjName = '';
             if (12 == targetType || 100 == targetType) { // 请填写url

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/banners/update.html

@@ -187,26 +187,92 @@
     var bannersId = "[[${KylinBannersVo.bannersId}]]";
     var marketName = "[[${KylinBannersVo.marketName}]]";
     var marketId = "[[${KylinBannersVo.marketId}]]";
+    var performanceId = "[[${KylinBannersVo.performanceId}]]";
     let count = 0;
     console.log(marketId, marketName)
-    function areaSelect (e) {
+    function areaSelect(e) {
         console.log(e.value, 'kan')
-        if (e.value == 9) {
+        // 清空之前的输入和选择
+        $("#searchIpt").val('').attr('data-id', '');
+        $("#selectActivity label").text("选择活动"); // 默认文本
+
+        if (e.value == 9 || e.value == 10) {
             count++;
             if (count % 2) {
-                console.log(count, 'dsa')
+                // 根据不同类型设置参数
+                let url, keyField, idField, searchTip;
+                if (e.value == 9) {
+                    url = '/goblin/marketing/zhengzai/list/get?pageSize=10&pageNum=1&orderByColumn=createdAt&isAsc=desc&status=-1&purchaseName=';
+                    keyField = 'name';
+                    idField = 'selfMarketId';
+                    searchTip = '请输入活动名称';
+                    $("#selectActivity label").text("选择活动");
+                } else if (e.value == 10) {
+                    url = '/kylin/performances/search?title='; // 演出搜索接口
+                    keyField = 'title';
+                    idField = 'performanceId';
+                    searchTip = '请输入演出名称';
+                    $("#selectActivity label").text("选择演出");
+                }
+
                 $("#selectActivity").show();
-                commomSe()
+                // 销毁旧的实例并重新初始化
+                $("#searchIpt").bsSuggest('destroy').attr('placeholder', searchTip);
+
+                $("#searchIpt").bsSuggest({
+                    idField: idField,
+                    keyField: keyField,
+                    allowNoKeyword: false,
+                    showBtn: false,
+                    multiWord: true,
+                    hideOnSelect: true,
+                    getDataMethod: "url",
+                    effectiveFields: [keyField],
+                    url: url,
+                    processData: function(json) {
+                        // 统一处理接口返回数据
+                        let data = { value: json.data || [] };
+                        if (e.value == 10) {
+                            // 假设演出接口返回格式为 { data: [{id:1, title:"演出名称"},...] }
+                            data.value = json.data.map(item => ({
+                                [idField]: item.performancesId,
+                                [keyField]: item.title
+                            }));
+                        }
+                        return data;
+                    }
+                }).on('onSetSelectValue', function(e, selectedData, selectedRawData) {
+                    // 选中时存储ID
+                    const id = selectedRawData[idField];
+                    $(this).attr('data-id', id);
+                }).on('onUnsetSelectValue', function() {
+                    // 取消选择时清空ID
+                    $(this).attr('data-id', '');
+                });
             } else {
                 $("#selectActivity").hide();
+                $("#searchIpt").val('').attr('data-id', '');
             }
+        } else {
+            $("#selectActivity").hide();
+            $("#searchIpt").val('').attr('data-id', '');
         }
     }
-    if (marketId) {
+    if (marketId || performanceId) {
         count++;
         $("#selectActivity").show()
-        commomSe()
-        $("#searchIpt").attr('data-id', marketId)
+
+        // 根据存储的位置类型初始化不同的搜索框
+        const positionList = "[[${KylinBannersVo.positionList}]]";
+        if (positionList && positionList.includes('10')) {
+            performanceCommomSe();
+            // 设置演出数据回显
+            $("#searchIpt").val("[[${KylinBannersVo.performanceName}]]") // 新增演出名称字段
+                .attr('data-id', "[[${KylinBannersVo.performanceId}]]"); // 新增演出ID字段
+        }else {
+            commomSe();
+            $("#searchIpt").attr('data-id', marketId);
+        }
     }
     function commomSe () {
         $("#searchIpt").bsSuggest({
@@ -233,6 +299,34 @@
         }).on('onUnsetSelectValue', function (e) {
         });;
     }
+    // 搜索演出接口
+    function performanceCommomSe() {
+        // 初始化演出搜索框
+        $("#searchIpt").bsSuggest({
+            idField: 'performanceId', // 演出ID字段
+            keyField: 'title',        // 演出名称字段
+            allowNoKeyword: false,
+            showBtn: false,
+            multiWord: true,
+            hideOnSelect: true,
+            getDataMethod: "url",
+            effectiveFields: ['title'],
+            url: '/kylin/performances/search?title=', // 演出搜索接口
+            processData: function(json) {
+                let data = {};
+                // 转换数据结构为bsSuggest需要的格式
+                data.value = json.data.map(item => ({
+                    performanceId: item.performancesId,
+                    title: item.title
+                }));
+                return data;
+            }
+        }).on('onSetSelectValue', function(e, selectedData, selectedRawData) {
+            $(this).attr('data-id', selectedRawData.performanceId);
+        }).on('onUnsetSelectValue', function() {
+            $(this).attr('data-id', '');
+        });
+    }
     function submitHandler() {
         var bannersName = $('#bannersName').val();
         if (!bannersName) {
@@ -245,6 +339,11 @@
             layer.msg("请选择展示位置");
             return false;
         }
+        // 新增校验：如果选择了位置10，必须选择演出
+        if (positionList.split(',').includes('10') && !$('#searchIpt').attr('data-id')) {
+            layer.msg('请选择演出！');
+            return false;
+        }
         var targetType = $('#targetType').select2('val');
         if (!targetType) {
             layer.msg("请选择跳转方式");
@@ -254,6 +353,16 @@
             var data = $('#form-post-add').serializeArray();
             if (positionList.split(',').includes('9')) {
                 data.push({"name": "marketId", "value": $('#searchIpt').attr('data-id')});
+                data.push({"name": "performanceId", "value": ""})
+                data.push({"name": "performanceName", "value": ""})
+            }
+            // 添加演出ID到提交数据
+            if (positionList.split(',').includes('10')) {
+                data.push({
+                    "name": "performanceId",
+                    "value": $('#searchIpt').attr('data-id')
+                });
+                data.push({"name": "marketId", "value": ""})
             }
             var targetObj = '';
             var targetObjName = '';

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinBannersServiceImpl.java

 package com.liquidnet.client.admin.zhengzai.kylin.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -10,6 +11,7 @@ import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.commons.lang.util.BeanUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
+import com.liquidnet.commons.lang.util.StringUtil;
 import com.liquidnet.service.goblin.entity.GoblinSelfMarketing;
 import com.liquidnet.service.goblin.mapper.GoblinSelfMarketingMapper;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
@@ -19,8 +21,10 @@ import com.liquidnet.service.kylin.dto.param.BannersSearchParam;
 import com.liquidnet.service.kylin.dto.vo.KylinBannersVo;
 import com.liquidnet.service.kylin.entity.KylinBanners;
 import com.liquidnet.service.kylin.entity.KylinBannersRelations;
+import com.liquidnet.service.kylin.entity.KylinPerformances;
 import com.liquidnet.service.kylin.mapper.KylinBannersMapper;
 import com.liquidnet.service.kylin.mapper.KylinBannersRelationsMapper;
+import com.liquidnet.service.kylin.mapper.KylinPerformancesMapper;
 import com.liquidnet.service.kylin.service.admin.IKylinBannersService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -63,6 +67,9 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
     @Autowired
     private GoblinSelfMarketingMapper goblinSelfMarketingMapper;
 
+    @Autowired
+    private KylinPerformancesMapper kylinPerformancesMapper;
+
     public boolean create(BannersParam bannersParam) {
         try {
             // 时间
@@ -76,7 +83,15 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
                 bannersParam.setOnlineEndTime(null);
             }
             // 入数据库
-            bannersMapper.insert(bannersParam.getFields(bannersId, createdAtString));
+            KylinBanners kylinBanners = bannersParam.getFields(bannersId, createdAtString);
+            String performanceName = getPerformanceNameById(bannersParam.getPerformanceId());
+            if (StringUtil.isBlank(performanceName)) {
+                kylinBanners.setPerformanceId("");
+                kylinBanners.setPerformanceName("");
+            }else {
+                kylinBanners.setPerformanceName(performanceName);
+            }
+            bannersMapper.insert(kylinBanners);
 
             List<String> positionList = bannersParam.getPositionList();
             KylinBannersRelations kylinBannersRelations = new KylinBannersRelations();
@@ -109,6 +124,19 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
         }
     }
 
+    private String getPerformanceNameById(String performanceId) {
+        if (StringUtil.isBlank(performanceId)) {
+            return "";
+        }
+        List<KylinPerformances> kylinPerformances = kylinPerformancesMapper.selectList(new LambdaUpdateWrapper<KylinPerformances>()
+                .eq(KylinPerformances::getPerformancesId, performanceId));
+
+        if (kylinPerformances.isEmpty()) {
+            return "";
+        }
+        return kylinPerformances.get(0).getTitle();
+    }
+
     private void setBannerListRedis() {
         List<KylinBanners> bannerList = bannersMapper.selectList(
                 Wrappers.lambdaQuery(KylinBanners.class).eq(KylinBanners::getIsOnline, 1)
@@ -141,6 +169,14 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
 
             KylinBanners params = bannersParam.getFields(null, null);
             params.setUpdatedAt(updatedAtString);
+            String performanceName = getPerformanceNameById(bannersParam.getPerformanceId());
+            if (StringUtil.isBlank(performanceName)) {
+                params.setPerformanceId("");
+                params.setPerformanceName("");
+            }else {
+                params.setPerformanceName(performanceName);
+            }
+
             /*if (StringUtils.isEmpty(bannersParam.getOnlineStartTime())) {
                 params.setOnlineStartTime(null);
             }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java

@@ -25,10 +25,7 @@ import com.liquidnet.service.kylin.dto.vo.admin.*;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
-import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
-import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketPartnerVo;
-import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketTimesPartnerVo;
-import com.liquidnet.service.kylin.dto.vo.partner.TicketTimesTicketCreatePartnerVo;
+import com.liquidnet.service.kylin.dto.vo.partner.*;
 import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.*;
 import com.liquidnet.service.kylin.service.admin.IKylinPerformancesAdminService;
@@ -977,6 +974,20 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
         return performancesMapper.getSubscribeTicketStatisticalByPerformancesId(performancesId);
     }
 
+    @Override
+    public List<KylinPerformancesVo> searchPerformanceByTitle(String title) {
+        LambdaQueryWrapper<KylinPerformances> lambdaQueryWrapper = new QueryWrapper<KylinPerformances>()
+                .lambda()
+                .like(KylinPerformances::getTitle, title);
+        List<KylinPerformances> kylinPerformances = performancesMapper.selectList(lambdaQueryWrapper);
+        return kylinPerformances.stream().map(k -> {
+            KylinPerformancesVo vo = new KylinPerformancesVo();
+            vo.setPerformancesId(k.getPerformancesId());
+            vo.setTitle(k.getTitle());
+            return vo;
+        }).collect(Collectors.toList());
+    }
+
     //删除演出下所有订单缓存(订单详情，订单列表)
     public void delOrderTicketsRedis(KylinPerformanceMisVo vo) {
         //找到所有ticketId

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/BannerDetailsListDao.java

@@ -41,6 +41,16 @@ public class BannerDetailsListDao implements Serializable {
 
     private String updatedAt;
 
+    /**
+     * 演出ID
+     */
+    private String performanceId;
+
+    /**
+     * 演出名称
+     */
+    private String performanceName;
+
     public void setIsOnlineName(Integer isOnline){
         this.isOnline=isOnline;
         switch (isOnline){

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinBanners.java

@@ -110,6 +110,16 @@ public class KylinBanners implements Serializable, Cloneable {
      */
     private String updatedAt;
 
+    /**
+     * 演出ID
+     */
+    private String performanceId;
+
+    /**
+     * 演出名称
+     */
+    private String performanceName;
+
     private static final KylinBanners obj = new KylinBanners();
 
     public static KylinBanners getNew() {

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinBannersController.java

@@ -39,14 +39,16 @@ public class KylinBannersController {
             @ApiImplicitParam(type = "query", dataType = "String", name = "position", value = "展示位置 1首页 3周边 5积分商城 6YB 8视频 10福袋", required = true),
             @ApiImplicitParam(type = "query", dataType = "String", name = "provinceName", value = "城市名称"),
             @ApiImplicitParam(type = "query", dataType = "String", name = "marketId", value = "活动id"),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "performanceId", value = "演出id"),
     })
     public ResponseDto<List<KylinBanners>> blist(
             @RequestParam() String position,
             @RequestParam(value = "marketId", required = false) String marketId,
-            @RequestParam(defaultValue = "") String provinceName
+            @RequestParam(defaultValue = "") String provinceName,
+            @RequestParam(value = "performanceId", required = false) String performanceId
     ) {
         try {
-            List<KylinBanners> result = bannersServiceImpl.blist(position, provinceName, marketId);
+            List<KylinBanners> result = bannersServiceImpl.blist(position, provinceName, marketId, performanceId);
             return ResponseDto.success(result);
         } catch (Exception e) {
             log.error("banner列表Error", e);

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/BannersServiceImpl.java

@@ -3,8 +3,8 @@ package com.liquidnet.service.kylin.service.impl;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.commons.lang.util.StringUtil;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
-import com.liquidnet.service.kylin.dto.vo.KylinBannersVo;
 import com.liquidnet.service.kylin.entity.KylinBanners;
 import com.liquidnet.service.kylin.service.admin.IKylinBannersService;
 import com.liquidnet.service.kylin.utils.ObjectUtil;
@@ -36,7 +36,7 @@ public class BannersServiceImpl implements IKylinBannersService {
     @Autowired
     RedisUtil redisUtil;
 
-    public List<KylinBanners> blist(String position, String provinceName, String marketId) {
+    public List<KylinBanners> blist(String position, String provinceName, String marketId, String performanceId) {
         String nowTime = DateUtil.getNowTime();
         Object ListObj = redisUtil.get(KylinRedisConst.ADMIN_BANNER_LIST);
         List<KylinBanners> list = ObjectUtil.getKylinBannerListArrayList();
@@ -61,6 +61,14 @@ public class BannersServiceImpl implements IKylinBannersService {
                         }
                     }
 
+                    // 查询指定演出
+                    if (StringUtil.isNotBlank(performanceId)) {
+                        if (!performanceId.equals(bannerInfo.getPerformanceId())) {
+                            itBannerList.remove();
+                            continue;
+                        }
+                    }
+
                     // list
                     List<String> pList = bannerInfo.getPositionList();
                     Boolean pis = false;