修改获取医学课程价格

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

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import java.util.List;
+import java.util.Map;
 
 @Slf4j
 @RestController("medicalHome")
@@ -102,8 +103,8 @@ public class HomeController {
      */
     @RequestMapping("/getMedicalCoursePrice")
     public R getMedicalCoursePrice(){
-        List coursePrice = medicalService.getMedicalCoursePrice();
+        List<Map<String,Object>> coursePrice = medicalService.getMedicalCoursePrice();
-        return R.ok().put("list",coursePrice);
+        return R.ok().put("res",coursePrice);
     }
 
     /**

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

@@ -1,10 +1,12 @@
 package com.peanut.modules.medical.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.peanut.modules.common.entity.CourseEntity;
 import com.peanut.modules.common.entity.CourseMedicine;
 import com.peanut.modules.common.to.ParamTo;
 
 import java.util.List;
+import java.util.Map;
 
 public interface CourseMedicalService extends IService<CourseMedicine> {
 
@@ -14,5 +16,5 @@ public interface CourseMedicalService extends IService<CourseMedicine> {
 
     List<CourseMedicine> getChildCourseMedicalTree(ParamTo param);
 
-    List getMedicalCoursePrice();
+    List<Map<String,Object>> getMedicalCoursePrice();
 }

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

@@ -79,19 +79,24 @@ public class CourseMedicalServiceImpl extends ServiceImpl<CourseMedicineDao, Cou
     }
 
     @Override
-    public List getMedicalCoursePrice() {
+    public List<Map<String,Object>> getMedicalCoursePrice() {
         //获取所有医学标签
         List<CourseMedicine> courseMedicines = getCourseMedicalTree();
+        List<Map<String,Object>> res = new ArrayList<>();
         for (CourseMedicine c : courseMedicines){
-            getLastLevelCourseList(c);
+            Map<String,Object> m = new HashMap<>();
+            m.put("courseMedicine",c);
+            m.put("courseList",new ArrayList<>());
+            getLastLevelCourseList(c,m);
+            res.add(m);
         }
-        return courseMedicines;
+        return res;
     }
 
-    private void getLastLevelCourseList(CourseMedicine c){
+    private void getLastLevelCourseList(CourseMedicine c,Map<String,Object> map){
         if (c.getChildren()!=null&&c.getChildren().size() > 0){
             for (CourseMedicine child : c.getChildren()){
-                getLastLevelCourseList(child);
+                getLastLevelCourseList(child,map);
             }
         }
         MPJLambdaWrapper<CourseToMedicine> wrapper = new MPJLambdaWrapper<>();
@@ -105,8 +110,9 @@ public class CourseMedicalServiceImpl extends ServiceImpl<CourseMedicineDao, Cou
                 List<CourseCatalogueEntity> courseCatalogueEntities = courseCatalogueDao.selectList(new LambdaQueryWrapper<CourseCatalogueEntity>().eq(CourseCatalogueEntity::getCourseId, co.getId()).orderByAsc(CourseCatalogueEntity::getSort));
                 co.setCourseCatalogueEntityList(courseCatalogueEntities);
             }
-            c.setCourseList(courseEntities);
+//            c.setCourseList(courseEntities);
         }
+        ((List<CourseEntity>)map.get("courseList")).addAll(courseEntities);
     }
 
 

src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java

@@ -60,6 +60,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
     @Override
     public Page getSociologyCourseList(ParamTo param) {
         Integer uId = ShiroUtils.getUId();
+        MyUserEntity user = userDao.selectOne(new LambdaQueryWrapper<MyUserEntity>().eq(MyUserEntity::getId,uId));
         MPJLambdaWrapper<CourseEntity> wrapper = new MPJLambdaWrapper<>();
         wrapper.selectAll(CourseEntity.class);
         wrapper.leftJoin(CourseToSociologyEntity.class,CourseToSociologyEntity::getCourseId,CourseEntity::getId);
@@ -70,9 +71,15 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
             Integer integer = userCourseBuyDao.selectCount(new LambdaQueryWrapper<UserCourseBuyEntity>().eq(UserCourseBuyEntity::getCourseId, c.getId()).eq(UserCourseBuyEntity::getUserId,uId));
             c.setIsBuy(integer>0?1:0);
             List<CourseCatalogueEntity> courseCatalogueEntities = courseCatalogueDao.selectList(new LambdaQueryWrapper<CourseCatalogueEntity>().eq(CourseCatalogueEntity::getCourseId, c.getId()));
-            for (CourseCatalogueEntity cc:courseCatalogueEntities){
+            if (courseCatalogueEntities != null && courseCatalogueEntities.size() > 0){
-                Integer integer1 = userCourseBuyDao.selectCount(new LambdaQueryWrapper<UserCourseBuyEntity>().eq(UserCourseBuyEntity::getCatalogueId, cc.getId()).eq(UserCourseBuyEntity::getUserId, uId));
+                for (CourseCatalogueEntity cc : courseCatalogueEntities) {
-                cc.setIsBuy(integer1>0?1:0);
+                    if ("0".equals(user.getVip())||"2".equals(user.getVip())){
+                        Integer i = userCourseBuyDao.selectCount(new LambdaQueryWrapper<UserCourseBuyEntity>().eq(UserCourseBuyEntity::getCatalogueId, cc.getId()).eq(UserCourseBuyEntity::getUserId,uId));
+                        cc.setIsBuy(i>0?1:0);
+                    }else {
+                        cc.setIsBuy(1);
+                    }
+                }
             }
             c.setCourseCatalogueEntityList(courseCatalogueEntities);
         }