MERGE

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityRecommendServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
@@ -176,18 +177,23 @@ public class ActivityRecommendServiceImpl extends ServiceImpl<ActivityRecommendM
             return result;
         }
         List<ActivityRecommendGoods> list = page.getRecords();
-        List<ActivityRecommendGoodsVo> listVos = list.stream().map(item -> {
-            ActivityRecommendGoodsVo vo = new ActivityRecommendGoodsVo();
-            BeanUtil.copyProperties(item, vo);
-            Goods goods = iGoodsService.getById(item.getGoodsId());
-            vo.setGoodsName(goods.getGoodsName());
-            vo.setGoodsType(goods.getGoodsType());
-            vo.setCoverUrl(goods.getCoverUrl());
-            vo.setYear(goods.getYear());
-            vo.setStandPrice(goods.getStandPrice());
-            vo.setLinePrice(goods.getLinePrice());
-            return vo;
-        }).collect(Collectors.toList());
+        List<ActivityRecommendGoodsVo> listVos = new ArrayList<>();
+        for (ActivityRecommendGoods item : list) {
+            Goods goods = iGoodsService.getOne(new LambdaQueryWrapper<Goods>()
+                    .eq(Goods::getGoodsId, item.getGoodsId())
+                    .eq(Goods::getGoodsStatus, 1));
+            if (ObjectUtils.isNotNull(goods)){
+                ActivityRecommendGoodsVo vo = new ActivityRecommendGoodsVo();
+                BeanUtil.copyProperties(item, vo);
+                vo.setGoodsName(goods.getGoodsName());
+                vo.setGoodsType(goods.getGoodsType());
+                vo.setCoverUrl(goods.getCoverUrl());
+                vo.setYear(goods.getYear());
+                vo.setStandPrice(goods.getStandPrice());
+                vo.setLinePrice(goods.getLinePrice());
+                listVos.add(vo);
+            }
+        }
         result.setTotal(page.getTotal());
         result.setRows(listVos);
         result.setCode(200);

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamRecommendGoodsQueryBo.java

@@ -25,6 +25,7 @@ public class ExamRecommendGoodsQueryBo implements Serializable {
     @ApiModelProperty("分页参数")
     private Integer pageNum;
 
-
+    @ApiModelProperty("1小程序 2PC网站")
+    private Integer platform;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamApplyServiceImpl.java

@@ -334,10 +334,12 @@ public class ExamApplyServiceImpl extends ServiceImpl<ExamApplyMapper, ExamApply
         if (ObjectUtils.isNull(business)){
             throw new CustomException("获取试卷业务层次信息失败");
         }
+        Integer platform = ObjectUtils.isNull(bo.getPlatform())?1:bo.getPlatform();
         //获取推荐位信息
         List<ActivityRecommend> list = iActivityRecommendService.list(new LambdaQueryWrapper<ActivityRecommend>()
                 .eq(ActivityRecommend::getEducationTypeId, business.getEducationTypeId())
                 .eq(ActivityRecommend::getBusinessId, business.getBusinessId())
+                .eq(ActivityRecommend::getPlatform,platform)
                 .eq(ActivityRecommend::getType, 1)
                 .eq(ActivityRecommend::getStatus,1));
         if (CollectionUtils.isEmpty(list)){