Commit 1a29ae07 authored by 刘基明's avatar 刘基明

产品接口修改

parent 0413dd68
...@@ -2,14 +2,14 @@ package com.tanpu.community.api.beans.vo.feign; ...@@ -2,14 +2,14 @@ package com.tanpu.community.api.beans.vo.feign;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Builder; import lombok.*;
import lombok.Data;
import lombok.ToString;
@ApiModel("直播列表返回结果集合") @ApiModel("直播列表返回结果集合")
@Data @Data
@Builder @Builder
@ToString @ToString
@NoArgsConstructor
@AllArgsConstructor
public class ZhiboListResp { public class ZhiboListResp {
@ApiModelProperty(value = "直播间ID") @ApiModelProperty(value = "直播间ID")
private String id; private String id;
......
...@@ -21,21 +21,21 @@ public class FeignbackForZhibo implements FallbackFactory<FeignClientForZhibo> { ...@@ -21,21 +21,21 @@ public class FeignbackForZhibo implements FallbackFactory<FeignClientForZhibo> {
public CommonResp queryZhiboDetail(String roomId) { public CommonResp queryZhiboDetail(String roomId) {
log.error("请求信息", throwable); log.error("请求信息", throwable);
log.error("FeignClientForZhiboTheme.queryZhiboDetail探普学堂-查询直播id:{}", roomId); log.error("FeignClientForZhiboTheme.queryZhiboDetail探普学堂-查询直播id:{}", roomId);
return null; return CommonResp.error();
} }
@Override @Override
public CommonResp<List<ZhiboDetailVO>> getZhiBoByIds(List<String> ids) { public CommonResp<List<ZhiboDetailVO>> getZhiBoByIds(List<String> ids) {
log.error("请求信息", throwable); log.error("请求信息", throwable);
log.error("FeignClientForZhiboTheme.queryZhiboDetail探普学堂-查询直播ids:{}", ids); log.error("FeignClientForZhiboTheme.queryZhiboDetail探普学堂-查询直播ids:{}", ids);
return null; return CommonResp.error();
} }
@Override @Override
public CommonResp<List<ZhiboListResp>> simpleList(List<String> idList) { public CommonResp<List<ZhiboListResp>> simpleList(List<String> idList) {
log.error("请求信息", throwable); log.error("请求信息", throwable);
log.error("FeignClientForZhiboTheme.simpleList探普学堂-查询直播ids:{}", idList); log.error("FeignClientForZhiboTheme.simpleList探普学堂-查询直播ids:{}", idList);
return null; return CommonResp.error();
} }
......
...@@ -112,7 +112,7 @@ public class ProductService { ...@@ -112,7 +112,7 @@ public class ProductService {
if (themeQos != null) { if (themeQos != null) {
themeQos.stream().forEach(o -> o.getContent().stream().forEach(c -> { themeQos.stream().forEach(o -> o.getContent().stream().forEach(c -> {
if (c.getType().equals(RelTypeEnum.LIVE.type)) { if (c.getType().equals(RelTypeEnum.LIVE.type)) {
zhiboIds.add(c.getRemark()); zhiboIds.add(c.getValue());
} else if (c.getType().equals(RelTypeEnum.SHORT_VIDEO.type)) { } else if (c.getType().equals(RelTypeEnum.SHORT_VIDEO.type)) {
shortVideoIds.add(c.getValue()); shortVideoIds.add(c.getValue());
} else if (c.getType().equals(RelTypeEnum.FUND.type)) { } else if (c.getType().equals(RelTypeEnum.FUND.type)) {
...@@ -289,7 +289,7 @@ public class ProductService { ...@@ -289,7 +289,7 @@ public class ProductService {
for (ThemeContentQo themeContent : themeQo.getContent()) { for (ThemeContentQo themeContent : themeQo.getContent()) {
if (themeContent.getType().equals(RelTypeEnum.LIVE.type)) { if (themeContent.getType().equals(RelTypeEnum.LIVE.type)) {
if (zhiboMap.containsKey(themeContent.getValue())) { if (zhiboMap.containsKey(themeContent.getValue())) {
ZhiboListResp zhibo = zhiboMap.get(themeContent.getRemark()); ZhiboListResp zhibo = zhiboMap.get(themeContent.getValue());
themeContent.setDetail(AttachmentDetailVo.builder().zhibo(zhibo).build()); themeContent.setDetail(AttachmentDetailVo.builder().zhibo(zhibo).build());
} }
} else if (themeContent.getType().equals(RelTypeEnum.SHORT_VIDEO.type)) { } else if (themeContent.getType().equals(RelTypeEnum.SHORT_VIDEO.type)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment