MERGE

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityRecommendGoodsMapper.java

@@ -1,8 +1,12 @@
 package com.zhongzheng.modules.activity.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zhongzheng.modules.activity.bo.ActivityRecommendGoodsEditBo;
 import com.zhongzheng.modules.activity.domain.ActivityRecommendGoods;
+import com.zhongzheng.modules.activity.vo.ActivityRecommendGoodsVo;
+import com.zhongzheng.modules.goods.vo.GoodsVo;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 推荐板块商品Mapper接口
@@ -13,4 +17,7 @@ import com.zhongzheng.modules.activity.domain.ActivityRecommendGoods;
 public interface ActivityRecommendGoodsMapper extends BaseMapper<ActivityRecommendGoods> {
 
 
+    Page<GoodsVo> getGoodsListByPage(Page<Object> objectPage,@Param("recommendId") Long recommendId);
+
+    Page<ActivityRecommendGoodsVo> getRecommendGoodsListByPage(Page<Object> objectPage,@Param("recommendId") Long recommendId);
 }

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

@@ -1,11 +1,13 @@
 package com.zhongzheng.modules.activity.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zhongzheng.modules.activity.bo.ActivityRecommendGoodsAddBo;
 import com.zhongzheng.modules.activity.bo.ActivityRecommendGoodsEditBo;
 import com.zhongzheng.modules.activity.bo.ActivityRecommendGoodsQueryBo;
 import com.zhongzheng.modules.activity.domain.ActivityRecommendGoods;
 import com.zhongzheng.modules.activity.vo.ActivityRecommendGoodsVo;
+import com.zhongzheng.modules.goods.vo.GoodsVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -51,4 +53,8 @@ public interface IActivityRecommendGoodsService extends IService<ActivityRecomme
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    Page<GoodsVo> getGoodsListByPage(Page<Object> objectPage, Long recommendId);
+
+	Page<ActivityRecommendGoodsVo> getRecommendGoodsListByPage(Page<Object> objectPage, Long recommendId);
 }

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

@@ -13,6 +13,7 @@ import com.zhongzheng.modules.activity.mapper.ActivityRecommendGoodsMapper;
 import com.zhongzheng.modules.activity.service.IActivityRecommendGoodsService;
 import com.zhongzheng.modules.activity.vo.ActivityRecommendGoodsVo;
 import com.zhongzheng.modules.course.domain.CourseChapterSection;
+import com.zhongzheng.modules.goods.vo.GoodsVo;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -102,4 +103,14 @@ public class ActivityRecommendGoodsServiceImpl extends ServiceImpl<ActivityRecom
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    public com.baomidou.mybatisplus.extension.plugins.pagination.Page<GoodsVo> getGoodsListByPage(com.baomidou.mybatisplus.extension.plugins.pagination.Page<Object> objectPage, Long recommendId) {
+        return baseMapper.getGoodsListByPage(objectPage,recommendId);
+    }
+
+    @Override
+    public com.baomidou.mybatisplus.extension.plugins.pagination.Page<ActivityRecommendGoodsVo> getRecommendGoodsListByPage(com.baomidou.mybatisplus.extension.plugins.pagination.Page<Object> objectPage, Long recommendId) {
+        return baseMapper.getRecommendGoodsListByPage(objectPage,recommendId);
+    }
 }

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

@@ -21,6 +21,7 @@ import com.zhongzheng.modules.activity.vo.ActivityRecommendGoodsVo;
 import com.zhongzheng.modules.activity.vo.ActivityRecommendVo;
 import com.zhongzheng.modules.goods.domain.Goods;
 import com.zhongzheng.modules.goods.service.IGoodsService;
