bug

src/main/java/com/peanut/modules/book/controller/BookLabelAndMarketController.java

@@ -292,6 +292,7 @@ public class BookLabelAndMarketController {
         if (params.containsKey("bookMarketId")&&!"".equals(params.get("bookMarketId").toString())){
             wrapper.eq(ShopProductToBookMarket::getBookMarketId,params.get("bookMarketId").toString());
         }
+        wrapper.orderByAsc(ShopProductBookMarket::getSort);
         Page<ShopProductToBookMarket> page = toMarketService.page(new Page<>(
                 Long.parseLong(params.get("current").toString()), Long.parseLong(params.get("limit").toString())),wrapper);
         List<ShopProductToBookMarket> res = page.getRecords();

src/main/java/com/peanut/modules/master/controller/CourseMedicineMarketController.java

@@ -3,10 +3,12 @@ package com.peanut.modules.master.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.peanut.common.utils.ObjectUtils;
 import com.peanut.common.utils.R;
 import com.peanut.modules.common.entity.CourseEntity;
 import com.peanut.modules.common.entity.CourseMedicineMarketEntity;
 import com.peanut.modules.common.entity.CourseToMedicineMarketEntity;
+import com.peanut.modules.common.entity.CourseToSociologyMarketEntity;
 import com.peanut.modules.master.service.CourseMedicineMarketService;
 import com.peanut.modules.master.service.CourseService;
 import com.peanut.modules.master.service.CourseToMedicineMarketService;
@@ -18,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Slf4j
 @RestController("masterCourseMedicineMarket")
@@ -134,15 +137,12 @@ public class CourseMedicineMarketController {
      */
     @RequestMapping("/getNotToMarketList")
     public R getNotToMarketList(@RequestBody Map params){
-        LambdaQueryWrapper<CourseEntity> wrapper = new LambdaQueryWrapper();
+        List<Integer> collect1 = toMarketService.getBaseMapper().selectList(new LambdaQueryWrapper<CourseToMedicineMarketEntity>().eq(CourseToMedicineMarketEntity::getMedicineMarketId, params.get("marketId"))).stream().map(CourseToMedicineMarketEntity::getCourseId).collect(Collectors.toList());
-        wrapper.like(CourseEntity::getTitle,params.get("title"));
+        LambdaQueryWrapper<CourseEntity> wrapper1 = new LambdaQueryWrapper<>();
-        if (params.containsKey("marketId")&&!"".equals(params.get("marketId").toString())){
+        wrapper1.notIn(collect1.size()>0,CourseEntity::getId,collect1);
-            String sql = "select course_id from course_to_market where del_flag = 0 and market_id = "+params.get("marketId");
+        wrapper1.like(StringUtils.isNotBlank(params.get("title").toString()),CourseEntity::getTitle,params.get("title").toString());
-            wrapper.notInSql(CourseEntity::getId,sql);
+        Page<CourseEntity> page1 = courseService.page(new Page<>(Long.parseLong(params.get("current").toString()), Long.parseLong(params.get("limit").toString())), wrapper1);
-        }
+        return R.ok().put("page",page1);
-        Page<CourseEntity> page = courseService.page(new Page<>(
-                Long.parseLong(params.get("current").toString()), Long.parseLong(params.get("limit").toString())),wrapper);
-        return R.ok().put("result", page);
     }
 
     @RequestMapping(path = "/saveToMarket")

src/main/java/com/peanut/modules/sociology/controller/CourseController.java

@@ -63,6 +63,16 @@ public class CourseController {
         return R.ok().put("courseList",marketCourseList);
     }
 
+    /**
+     * 获取国学课程价格
+     * @return
+     */
+    @RequestMapping("/getCoursePrice")
+    public R getCoursePrice(){
+        List coursePrice = courseService.getCoursePrice();
+        return R.ok().put("list",coursePrice);
+    }
+
     /**
      * 获取国学标签下的课程列表
      * @param param
@@ -136,7 +146,7 @@ public class CourseController {
 
     @RequestMapping("/getMyCourse")
     public R getMyCourse(@RequestBody Map<String,Integer> map){
-        List<CourseEntity> courses = courseService.getMyCourse(map.get("type"));
+        List courses = courseService.getMyCourse(map.get("type"));
         return R.ok().put("courses",courses);
     }
 

src/main/java/com/peanut/modules/sociology/service/CourseService.java

@@ -22,5 +22,7 @@ public interface CourseService extends IService<CourseEntity> {
 
     Map<String, Object> getCourseDetail(Integer id);
 
-    List<CourseEntity> getMyCourse(int type);
+    List getMyCourse(int type);
+
+    List getCoursePrice();
 }

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

@@ -131,6 +131,32 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
         return flag;
     }
 
+    @Override
+    public List getCoursePrice() {
+        //获取所有国学标签
+        List<CourseSociologyEntity> courseSociologyEntities = courseSociologyDao.selectList(null);
+        ArrayList<Map> flag = new ArrayList<>();
+        for (CourseSociologyEntity c : courseSociologyEntities){
+            HashMap<String, Object> stringObjectHashMap = new HashMap<>();
+            MPJLambdaWrapper<CourseToSociologyEntity> courseToSociologyEntityMPJLambdaWrapper = new MPJLambdaWrapper<>();
+            courseToSociologyEntityMPJLambdaWrapper.selectAll(CourseEntity.class);
+            courseToSociologyEntityMPJLambdaWrapper.leftJoin(CourseEntity.class,CourseEntity::getId,CourseToSociologyEntity::getCourseId);
+            courseToSociologyEntityMPJLambdaWrapper.eq(CourseToSociologyEntity::getSociologyId,c.getId());
+            List<CourseEntity> courseEntities = courseToSociologyDao.selectJoinList(CourseEntity.class, courseToSociologyEntityMPJLambdaWrapper);
+            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("sociology",c);
+            stringObjectHashMap.put("courseList",courseEntities);
+            flag.add(stringObjectHashMap);
+        }
+        return flag;
+    }
+
     private Integer catalogueCompletion(CourseCatalogueEntity c){
         List<CourseCatalogueChapterEntity> courseCatalogueChapterEntities = courseCatalogueChapterDao.selectList(new LambdaQueryWrapper<CourseCatalogueChapterEntity>().eq(CourseCatalogueChapterEntity::getCatalogueId, c.getId()));
         Integer act = 0;