新增app端活动列表接口、根据活动id获取参与店铺列表接口

src/main/java/com/sqx/modules/activity/controller/app/AppActivityController.java

@@ -1,6 +1,9 @@
 package com.sqx.modules.activity.controller.app;
 
+import com.sqx.common.utils.Constant;
+import com.sqx.common.utils.PageUtils;
 import com.sqx.common.utils.Result;
+import com.sqx.modules.activity.dto.ActivityQueryDTO;
 import com.sqx.modules.activity.service.ActivityService;
 import com.sqx.modules.activity.vo.OrderSuitActivityVO;
 import io.swagger.annotations.Api;
@@ -12,6 +15,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -27,6 +31,15 @@ public class AppActivityController {
 
     private final ActivityService activityService;
 
+    @GetMapping("page")
+    @ApiOperation(value = "获取活动信息分页", response = PageUtils.class, notes="enableFlag、allowShop搜索条件无效")
+    public Result page(@Valid ActivityQueryDTO queryDTO) {
+        queryDTO.setAllowShop(null);
+        queryDTO.setEnableFlag(Constant.YES);
+        PageUtils page = activityService.pageActivity(queryDTO);
+        return Result.success().put("data", page);
+    }
+
     @GetMapping("suit-activity/{orderId}")
     @ApiOperation(value = "获取适用的活动列表")
     public Result getOrderSuitActivity(@PathVariable @ApiParam("订单id") Long orderId) {

src/main/java/com/sqx/modules/activity/controller/app/AppActivityShopController.java

@@ -1,7 +1,10 @@
 package com.sqx.modules.activity.controller.app;
 
+import com.sqx.common.query.PageQuery;
+import com.sqx.common.utils.PageUtils;
 import com.sqx.common.utils.Result;
 import com.sqx.modules.activity.service.ActivityShopService;
+import com.sqx.modules.activity.vo.ActivityShopVO;
 import com.sqx.modules.activity.vo.ShopActivityGroupVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -26,7 +29,14 @@ public class AppActivityShopController {
 
     private final ActivityShopService activityShopService;
 
-    @ApiOperation("获取店铺参与的活动分组")
+    @ApiOperation(value = "活动参与的商家列表", response = ActivityShopVO.class)
+    @GetMapping("activity-shop-page/{activityId}")
+    public Result getActivityShopPage(@PathVariable @ApiParam("活动id") Long activityId, PageQuery queryDTO) {
+        PageUtils page = activityShopService.getShopByActivityId(activityId, queryDTO);
+        return Result.success().put("data", page);
+    }
+
+    @ApiOperation(value = "获取店铺参与的活动分组", response = ShopActivityGroupVO.class)
     @GetMapping("shop-activity-group/{shopId}")
     public Result getShopActivity(@PathVariable @ApiParam("店铺id") Long shopId) {
         ShopActivityGroupVO shopActivityVO = activityShopService.getShopActivityGroup(shopId);

src/main/java/com/sqx/modules/activity/vo/ShopActivityVO.java

@@ -16,6 +16,9 @@ import java.util.Date;
 @ApiModel("店铺参与活动信息")
 public class ShopActivityVO {
 
+    @ApiModelProperty("活动店铺id")
+    private Long activityShopId;
+
     @ApiModelProperty("店铺id")
     private Long shopId;
 

src/main/resources/mapper/activity/ActivityShopDao.xml

@@ -43,6 +43,7 @@
 
     <select id="getActivityByShopIds" resultType="com.sqx.modules.activity.vo.ShopActivityVO">
         select
+            ach.id activityShopId,
             ach.shop_id,
             ach.activity_id,
             a.type activityType,