Merge branch 'v2.2.10' into dev

community-api/src/main/java/com/tanpu/community/api/beans/qo/feign/jifen/OfflineActivityListReq.java

-package com.tanpu.community.api.beans.qo.feign.jifen;
-
-import com.tanpu.community.api.beans.req.page.Pageable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @Description 线下活动列表请求
- * @Author wangyalei
- * @Date 2021/9/5 下午9:23
- **/
-@ApiModel
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-public class OfflineActivityListReq {
-    @ApiModelProperty(value = "机构id")
-    private String corpId;
-
-    @ApiModelProperty(value = "活动类型 1线下活动 2招募活动")
-    private Integer activityType;
-
-    @ApiModelProperty(value = "分页对象", required = true)
-    @NotNull(message = "分页对象不能为空")
-    private Pageable page;
-
-}

community-service/src/main/java/com/tanpu/community/controller/HomePageController.java

@@ -5,7 +5,6 @@ import com.tanpu.common.auth.AuthLogin;
 import com.tanpu.common.auth.UserHolder;
 import com.tanpu.community.api.beans.qo.FollowQo;
 import com.tanpu.community.api.beans.qo.ThemeQo;
-import com.tanpu.community.api.beans.qo.feign.jifen.OfflineActivityListReq;
 import com.tanpu.community.api.beans.req.homepage.FollowRelReq;
 import com.tanpu.community.api.beans.req.homepage.QueryFollowReq;
 import com.tanpu.community.api.beans.req.homepage.QueryRecordThemeReq;
@@ -13,7 +12,6 @@ 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.resp.HomeSettingsResp;
-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.UserInfoResp;
 import com.tanpu.community.feign.activity.FeignClientForActivity;
@@ -120,11 +118,4 @@ public class HomePageController {
     public CommonResp<HomeSettingsResp> getHomeSettings() {
         return hotRecommendService.getHomeSettings();
     }
-
-    @PostMapping(value = "/queryCorpActivityList")
-    @ApiOperation("机构活动列表v2.2.10")
-    public CommonResp<Page<OfflineActivitySimpleResp>> queryCorpActivityList(@RequestBody OfflineActivityListReq req) {
-        return feignClientForActivity.queryCorpActivityList(req);
-    }
-
 }

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

@@ -2,7 +2,6 @@ package com.tanpu.community.feign.activity;
 
 import com.alibaba.fastjson.JSONObject;
 import com.tanpu.common.api.CommonResp;
-import com.tanpu.community.api.beans.qo.feign.jifen.OfflineActivityListReq;
 import com.tanpu.community.api.beans.req.page.Page;
 import com.tanpu.community.api.beans.vo.feign.activity.OfflineActivitySimpleResp;
 import feign.hystrix.FallbackFactory;
@@ -38,13 +37,6 @@ public class FeignBackClientForActivity implements FallbackFactory<FeignClientFo
                 log.error("FeignClientForActivity.offlineActivityDetail-查询活动orgId:{}", orgId);
                 return CommonResp.error();
             }
-
-            @Override
-            public CommonResp<Page<OfflineActivitySimpleResp>> queryCorpActivityList(OfflineActivityListReq req) {
-                log.error("请求信息", throwable);
-                log.error("FeignClientForActivity.queryCorpActivityList-参数:{}", JSONObject.toJSONString(req));
-                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.qo.feign.jifen.OfflineActivityListReq;
-import com.tanpu.community.api.beans.req.page.Page;
 import com.tanpu.community.api.beans.vo.feign.activity.OfflineActivitySimpleResp;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
@@ -29,8 +25,4 @@ public interface FeignClientForActivity {
     @ApiOperation("线下活动列表-查询机构首页线下活动列表")
     @GetMapping(value = "/offlineActivity/inter/queryCorpHomeActivityList")
     CommonResp<List<OfflineActivitySimpleResp>> queryCorpHomeActivityList(@ApiParam("活动id") @RequestParam(value = "corpId") String corpId);
-
-    @ApiOperation("线下活动列表-查询机构活动列表")
-    @PostMapping(value = "/offlineActivity/inter/queryCorpActivityList")
-    CommonResp<Page<OfflineActivitySimpleResp>> queryCorpActivityList(@RequestBody OfflineActivityListReq req);
 }