商户加入活动返回商家活动id

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

@@ -50,11 +50,11 @@ public class ActivityShopController{
         return Result.success().put("data", shopActivityVOList);
     }
 
-     @ApiOperation("商家加入活动")
+     @ApiOperation(value = "商家加入活动", response = List.class)
      @PostMapping("join")
      public Result joinActivity(@RequestBody @Valid JoinActivityDTO dto) {
-         activityShopService.joinActivity(dto);
-         return Result.success();
+         List<Long> ids = activityShopService.joinActivity(dto);
+         return Result.success().put("data", ids);
      }
 
      @ApiOperation("商家退出活动(根据活动id和店铺id退出)")

src/main/java/com/sqx/modules/activity/dto/JoinActivityDTO.java

@@ -24,7 +24,7 @@ public class JoinActivityDTO {
 
     @ApiModelProperty(value = "店铺id集合", required = true)
     @NotNull(message = "店铺id集合不能为空")
-    @Size(min = 1, message = "店铺id集合不能为空11")
+    @Size(min = 1, message = "店铺id集合不能为空")
     private List<Long> shopIds;
 
     @ApiModelProperty(value = "适用类型;1无限制、2仅针对第一次下单", required = true)

src/main/java/com/sqx/modules/activity/service/ActivityShopService.java

@@ -18,7 +18,7 @@ import java.util.List;
  */
 public interface ActivityShopService extends IService<ActivityShop> {
 
-    void joinActivity(JoinActivityDTO dto);
+    List<Long> joinActivity(JoinActivityDTO dto);
 
     void quitActivity(QuitActivityDTO dto);
 

src/main/java/com/sqx/modules/activity/service/impl/ActivityGoodsServiceImpl.java

@@ -82,7 +82,9 @@ public class ActivityGoodsServiceImpl extends ServiceImpl<ActivityGoodsDao, Acti
 
                     return goodsActivityVO;
                 })
+                // 过滤出当前时间范围内的活动
                 .filter(e -> currentDate.after(e.getStartTime()) && currentDate.before(e.getEndTime()))
+                // 时段优惠活动过滤
                 .filter(ActivityUtil::judgeActivitySuitCurTime)
                 .collect(Collectors.toList());
     }

src/main/java/com/sqx/modules/activity/service/impl/ActivityShopServiceImpl.java

@@ -37,6 +37,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 活动商家
@@ -51,7 +52,7 @@ public class ActivityShopServiceImpl extends ServiceImpl<ActivityShopDao, Activi
     private final SysUserShopService sysUserShopService;
 
     @Override
-    public void joinActivity(JoinActivityDTO dto) {
+    public List<Long> joinActivity(JoinActivityDTO dto) {
         // 权限校验
         checkAuth(dto.getShopIds(), dto.getActivityId());
 
@@ -82,6 +83,8 @@ public class ActivityShopServiceImpl extends ServiceImpl<ActivityShopDao, Activi
         }
 
         saveBatch(activityShops);
+
+        return activityShops.stream().map(ActivityShop::getId).collect(Collectors.toList());
     }
 
     @Transactional