多活动商品

src/main/java/org/springblade/sing/goods/mapper/PointGoodsMapper.java

@@ -38,4 +38,5 @@ public interface PointGoodsMapper extends BaseMapper<PointGoods> {
 	 * @return
 	 */
 	List<PointGoodsVO> selectPointGoodsPage(IPage page, PointGoodsVO pointGoods);
+
 }

src/main/java/org/springblade/sing/goods/mapper/PointGoodsMapper.xml

@@ -21,8 +21,10 @@
     </resultMap>
 
 
+
     <select id="selectPointGoodsPage" resultMap="pointGoodsResultMap">
         select * from sing_point_goods where is_deleted = 0
     </select>
 
+
 </mapper>

src/main/java/org/springblade/sing/goods/service/impl/PointGoodsServiceImpl.java

@@ -49,14 +49,25 @@ public class PointGoodsServiceImpl extends BaseServiceImpl<PointGoodsMapper, Poi
 
     @Override
     public IPage<PointGoods> queryList(Long activeId,Query query) {
-		LambdaQueryWrapper<PointGoods> wrapper = new LambdaQueryWrapper<PointGoods>().eq(PointGoods::getActiveId, activeId);
+
+		List<Long> ids = new ArrayList<>();
+		List<PointGoods> list = baseMapper.selectList(null);
+		for (PointGoods pointGoods : list) {
+			String goodsActiveId = pointGoods.getActiveId();
+			if (goodsActiveId.contains(activeId.toString())){
+				ids.add(pointGoods.getId());
+			}
+		}
+
+		LambdaQueryWrapper<PointGoods> wrapper = new LambdaQueryWrapper<PointGoods>().in(PointGoods::getId,ids);
 
 		List<PointGoods> goods = baseMapper.selectList(wrapper);
-		Assert.notEmpty(goods,"出错");
+		Assert.notEmpty(goods,"此活动没有相关商品,请前往主页积分商城兑换");
 		IPage<PointGoods> pointGoodsIPage = new Page<>(query.getCurrent(),query.getSize());
 
 		return super.page(pointGoodsIPage,wrapper);
 
+
     }
 
 }

src/main/java/org/springblade/sing/goods/vo/PointGoodsVO.java

@@ -21,6 +21,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 
+import java.util.List;
+
 /**
  * 积分商城视图实体类
  *