热门游

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/entity/TourTag.java

@@ -104,4 +104,7 @@ public class TourTag implements Serializable {
     @Column(name = "is_del")
 	@ApiModelProperty(value = "是否删除:0-正常；1-删除")
     private Integer isDel;
+
+	@Transient
+	private List<TourGood> list;
 }

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourTagBiz.java

@@ -7,6 +7,8 @@ import com.xxfc.platform.tour.comstnt.RedisKey;
 import com.xxfc.platform.tour.dto.TourTagAndBannerDTO;
 import com.xxfc.platform.tour.dto.TourTagBannerDTO;
 import com.xxfc.platform.tour.dto.TourTagDTO;
+import com.xxfc.platform.tour.entity.TourGood;
+import com.xxfc.platform.tour.mapper.TourGoodMapper;
 import com.xxfc.platform.tour.mapper.TourTagMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
@@ -19,10 +21,7 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.Instant;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -40,6 +39,9 @@ public class TourTagBiz extends BaseBiz<TourTagMapper,TourTag> {
      @Autowired
      private TourTagBannerBiz tourTagBannerBiz;
 
+    @Autowired
+    private TourGoodMapper tourGoodMapper;
+
 //    @Cache(key = RedisKey.CONSTANT_CODE_PREFIX_HOTTAG)
     public List<TourTag> getHotTag() {
 
@@ -49,6 +51,22 @@ public class TourTagBiz extends BaseBiz<TourTagMapper,TourTag> {
         return mapper.findHotListTag(tag);
     }
 
+    public List<TourTag> getHotTagAndGoods() {
+        TourTag tag = new TourTag();
+        tag.setIsDel(0);
+        tag.setIsHot(1);
+        List<TourTag>list = mapper.findHotListTag(tag);
+        Map<String,Object>map = new HashMap<String,Object>();
+        //增加两条线路例子
+        for(TourTag tourTag :list){
+            map.put("tagId",tourTag.getId());
+            PageDataVO<TourGood> dataVO = PageDataVO.pageInfo(1, 2, () -> tourGoodMapper.getGoodList(map));
+            List<TourGood> pageDataVO = dataVO.getData();
+            tourTag.setList(pageDataVO);
+        }
+        return list;
+    }
+
     public List<TourTag> getTagList(Integer isHot) {
         TourTag tag = new TourTag();
         tag.setIsDel(0);

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourTagController.java

@@ -45,6 +45,29 @@ public class TourTagController extends BaseController<TourTagBiz,TourTag> {
 
     }
 
+    /**
+     * 标签带两条线路
+     * @param dto
+     * @return
+     */
+    @GetMapping("/app/unauth/getTagListAndGoods")
+    public ObjectRestResponse getTagListAndGoods(pageDTO dto){
+
+        if (dto==null) {
+            return ObjectRestResponse.createDefaultFail();
+        }
+
+        Integer hot = dto.getHot();
+
+        if (hot==1){
+            List<TourTag> hotTag = tagBiz.getHotTagAndGoods();
+            return ObjectRestResponse.succ(hotTag);
+        }
+
+        PageDataVO<TourTag> all = tagBiz.findPage(BeanUtil.beanToMap(dto));
+        return ObjectRestResponse.succ(all);
+
+    }
 
     @Override
     @ApiOperation("修改")