Merge branch 'feature/1061371-Interactive-gatherings' into developer

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/GatheringActivityController.java

@@ -29,19 +29,28 @@ import java.util.stream.Collectors;
 public class GatheringActivityController {
 
     @Autowired
-    private GatheringActivityApiService  activityApiService;
+    private GatheringActivityApiService activityApiService;
 
     @Autowired
-    private GatheringActivityWxApiService  activityWxApiService;
+    private GatheringActivityWxApiService activityWxApiService;
 
     /**
      * 根据会员查询活动信息
+     *
      * @param memberId
-     * @param pageQo
      * @return
      */
     @RequestMapping("/activity-by-member")
-    public RestResponse<Page<GatheringActivityMemberIdActivityRecordDTO>> getActivityRecordByMemberId(@RequestParam String memberId, @RequestParam PageQo pageQo) {
+    public RestResponse<Page<GatheringActivityMemberIdActivityRecordDTO>> getActivityRecordByMemberId(@RequestParam String memberId,
+                                                                                                      @RequestParam(required = false) Integer pageSize,
+                                                                                                      @RequestParam(required = false) Integer pageNum) {
+        PageQo pageQo = new PageQo();
+        if (pageSize != null) {
+            pageQo.setPageSize(pageSize);
+        }
+        if (pageNum != null) {
+            pageQo.setPageNum(pageNum);
+        }
         ServiceResponse<PageResult<GatheringActivityMemberIdActivityRecordDTO>> serviceResponse = activityApiService.getActivityRecordByMemberId(memberId, pageQo);
         if (!serviceResponse.isSuccess()) {
             return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
@@ -51,6 +60,7 @@ public class GatheringActivityController {
 
     /**
      * 活动详情
+     *
      * @param activityId
      * @param memberId
      * @param enterpriseId