Merge remote-tracking branch 'origin/zcc'

# Conflicts:
#	src/main/java/com/peanut/modules/common/service/impl/TaihuWelfareServiceImpl.java

src/main/java/com/peanut/modules/common/service/impl/TaihuWelfareServiceImpl.java

@@ -3,18 +3,15 @@ package com.peanut.modules.common.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.peanut.common.utils.R;
-import com.peanut.modules.common.dao.ShopStoreToProductDao;
 import com.peanut.modules.common.dao.TaihuWelfareDao;
-import com.peanut.modules.common.entity.ShopProduct;
-import com.peanut.modules.common.entity.ShopStoreToProductEntity;
 import com.peanut.modules.common.entity.TaihuWelfareEntity;
 import com.peanut.modules.common.service.TaihuWelfareService;
 import com.peanut.modules.common.to.ParamTo;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+@Slf4j
 @Service("commonTaihuWelfareService")
 public class TaihuWelfareServiceImpl extends ServiceImpl<TaihuWelfareDao, TaihuWelfareEntity> implements TaihuWelfareService {
     @Autowired

src/main/java/com/peanut/modules/medical/controller/HomeController.java

@@ -6,7 +6,9 @@ import com.peanut.common.utils.ShiroUtils;
 import com.peanut.modules.common.entity.CourseEntity;
 import com.peanut.modules.common.entity.CourseMedicineMarketEntity;
 import com.peanut.modules.common.entity.CourseMedicine;
+import com.peanut.modules.common.entity.SysCourseDirectEntity;
 import com.peanut.modules.common.to.ParamTo;
+import com.peanut.modules.master.service.SysCourseDirectService;
 import com.peanut.modules.medical.service.CourseMarketService;
 import com.peanut.modules.medical.service.CourseMedicalService;
 import com.peanut.modules.medical.service.CourseService;
@@ -28,6 +30,8 @@ public class HomeController {
     private CourseMedicalService medicalService;
     @Autowired
     private CourseMarketService courseMarketService;
+    @Autowired
+    private SysCourseDirectService sysCourseDirectService;
 
     //获取医学标签列表
     @RequestMapping("/getMedicalLabels")
@@ -85,4 +89,24 @@ public class HomeController {
         List<CourseEntity> userLateCourseList = courseService.getUserLateCourseList(param);
         return R.ok().put("page",userLateCourseList);
     }
+
+    /**
+     * 获取医学课程价格
+     * @return
+     */
+    @RequestMapping("/getMedicalCoursePrice")
+    public R getMedicalCoursePrice(){
+        List coursePrice = medicalService.getMedicalCoursePrice();
+        return R.ok().put("list",coursePrice);
+    }
+
+    /**
+     * 获取课程说明
+     * @return
+     */
+    @RequestMapping("/getMedicalCourseRecord")
+    public R getMedicalCourseRecord(){
+        SysCourseDirectEntity byId = sysCourseDirectService.getById(1);
+        return R.ok().put("result",byId);
+    }
 }

src/main/java/com/peanut/modules/medical/service/CourseMedicalService.java

@@ -13,4 +13,6 @@ public interface CourseMedicalService extends IService<CourseMedicine> {
     List<CourseMedicine> getCourseMedicalTree();
 
     List<CourseMedicine> getChildCourseMedicalTree(ParamTo param);
+
+    List getMedicalCoursePrice();
 }

src/main/java/com/peanut/modules/medical/service/impl/CourseMedicalServiceImpl.java

@@ -3,19 +3,32 @@ package com.peanut.modules.medical.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.peanut.modules.common.dao.CourseCatalogueDao;
 import com.peanut.modules.common.dao.CourseMedicineDao;
-import com.peanut.modules.common.entity.CourseMedicine;
+import com.peanut.modules.common.dao.CourseToMedicineDao;
+import com.peanut.modules.common.entity.*;
 import com.peanut.modules.common.to.ParamTo;
 import com.peanut.modules.medical.service.CourseMedicalService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 @Slf4j
 @Service("medicineCourseMedicalService")
 public class CourseMedicalServiceImpl extends ServiceImpl<CourseMedicineDao, CourseMedicine> implements CourseMedicalService {
 
+    @Autowired
+    private CourseToMedicineDao toMedicineDao;
+    @Autowired
+    private CourseCatalogueDao courseCatalogueDao;
+
     @Override
     public List<CourseMedicine> getMedicalLabels(Integer id) {
         LambdaQueryWrapper<CourseMedicine> wrapper = new LambdaQueryWrapper<>();
@@ -65,4 +78,29 @@ public class CourseMedicalServiceImpl extends ServiceImpl<CourseMedicineDao, Cou
         return children;
     }
 
+    @Override
+    public List getMedicalCoursePrice() {
+        //获取所有医学标签
+        List<CourseMedicine> courseMedicines = this.list(null);
+        ArrayList<Map> flag = new ArrayList<>();
+        for (CourseMedicine c : courseMedicines){
+            HashMap<String, Object> stringObjectHashMap = new HashMap<>();
+            MPJLambdaWrapper<CourseToMedicine> wrapper = new MPJLambdaWrapper<>();
+            wrapper.selectAll(CourseEntity.class);
+            wrapper.leftJoin(CourseEntity.class,CourseEntity::getId,CourseToMedicine::getCourseId);
+            wrapper.eq(CourseToMedicine::getMedicalId,c.getId());
+            List<CourseEntity> courseEntities = toMedicineDao.selectJoinList(CourseEntity.class, wrapper);
+            if(courseEntities.size()==0){
+                continue;
+            }
+            for (CourseEntity co:courseEntities){
+                List<CourseCatalogueEntity> courseCatalogueEntities = courseCatalogueDao.selectList(new LambdaQueryWrapper<CourseCatalogueEntity>().eq(CourseCatalogueEntity::getCourseId, co.getId()).orderByAsc(CourseCatalogueEntity::getSort));
+                co.setCourseCatalogueEntityList(courseCatalogueEntities);
+            }
+            stringObjectHashMap.put("medical",c);
+            stringObjectHashMap.put("courseList",courseEntities);
+            flag.add(stringObjectHashMap);
+        }
+        return flag;
+    }
 }