From e5ead76f4f0b43a39a43789b2ad87fb1d24b59e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= <tankaikai@aliyun.com>
Date: Thu, 26 Dec 2024 21:27:28 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=9F=A5=E8=AF=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CourseServiceImpl.java       | 19 +++++++++++++++++++
 .../resources/mapper/course/CourseDao.xml     |  4 ++++
 2 files changed, 23 insertions(+)

diff --git a/src/main/java/com/sqx/modules/course/service/impl/CourseServiceImpl.java b/src/main/java/com/sqx/modules/course/service/impl/CourseServiceImpl.java
index e1729543..e18da800 100644
--- a/src/main/java/com/sqx/modules/course/service/impl/CourseServiceImpl.java
+++ b/src/main/java/com/sqx/modules/course/service/impl/CourseServiceImpl.java
@@ -1,6 +1,7 @@
 package com.sqx.modules.course.service.impl;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -44,6 +45,7 @@ import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.*;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -144,7 +146,16 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, Course> implements
         if(admin==null){
             IPage<Map<String, Object>> mapIPage = baseMapper.selectCourse(pages, classifyId, title, isRecommend, status, bannerId,
                     sort, startTime, endTime, userId, isPrice, over,wxCourse,dyCourse,wxShow,dyShow);
+            sort = ObjectUtil.defaultIfNull(sort, 0);
             List<Map<String, Object>> records = mapIPage.getRecords();
+            if(sort != null && sort == 1){
+                records = records.stream().sorted(Comparator.comparingInt(item -> (int)item.get("goodNum"))).collect(Collectors.toList());
+                Collections.reverse(records);
+            }
+            if(sort != null && sort == 2){
+                records = records.stream().sorted(Comparator.comparingInt(item -> (int)item.get("weekGoodNum"))).collect(Collectors.toList());
+                Collections.reverse(records);
+            }
             for (Map<String, Object> map:records){
                 Object courseDetailsId = map.get("courseDetailsId");
                 Object courseId = map.get("courseId");
@@ -172,6 +183,14 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, Course> implements
         IPage<Map<String, Object>> mapIPage = baseMapper.selectCourseAdmin(pages, classifyId, title, isRecommend, status, bannerId,
                 sort, startTime, endTime, userId, isPrice, over, wxCourse, dyCourse,wxShow,dyShow);
         List<Map<String, Object>> records = mapIPage.getRecords();
+        if(sort != null && sort == 1){
+            records = records.stream().sorted(Comparator.comparingInt(item -> (int)item.get("goodNum"))).collect(Collectors.toList());
+            Collections.reverse(records);
+        }
+        if(sort != null && sort == 2){
+            records = records.stream().sorted(Comparator.comparingInt(item -> (int)item.get("weekGoodNum"))).collect(Collectors.toList());
+            Collections.reverse(records);
+        }
         for (Map<String, Object> map:records){
             Object courseId = map.get("courseId");
             //默认取第一集
diff --git a/src/main/resources/mapper/course/CourseDao.xml b/src/main/resources/mapper/course/CourseDao.xml
index a8118457..a9e536f1 100644
--- a/src/main/resources/mapper/course/CourseDao.xml
+++ b/src/main/resources/mapper/course/CourseDao.xml
@@ -116,12 +116,14 @@
         <if test="sort==null">
             order by c.sort asc
         </if>
+        <!--
         <if test="sort!=null and sort==1">
             order by goodNum desc
         </if>
         <if test="sort!=null and sort==2">
             order by weekGoodNum desc
         </if>
+        -->
     </select>
 
     <select id="selectCourseAdmin" resultType="Map">
@@ -244,12 +246,14 @@
         <if test="sort==null">
             order by c.sort asc,c.create_time desc
         </if>
+        <!--
         <if test="sort!=null and sort==1">
             order by goodNum desc
         </if>
         <if test="sort!=null and sort==2">
             order by weekGoodNum desc
         </if>
+        -->
     </select>
 
     <select id="selectCourseTitle" resultType="Map">