+import com.zhongzheng.modules.goods.vo.GoodsVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -169,33 +170,13 @@ public class ActivityRecommendServiceImpl extends ServiceImpl<ActivityRecommendM
     @Override
     public TableDataInfo<ActivityRecommendGoodsVo> getGoodsList(ActivityRecommendGoodsQueryBo bo) {
         TableDataInfo<ActivityRecommendGoodsVo> result = new TableDataInfo<>();
-        com.baomidou.mybatisplus.extension.plugins.pagination.Page<ActivityRecommendGoods> page = iActivityRecommendGoodsService.page(new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(bo.getPageNum(), bo.getPageSize()),
-                new LambdaQueryWrapper<ActivityRecommendGoods>()
-                        .eq(ActivityRecommendGoods::getRecommendId, bo.getRecommendId())
-                        .orderByAsc(ActivityRecommendGoods::getSort));
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<ActivityRecommendGoodsVo> page =
+                iActivityRecommendGoodsService.getRecommendGoodsListByPage(new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(bo.getPageNum(), bo.getPageSize()),bo.getRecommendId());
         if (CollectionUtils.isEmpty(page.getRecords())){
             return result;
         }
-        List<ActivityRecommendGoods> list = page.getRecords();
-        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.setRows(page.getRecords());
         result.setCode(200);
         return result;
     }

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

@@ -347,48 +347,17 @@ public class ExamApplyServiceImpl extends ServiceImpl<ExamApplyMapper, ExamApply
             return tableDataInfo;
         }
         ActivityRecommend activityRecommend = list.stream().findFirst().get();
-        com.baomidou.mybatisplus.extension.plugins.pagination.Page<ActivityRecommendGoods> page =
-                iActivityRecommendGoodsService.page(new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(bo.getPageNum(), bo.getPageSize()),
-                                                        new LambdaQueryWrapper<ActivityRecommendGoods>()
-                                                        .eq(ActivityRecommendGoods::getRecommendId, activityRecommend.getRecommendId())
-                                                                .orderByAsc(ActivityRecommendGoods::getSort));
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<GoodsVo> page =
+                iActivityRecommendGoodsService.getGoodsListByPage(new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(bo.getPageNum(), bo.getPageSize()),activityRecommend.getRecommendId());
+
         if (CollectionUtils.isEmpty(page.getRecords())){
             return tableDataInfo;
         }
 
-        List<ActivityRecommendGoods> result = page.getRecords();
-        List<ActivityRecommendGoodsVo> listVos = new ArrayList<>();
-        for (ActivityRecommendGoods item : result) {
-            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);
-            }
-        }
         tableDataInfo.setTotal(page.getTotal());
-        tableDataInfo.setRows(listVos);
+        tableDataInfo.setRows(page.getRecords());
         tableDataInfo.setCode(200);
         return tableDataInfo;
-//        List<GoodsVo> result = page.getRecords().stream().map(item -> {
-//            Goods goods = iGoodsService.getById(item.getGoodsId());
-//            GoodsVo goodsVo = new GoodsVo();
-//            BeanUtil.copyProperties(goods, goodsVo);
-//            return goodsVo;
-//        }).collect(Collectors.toList());
-//
-//        tableDataInfo.setTotal(page.getTotal());
-//        tableDataInfo.setRows(result);
-//        tableDataInfo.setCode(200);
-//        return tableDataInfo;
     }
 
     private boolean checkNameUnique(ExamApply entity) {

zhongzheng-system/src/main/resources/mapper/modules/activity/ActivityRecommendGoodsMapper.xml

@@ -13,5 +13,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="sort" column="sort"/>
     </resultMap>
 
+    <select id="getGoodsListByPage" resultType="com.zhongzheng.modules.goods.vo.GoodsVo">
+        SELECT
+            g.*
+        FROM
+            activity_recommend_goods rg
+                LEFT JOIN goods g ON rg.goods_id = g.goods_id
+        WHERE
+            rg.recommend_id = #{recommendId}
+          and g.goods_status = 1 and g.`status` = 1
+        order by rg.sort asc
+    </select>
 
+    <select id="getRecommendGoodsListByPage" resultType="com.zhongzheng.modules.activity.vo.ActivityRecommendGoodsVo">
+        SELECT
+            rg.id,
+            rg.recommend_id,
+            rg.goods_id,
+            rg.sort,
+            g.goods_name,
+            g.goods_type,
+            g.stand_price,
+            g.line_price,
+            g.code,
+            g.year,
+            g.cover_url
+        FROM
+            activity_recommend_goods rg
+                LEFT JOIN goods g ON rg.goods_id = g.goods_id
+        WHERE
+            rg.recommend_id = #{recommendId}
+          and g.goods_status = 1 and g.`status` = 1
+        order by rg.sort asc
+    </select>
 </mapper>