线下活动 对象

community-api/src/main/java/com/tanpu/community/api/beans/qo/AttachmentDetailVo.java

 package com.tanpu.community.api.beans.qo;
 
-import com.tanpu.community.api.beans.vo.feign.activity.OfflineActivitySimpleResp;
-import com.tanpu.community.api.beans.vo.feign.product.FundInfoBaseResp;
+import com.tanpu.community.api.beans.vo.feign.activity.OfflineActivityListResp;
+import com.tanpu.community.api.beans.vo.feign.course.CourseSimpleResp;
 import com.tanpu.community.api.beans.vo.feign.course.ShortVideoBaseInfoResp;
+import com.tanpu.community.api.beans.vo.feign.product.FundInfoBaseResp;
 import com.tanpu.community.api.beans.vo.feign.zhibo.ZhiboListResp;
-import com.tanpu.community.api.beans.vo.feign.course.CourseSimpleResp;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -30,7 +30,7 @@ public class AttachmentDetailVo {
     @ApiModelProperty("新版课程")
     private CourseSimpleResp course;
     @ApiModelProperty("线下活动")
-    private OfflineActivitySimpleResp activity;
+    private OfflineActivityListResp activity;
 
 
 

community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/activity/GroupBuyConfig.java

+package com.tanpu.community.api.beans.vo.feign.activity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @description: 拼团配置
+ * @author: zejia zj wu
+ * @create: 2021-06-21 15:43
+ **/
+@ApiModel(value = "拼团配置")
+@Data
+public class GroupBuyConfig implements Serializable {
+    /**
+     * 唯一主键
+     */
+    @ApiModelProperty(value = "唯一主键")
+    private Integer id;
+
+    /**
+     * 拼团配置id
+     */
+    @ApiModelProperty(value = "拼团配置id")
+    private String groupBuyConfigId;
+
+    /**
+     * 资源id
+     */
+    @ApiModelProperty(value = "资源id")
+    private String resId;
+
+    /**
+     * 资源类型 300新版课程包
+     */
+    @ApiModelProperty(value = "资源类型 300新版课程包")
+    private Integer resType;
+
+    /**
+     * 拼团价
+     */
+    @ApiModelProperty(value = "拼团价")
+    private Integer groupBuyPrice;
+
+    /**
+     * 活动开始时间
+     */
+    @ApiModelProperty(value = "活动开始时间")
+    private Long timeStart;
+
+    /**
+     * 活动结束时间
+     */
+    @ApiModelProperty(value = "活动结束时间")
+    private Long timeEnd;
+
+    /**
+     * 拼团时限 单位小时
+     */
+    @ApiModelProperty(value = "拼团时限 单位小时")
+    private Long timeLimit;
+
+    /**
+     * 拼团规定人数
+     */
+    @ApiModelProperty(value = "拼团规定人数")
+    private Integer peopleNumber;
+
+    /**
+     * 是否开启 在线拼团 0不开启 1开启
+     */
+    @ApiModelProperty(value = "是否开启 在线拼团 0不开启 1开启")
+    private Integer isShow;
+
+    /**
+     * 拼团规则总述
+     */
+    @ApiModelProperty(value = "拼团规则总述")
+    private String ruleMain;
+
+    /**
+     * 拼团规则详细
+     */
+    @ApiModelProperty(value = "拼团规则详细")
+    private String ruleDetail;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    private Long createTime;
+
+    /**
+     * 修改时间
+     */
+    @ApiModelProperty(value = "修改时间")
+    private Long updateTime;
+
+    /**
+     * 删除标识
+     */
+    @ApiModelProperty(value = "删除标识")
+    private Integer deleteTag;
+
+    @ApiModelProperty(value = "拼团标识 1未参与 2拼团进行中 3拼团成功 4拼团失败")
+    private Integer groupBuyStatus;
+
+    private static final long serialVersionUID = 1L;
+}

community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/activity/OfflineActivityDetailResp.java

+package com.tanpu.community.api.beans.vo.feign.activity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Description 线下
+ * @Author wangyalei
+ * @Date 2021/9/5 下午9:37
+ **/
+@ApiModel
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class OfflineActivityDetailResp {
+
+    /**
+     * 活动Id
+     */
+    @ApiModelProperty(value = "活动Id")
+    private String activityId;
+
+    /**
+     * 活动类型 1线下活动 2招募活动
+     */
+    @ApiModelProperty(value = "活动类型 1线下活动 2招募活动")
+    private Integer activityType;
+
+    /**
+     * 活动标题
+     */
+    @ApiModelProperty(value = "活动标题")
+    private String activityTitle;
+
+    /**
+     * 活动封面图
+     */
+    @ApiModelProperty(value = "活动封面图")
+    private String activityCoverUrl;
+
+    /**
+     * 活动介绍长图
+     */
+    @ApiModelProperty(value = "活动介绍长图")
+    private String activityDescriptionUrl;
+
+    /**
+     * 活动开始时间
+     */
+    @ApiModelProperty(value = "活动开始时间")
+    private Long activityStartTime;
+
+    /**
+     * 活动结束时间
+     */
+    @ApiModelProperty(value = "活动结束时间")
+    private Long activityEndTime;
+
+    /**
+     * 活动结束时间
+     */
+    @ApiModelProperty(value = "活动状态 1未开始 2报名中 3报名结束")
+    private Integer activityState;
+
+    /**
+     * 活动结束时间
+     */
+    @ApiModelProperty(value = "活动状态文案 未开始 报名中 报名结束")
+    private String activityStateName;
+
+    /**
+     * 活动地点
+     */
+    @ApiModelProperty(value = "活动地点")
+    private String activityLocation;
+
+    @ApiModelProperty(value = "主办方")
+    private OfflineActivitySponsorResp sponsor;
+
+    @ApiModelProperty("参与权限")
+    private ResExtResp resExtResp;
+
+    @ApiModelProperty("购买信息")
+    private Price price;
+
+
+    @ApiModel
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @Builder
+    public static class OfflineActivitySponsorResp {
+        /**
+         * 主办方id
+         */
+        @ApiModelProperty(value = "主办方id")
+        private String sponsorId;
+
+        /**
+         * 主办方名称
+         */
+        @ApiModelProperty(value = "主办方名称")
+        private String sponsorName;
+
+        /**
+         * 主办方头像
+         */
+        @ApiModelProperty(value = "主办方头像")
+        private String sponsorHeadImg;
+
+        /**
+         * 主办方简介
+         */
+        @ApiModelProperty(value = "主办方简介")
+        private String sponsorDescription;
+
+        /**
+         * 手机号
+         */
+        @ApiModelProperty(value = "手机号")
+        private String sponsorTelphone;
+
+        /**
+         * 微信号
+         */
+        @ApiModelProperty(value = "微信号")
+        private String sponsorWechat;
+
+        /**
+         * 关联的机构id
+         */
+        @ApiModelProperty(value = "关联的机构id")
+        private String corpId;
+
+        /**
+         * 举办活动的数量
+         */
+        @ApiModelProperty(value = "举办活动的数量")
+        private Integer activityNum;
+
+    }
+}

community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/activity/OfflineActivityListResp.java

+package com.tanpu.community.api.beans.vo.feign.activity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @Description 线下活动
+ * @Author wangyalei
+ * @Date 2021/9/5 下午9:24
+ **/
+@ApiModel
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class OfflineActivityListResp {
+
+    /**
+     * 活动Id
+     */
+    @ApiModelProperty(value = "活动Id")
+    private String activityId;
+
+    /**
+     * 活动类型 1线下活动 2招募活动
+     */
+    @ApiModelProperty(value = "活动类型 1线下活动 2招募活动")
+    private Integer activityType;
+
+    /**
+     * 活动标题
+     */
+    @ApiModelProperty(value = "活动标题")
+    private String activityTitle;
+
+    /**
+     * 活动封面图
+     */
+    @ApiModelProperty(value = "活动封面图")
+    private String activityCoverUrl;
+
+    /**
+     * 活动开始时间
+     */
+    @ApiModelProperty(value = "活动开始时间")
+    private Date activityStartTime;
+
+    /**
+     * 活动结束时间
+     */
+    @ApiModelProperty(value = "活动结束时间")
+    private Date activityEndTime;
+
+    /**
+     * 活动结束时间
+     */
+    @ApiModelProperty(value = "活动状态 1未开始 2报名中 3报名结束")
+    private Integer activityState;
+
+    /**
+     * 活动结束时间
+     */
+    @ApiModelProperty(value = "活动状态文案 未开始 报名中 报名结束")
+    private Integer activityStateName;
+
+    /**
+     * 活动地点
+     */
+    @ApiModelProperty(value = "活动地点")
+    private String activityLocation;
+
+    @ApiModelProperty(value = "主办方")
+    private OfflineActivityDetailResp.OfflineActivitySponsorResp sponsor;
+
+    @ApiModelProperty("参与权限")
+    private ResExtResp resExtResp;
+
+    @ApiModelProperty("购买信息")
+    private Price price;
+
+    @ApiModelProperty(value = "格式化开始-结束时间")
+    private String formatTime;
+}

community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/activity/Price.java

+package com.tanpu.community.api.beans.vo.feign.activity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
+@Data
+@SuperBuilder(toBuilder = true)
+@AllArgsConstructor
+@NoArgsConstructor
+public class Price {
+
+    @ApiModelProperty("资源id")
+    private String resId;
+
+    @ApiModelProperty("是不是白名单 0:不是 1:是白名单")
+    private Integer isWhite;
+
+    @ApiModelProperty("价格")
+    private String totalPrice;
+
+    @ApiModelProperty("积分")
+    private String totalScore;
+
+    @ApiModelProperty("付费模式 1：免费 2：积分  3：现金")
+    private Integer chargeMode;
+
+    @ApiModelProperty("划线价格")
+    private String discountPrice;
+
+    @ApiModelProperty("划线积分")
+    private String discountScore;
+
+    @ApiModelProperty("促销时间")
+    private Time3Type time3Type;
+
+    @ApiModelProperty("会员打折价")
+    private String memberDiscountPrice;
+
+    @ApiModelProperty("会员促销时间")
+    private Time3Type memberTime3Type;
+
+    @ApiModelProperty("报名信息 0:不需要 1:需要")
+    private Integer bmStatus;
+
+    @ApiModelProperty("报名信息 0:没有 1:已报名")
+    private Integer bmInfo;
+
+    @ApiModelProperty("审批状态 0：待审批 1：审批通过 2：审批失败")
+    private Integer spStatus;
+
+    @ApiModelProperty("action")
+    private String action;
+
+    @ApiModelProperty("报名信息")
+    private ResBmInfoResp resBmInfoResp;
+
+    /*@ApiModelProperty("会员身分")
+    private Integer memberLevel;
+
+    @ApiModelProperty("1:不上浮包含 2:上浮包含等级")
+    private Integer rose;*/
+
+    @ApiModelProperty("最终价格")
+    private String finalPrice;
+
+    @ApiModelProperty("最终积分")
+    private String finalScore;
+
+    @ApiModelProperty("最终身份")
+    private Integer finalLevel;
+
+    @ApiModelProperty("最终付费模式 1：免费 2：积分  3：现金")
+    private Integer finalChargeMode;
+
+    @ApiModelProperty("需不需要支付 2:不需要 1:需要")
+    private Integer isNeedBuy;
+
+    @ApiModelProperty("有没有支付 2:已购买 1:未购买")
+    private Integer isBuy;
+
+    @ApiModelProperty("是否正在参与拼团活动 0不参加 1参加")
+    private Integer isJoinGroupBuy = 0;
+
+    @ApiModelProperty("拼团活动配置信息")
+    private GroupBuyConfig groupBuyConfig;
+}

community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/activity/ResBmInfoResp.java

+package com.tanpu.community.api.beans.vo.feign.activity;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
+@Data
+@ApiModel("报名信息")
+public class ResBmInfoResp {
+    private String id;
+
+    private String resId;
+
+    private Integer resType;
+
+    private String operUser;
+
+    private String bmRemark;
+
+    private String wechat;
+
+    private String wechatQrCode;
+
+    private String title;
+
+    private String bmRemind;
+
+    private String bmNotice;
+
+    private String templateId;
+
+    private Date createTime;
+
+    private String createBy;
+
+    private Date updateTime;
+
+    private String updateBy;
+
+    private Integer deleteTag;
+}

community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/activity/ResExtResp.java

+package com.tanpu.community.api.beans.vo.feign.activity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class ResExtResp {
+
+    private String id;
+
+    private String resId;
+
+    private Integer resType;
+
+    private Integer buy;
+
+    private Integer buyModel;
+
+    @ApiModelProperty("报名信息 0:不需要 1:需要")
+    private Integer bmStatus;
+
+    @ApiModelProperty("展示权限")
+    private Integer showAuth;
+
+    @ApiModelProperty("参与权限")
+    private Integer partakeAuth;
+
+    @ApiModelProperty("能不能参与 0:不能 1:可以")
+    private Integer partakeAuthStatus;
+
+    @ApiModelProperty("该去做什么 tamp理顾问卷 D2 tamp专家理顾问卷  D3 发生基金交易 （系统自动判断） T0 (提示文案: 该功能只对完成交易的探普理财师开放)")
+    private String partakeAuthSkip;
+
+    @ApiModelProperty("提示文案")
+    private String authMsg;
+
+    @ApiModelProperty("有没有做过合投 0:没有 1:有")
+    private Integer qfiiAuthStatus;
+
+    @ApiModelProperty("是否需要合格投资者认值 0:不需要 1:需要")
+    private Integer qfiiAuth;
+
+    @ApiModelProperty(value = "用户等级", example = "20")
+    private int levelGrade;
+
+    @ApiModelProperty(value = "用户等级对应的名称", example = "20")
+    private String levelLabel;
+}

community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/activity/Time3Type.java

+package com.tanpu.community.api.beans.vo.feign.activity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
+@ApiModel("时间对象")
+@Data
+public class Time3Type {
+
+    @ApiModelProperty("开始时间")
+    private Long begin;
+
+    @ApiModelProperty("结束时间")
+    private Long end;
+}

community-api/src/main/java/com/tanpu/community/api/beans/vo/feign/fatools/UserInfoResp.java

 package com.tanpu.community.api.beans.vo.feign.fatools;
 
-import com.tanpu.community.api.beans.vo.feign.activity.OfflineActivitySimpleResp;
+import com.tanpu.community.api.beans.vo.feign.activity.OfflineActivityListResp;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -42,9 +42,9 @@ public class UserInfoResp {
     @ApiModelProperty("团队成员")
     private List<UserInfoOrg> userInfoOrgList;
     @ApiModelProperty("主办活动")
-    private List<OfflineActivitySimpleResp> holdActivities;
+    private List<OfflineActivityListResp> holdActivities;
     @ApiModelProperty("团队招募")
-    private List<OfflineActivitySimpleResp> teamRecruitment;
+    private List<OfflineActivityListResp> teamRecruitment;
 
     //↓↓↓↓ 通用 ↓↓↓↓
     @ApiModelProperty("用户id")

community-service/src/main/java/com/tanpu/community/feign/activity/FeignBackClientForActivity.java

 package com.tanpu.community.feign.activity;
 
 import com.tanpu.common.api.CommonResp;
-import com.tanpu.community.api.beans.vo.feign.activity.OfflineActivitySimpleResp;
+import com.tanpu.community.api.beans.vo.feign.activity.OfflineActivityListResp;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -16,14 +16,14 @@ public class FeignBackClientForActivity implements FallbackFactory<FeignClientFo
     public FeignClientForActivity create(Throwable throwable) {
         return new FeignClientForActivity() {
             @Override
-            public CommonResp<List<OfflineActivitySimpleResp>> simpleListByIds(List<String> activityIds) {
+            public CommonResp<List<OfflineActivityListResp>> simpleListByIds(List<String> activityIds) {
                 log.error("请求信息", throwable);
                 log.error("FeignClientForActivity.offlineActivityDetail-查询活动ids:{}", activityIds);
                 return CommonResp.error();
             }
 
             @Override
-            public CommonResp<List<OfflineActivitySimpleResp>> simpleListByOrgid(String orgId) {
+            public CommonResp<List<OfflineActivityListResp>> simpleListByOrgid(String orgId) {
                 log.error("请求信息", throwable);
                 log.error("FeignClientForActivity.offlineActivityDetail-查询活动orgId:{}", orgId);
                 return CommonResp.error();

community-service/src/main/java/com/tanpu/community/feign/activity/FeignClientForActivity.java

 package com.tanpu.community.feign.activity;
 
 import com.tanpu.common.api.CommonResp;
-import com.tanpu.community.api.beans.vo.feign.activity.OfflineActivitySimpleResp;
+import com.tanpu.community.api.beans.vo.feign.activity.OfflineActivityListResp;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -17,10 +17,10 @@ public interface FeignClientForActivity {
 
     @ApiOperation("线下活动列表-通过ids查询")
     @GetMapping(value = "/offlineActivity/inter/listByIds")
-    CommonResp<List<OfflineActivitySimpleResp>> simpleListByIds(@ApiParam("活动ids") @RequestParam(value = "activityIds") List<String> activityIds);
+    CommonResp<List<OfflineActivityListResp>> simpleListByIds(@ApiParam("活动ids") @RequestParam(value = "activityIds") List<String> activityIds);
 
 
     @ApiOperation("线下活动列表-通过机构查询")
     @GetMapping(value = "/offlineActivity/inter/listByOrgId")
-    CommonResp<List<OfflineActivitySimpleResp>> simpleListByOrgid(@ApiParam("活动id") @RequestParam(value = "orgId") String orgId);
+    CommonResp<List<OfflineActivityListResp>> simpleListByOrgid(@ApiParam("活动id") @RequestParam(value = "orgId") String orgId);
 }

community-service/src/main/java/com/tanpu/community/manager/HomePageManager.java

@@ -13,6 +13,7 @@ import com.tanpu.community.api.beans.req.homepage.QueryFollowReq;
 import com.tanpu.community.api.beans.req.page.Page;
 import com.tanpu.community.api.beans.req.page.Pageable;
 import com.tanpu.community.api.beans.resp.Customer;
+import com.tanpu.community.api.beans.vo.feign.activity.OfflineActivityListResp;
 import com.tanpu.community.api.beans.vo.feign.activity.OfflineActivitySimpleResp;
 import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNewChief;
 import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoOrg;
@@ -174,9 +175,9 @@ public class HomePageManager {
                 userInfoNew.setUserInfoOrgList(userInfoOrgs);
             }
             // 家办活动
-            CommonResp<List<OfflineActivitySimpleResp>> activitySimpleResps = feignClientForActivity.simpleListByOrgid(userId);
+            CommonResp<List<OfflineActivityListResp>> activitySimpleResps = feignClientForActivity.simpleListByOrgid(userId);
             if (usetInfoByOrgUserId.isSuccess() && CollectionUtils.isNotEmpty(usetInfoByOrgUserId.getData())) {
-                List<OfflineActivitySimpleResp> actities = activitySimpleResps.getData();
+                List<OfflineActivityListResp> actities = activitySimpleResps.getData();
                 userInfoNew.setHoldActivities(actities.stream().filter(o->o.getActivityType().equals(1)).collect(Collectors.toList()));
                 userInfoNew.setTeamRecruitment(actities.stream().filter(o->o.getActivityType().equals(2)).collect(Collectors.toList()));
             }

community-service/src/main/java/com/tanpu/community/service/BatchFeignCallService.java

@@ -12,7 +12,7 @@ import com.tanpu.community.api.beans.qo.AttachmentDetailVo;
 import com.tanpu.community.api.beans.qo.ThemeContentQo;
 import com.tanpu.community.api.beans.qo.ThemeQo;
 import com.tanpu.community.api.beans.vo.ImagesDTO;
-import com.tanpu.community.api.beans.vo.feign.activity.OfflineActivitySimpleResp;
+import com.tanpu.community.api.beans.vo.feign.activity.OfflineActivityListResp;
 import com.tanpu.community.api.beans.vo.feign.course.CourseSimpleResp;
 import com.tanpu.community.api.beans.vo.feign.course.ShortVideoBaseInfoResp;
 import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoResp;
@@ -36,7 +36,12 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -96,7 +101,7 @@ public class BatchFeignCallService {
         // 设置产品信息
         Map<String, FundInfoBaseResp> fundMap = Maps.newHashMap();
         // 设置活动信息
-        Map<String, OfflineActivitySimpleResp> activityMap = Maps.newHashMap();
+        Map<String, OfflineActivityListResp> activityMap = Maps.newHashMap();
         // 图片信息
         Map<String, FileRecordEntity> imgMap = Maps.newHashMap();
         // 话题标题
@@ -125,7 +130,7 @@ public class BatchFeignCallService {
                             Map<String, CourseSimpleResp> courseMap,
                             Map<String, ZhiboListResp> zhiboMap,
                             Map<String, FundInfoBaseResp> fundMap,
-                            Map<String, OfflineActivitySimpleResp> activityMap, Map<String, FileRecordEntity> imgMap,
+                            Map<String, OfflineActivityListResp> activityMap, Map<String, FileRecordEntity> imgMap,
                             Map<String, String> topicMap,
                             Map<String, UserInfoResp> userMap,
                             List<ThemeQo> themeQos
@@ -224,9 +229,9 @@ public class BatchFeignCallService {
             zhiboMap.putAll(list.stream().collect(Collectors.toMap(ZhiboListResp::getId, item -> item, (oldValue, newValue) -> oldValue)));
         }
         if (!CollectionUtils.isEmpty(zhiboIds)) {
-            // TODO 活动列表
-            List<OfflineActivitySimpleResp> list = feignService.getActivitySimpleList(setToList(activityIds));
-            activityMap.putAll(list.stream().collect(Collectors.toMap(OfflineActivitySimpleResp::getActivityId, item -> item, (oldValue, newValue) -> oldValue)));
+            //  活动列表
+            List<OfflineActivityListResp> list = feignService.getActivitySimpleList(setToList(activityIds));
+            activityMap.putAll(list.stream().collect(Collectors.toMap(OfflineActivityListResp::getActivityId, item -> item, (oldValue, newValue) -> oldValue)));
         }
         if (!CollectionUtils.isEmpty(imageIds)) {
             // 查询图片
@@ -369,7 +374,7 @@ public class BatchFeignCallService {
                             Map<String, CourseSimpleResp> courseMap,
                             Map<String, ZhiboListResp> zhiboMap,
                             Map<String, FundInfoBaseResp> fundMap,
-                            Map<String, OfflineActivitySimpleResp> activityMap, Map<String, FileRecordEntity> imgUrlMap,
+                            Map<String, OfflineActivityListResp> activityMap, Map<String, FileRecordEntity> imgUrlMap,
                             Map<String, UserInfoResp> userMap,
                             Map<String, String> topicMap) {
         for (ThemeQo themeQo : themeQos) {

community-service/src/main/java/com/tanpu/community/service/FeignService.java

@@ -2,10 +2,10 @@ package com.tanpu.community.service;
 
 import com.tanpu.common.api.CommonResp;
 import com.tanpu.common.exception.BizException;
-import com.tanpu.community.api.beans.vo.feign.activity.OfflineActivitySimpleResp;
+import com.tanpu.community.api.beans.vo.feign.activity.OfflineActivityListResp;
 import com.tanpu.community.api.beans.vo.feign.course.CourseSimpleResp;
-import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoResp;
 import com.tanpu.community.api.beans.vo.feign.course.ShortVideoBaseInfoResp;
+import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoResp;
 import com.tanpu.community.api.beans.vo.feign.product.ProductInfoVO;
 import com.tanpu.community.api.beans.vo.feign.zhibo.ZhiboListResp;
 import com.tanpu.community.cache.LocalCache;
@@ -102,10 +102,10 @@ public class FeignService {
                 });
     }
 
-    public List<OfflineActivitySimpleResp> getActivitySimpleList(List<String> activityIds) {
-        return batchExecute("getActivitySimpleList_", activityIds, OfflineActivitySimpleResp.class,
-                OfflineActivitySimpleResp::getActivityId, ids -> {
-                    CommonResp<List<OfflineActivitySimpleResp>> resp = feignClientForActivity.simpleListByIds(ids);
+    public List<OfflineActivityListResp> getActivitySimpleList(List<String> activityIds) {
+        return batchExecute("getActivitySimpleList_", activityIds, OfflineActivityListResp.class,
+                OfflineActivityListResp::getActivityId, ids -> {
+                    CommonResp<List<OfflineActivityListResp>> resp = feignClientForActivity.simpleListByIds(ids);
                     if (resp.isSuccess()) {
                         return resp.getData();
                     } else {