Merge branch 're_tickets'

# Conflicts:
#	netflix-dao/src/main/java/com/cyksj/mapper/GroupsRelationMapper.java
#	netflix-dao/src/main/java/com/cyksj/model/views/UserTicketView.java
#	netflix-dao/src/main/resources/mapper/GroupRelationMapper.xml

netflix-dao/src/main/java/com/cyksj/model/views/TicketAdvertiseConfigFrontView.java

@@ -3,7 +3,6 @@ package com.cyksj.model.views;
 import com.ejlchina.searcher.bean.DbField;
 import com.ejlchina.searcher.bean.SearchBean;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -22,7 +21,6 @@ public class TicketAdvertiseConfigFrontView {
 	private Long configId;
 
 	@DbField("tc.goods_id")
-	@JsonIgnore
 	private Long goodsId;
 
 	@DbField("tc.title")
@@ -36,4 +34,8 @@ public class TicketAdvertiseConfigFrontView {
 
 	@DbField("tc.pic")
 	private String pic;
+
+	@DbField("tc.sorted")
+	@JsonIgnore
+	private Integer sorted;
 }

netflix-web/src/main/java/com/cyksj/web/controller/group/GroupRelationController.java

@@ -530,14 +530,20 @@ public class GroupRelationController {
     /**
      * 对应平台车票 广告配置列表
      */
-    @GetMapping("/get/advertise/{goodsId}")
-    public Result<List<TicketAdvertiseConfigFrontView>> getTicketAdvertiseConfig(@PathVariable Long goodsId) {
+    @GetMapping("/get/advertise")
+    public Result<List<TicketAdvertiseConfigFrontView>> getTicketAdvertiseConfig() {
         long userId = StpUserUtil.getLoginIdAsLong();
+        List<RenewalView> hasPayGoods = groupRelationFrontService.getHasPayGoods(userId);
+        if (CollUtil.isEmpty(hasPayGoods)) {
+            return GatewayResponse.SUCCESS.newBuilder().toResult();
+        }
+        List<Long> goodsIds = hasPayGoods.stream().map(RenewalView::getGoodsId).collect(Collectors.toList());
         log.info("userId:{}获取广告位配置", userId);
         List<TicketAdvertiseConfigFrontView> views = beanSearcher.searchAll(TicketAdvertiseConfigFrontView.class, MapUtils.flatBuilder(request.getParameterMap())
-                .field(TicketAdvertiseConfig::getGoodsId, goodsId)
-                .orderBy(TicketAdvertiseConfig::getSorted).desc()
-                .orderBy(TicketAdvertiseConfig::getId).desc()
+                .field(TicketAdvertiseConfigFrontView::getGoodsId, goodsIds).op(Operator.InList)
+                .orderBy(TicketAdvertiseConfigFrontView::getSorted).desc()
+                .orderBy(TicketAdvertiseConfigFrontView::getGoodsId).asc()
+                .orderBy(TicketAdvertiseConfigFrontView::getConfigId).desc()
                 .build());
         return GatewayResponse.SUCCESS.newBuilder().toResult(views);
     }