Merge remote-tracking branch 'origin/master'

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/service/IAppHomeService.java

@@ -1,11 +1,9 @@
 package org.jeecg.modules.app.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.app.entity.AppBanner;
 import org.jeecg.modules.app.vo.AppBannerVO;
 import org.jeecg.modules.app.vo.HomeVO;
 
-public interface IAppHomeService extends IService<AppBanner> {
+public interface IAppHomeService {
 
     /**
      * @Author SheepHy

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/service/impl/AppHomeServiceImpl.java

@@ -1,23 +1,43 @@
 package org.jeecg.modules.app.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.app.entity.AppBanner;
-import org.jeecg.modules.app.mapper.AppBannerMapper;
+import org.jeecg.modules.system.app.entity.AppBanner;
+import org.jeecg.modules.system.app.mapper.AppBannerMapper;
 import org.jeecg.modules.app.service.IAppHomeService;
 import org.jeecg.modules.app.vo.AppBannerVO;
+import org.jeecg.modules.app.vo.CoureseVO;
 import org.jeecg.modules.app.vo.HomeVO;
+import org.jeecg.modules.system.app.entity.AppCourese;
+import org.jeecg.modules.system.app.mapper.AppCoureseMapper;
+import org.jeecg.modules.system.app.mapper.AppCoursesPriceRulesMapper;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
 @Service
-public class AppHomeServiceImpl extends ServiceImpl<AppBannerMapper, AppBanner> implements IAppHomeService {
+public class AppHomeServiceImpl implements IAppHomeService {
+    @Resource
+    private AppBannerMapper appBannerMapper;
+    @Resource
+    private AppCoureseMapper appCoureseMapper;
+    @Resource
+    private AppCoursesPriceRulesMapper appCoursesPriceRulesMapper;
     @Override
     public HomeVO homeInfo(){
-        List<AppBanner> appBanners = this.getBaseMapper().selectList(Wrappers.<AppBanner>lambdaQuery()
+        List<AppBanner> appBanners = appBannerMapper.selectList(Wrappers.<AppBanner>lambdaQuery()
                 .eq(AppBanner::getDelFlag, 0));
+        //精品课程
+        List<AppCourese> appCoureseFine = appCoureseMapper.selectList(Wrappers.<AppCourese>lambdaQuery()
+                .eq(AppCourese::getPriceType, 0).last("limit 3"));
+        //免费课程
+        List<AppCourese> appCoureseFree = appCoureseMapper.selectList(Wrappers.<AppCourese>lambdaQuery()
+                .eq(AppCourese::getPriceType, 1).last("limit 3"));
+        List<CoureseVO> courseVO = new ArrayList<>();
+//        courseVO.addAll(convertToCoureseVOList(appCoureseFine));
+//        courseVO.addAll(convertToCoureseVOList(appCoureseFree));
         return new HomeVO().setBannerList(appBanners.stream()
                 .map(banner -> new AppBannerVO()
                         .setId(banner.getId())
@@ -25,6 +45,16 @@ public class AppHomeServiceImpl extends ServiceImpl<AppBannerMapper, AppBanner>
                         .setEventValue(banner.getEventValue())
                         .setSortOrder(banner.getSortOrder())
                         .setImageUrl(banner.getImageUrl()))
-                .collect(Collectors.toList()));
+                .collect(Collectors.toList()))
+                .setCourseList(courseVO);
     }
+
+//    private List<CoureseVO> convertToCoureseVOList(List<AppCourese> appCoureseList) {
+//        return appCoureseList.stream()
+//                .map(courese -> new CoureseVO()
+//                        .setId(courese.getId()).setCover(courese.getCover())
+//                        .setPriceType(courese.getPriceType())
+//                        .setSellingPrice(appCoursesPriceRulesMapper.selectById(courese.getId()).get))
+//                .collect(Collectors.toList());
+//    }
 }

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/vo/CoureseVO.java

@@ -15,7 +15,7 @@ public class CoureseVO {
     @Schema(description = "封面")
     private String cover;
     @Schema(description = "产品类型 1、公益 2、试听")
-    private String priceType;
+    private int priceType;
     @Schema(description = "价格")
     private String sellingPrice;
 

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/entity/AppBanner.java → national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppBanner.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.app.entity;
+package org.jeecg.modules.system.app.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/mapper/AppBannerMapper.java → national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/AppBannerMapper.java

@@ -1,8 +1,8 @@
-package org.jeecg.modules.app.mapper;
+package org.jeecg.modules.system.app.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
-import org.jeecg.modules.app.entity.AppBanner;
+import org.jeecg.modules.system.app.entity.AppBanner;
 
 /**
  * @Description: 首页轮播图管理