新增商家参与活动列表接口

src/main/java/com/sqx/modules/activity/controller/ActivityShopController.java

@@ -6,6 +6,7 @@ import com.sqx.common.utils.Result;
 import com.sqx.modules.activity.dto.JoinActivityDTO;
 import com.sqx.modules.activity.dto.QuitActivityDTO;
 import com.sqx.modules.activity.service.ActivityShopService;
+import com.sqx.modules.activity.vo.ShopActivityVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -19,6 +20,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * 活动商家
@@ -40,6 +43,13 @@ public class ActivityShopController{
         return Result.success().put("data", page);
     }
 
+    @ApiOperation(value = "商家参与活动列表", response = ShopActivityVO.class)
+    @GetMapping("shop-activity-list/{shopId}")
+    public Result getShopActivityPage(@PathVariable @ApiParam("商家id") Long shopId) {
+        List<ShopActivityVO> shopActivityVOList = activityShopService.getActivityByShopIds(Arrays.asList(shopId));
+        return Result.success().put("data", shopActivityVOList);
+    }
+
      @ApiOperation("商家加入活动")
      @PostMapping("join")
      public Result joinActivity(@RequestBody @Valid JoinActivityDTO dto) {

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

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 店铺参与活动vo
  *
@@ -25,4 +27,13 @@ public class ShopActivityVO {
 
     @ApiModelProperty("活动名称")
     private String activityName;
+
+    @ApiModelProperty("活动图片")
+    private String activityImage;
+
+    @ApiModelProperty("活动开始时间")
+    private Date startTime;
+
+    @ApiModelProperty("活动结束时间")
+    private Date endTime;
 }

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

@@ -46,7 +46,10 @@
             ach.shop_id,
             ach.activity_id,
             a.type activityType,
-            a.title activityName
+            a.title activityName,
+            a.image activityImage,
+            a.start_time,
+            a.end_time
         from activity_shop ach
         left join activity a on a.id = ach.activity_id
         where