Merge remote-tracking branch 'origin/test' into test

src/main/resources/mapper/app/UserDao.xml

@@ -299,7 +299,16 @@
 
 
     <select id="selectInviteUserList" resultType="com.sqx.modules.app.entity.UserEntity">
-        SELECT any_value(user_id) as userId, COUNT(*) AS counts FROM tb_user GROUP BY inviter_code order by counts desc
+        SELECT any_value(inviter_code) as inviterCode, COUNT(*) AS counts
+        FROM tb_user
+        <if test="queryUserIdList != null">
+            where user_id in
+            <foreach collection="queryUserIdList" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+
+        GROUP BY inviter_code order by counts desc
     </select>
 
     <select id="selectUserOnLineCount" resultType="Integer">

src/main/resources/mapper/course/CourseCollectDao.xml

@@ -40,5 +40,15 @@
         WHERE
             c1.classify = 3
           AND c1.user_id = #{userId}
+        order by c1.create_time desc
+    </select>
+
+    <select id="selectClassify1ByUserId" resultType="com.sqx.modules.course.entity.Course">
+        SELECT c1.course_id         as courseId,
+               c1.course_details_id as courseDetailsId
+        FROM `course_collect` c1
+        WHERE c1.classify = 3
+          AND c1.user_id = #{userId}
+        order by c1.create_time desc
     </select>
 </mapper>

src/main/resources/mapper/course/CourseDetailsDao.xml

@@ -108,7 +108,7 @@
         SELECT course_id as courseId,
                COUNT(*)  AS courseDetailsCount
         FROM course_details
-        where course_details_id in
+        where course_id in
         <foreach collection="courseIdList" item="ids" open="(" separator="," close=")">
             #{ids}
         </foreach>

src/main/resources/mapper/pay/CashDao.xml

@@ -18,7 +18,7 @@
     <select id="selectTemp" resultType="com.sqx.modules.pay.entity.CashOut">
         SELECT * FROM cash_out
         WHERE
-            state = 0 and order_number is not null and order_number != ''
+            (state = 0 or state=4) and order_number is not null and order_number != '' and create_at &lt; #{time}
     </select>
 
     <select id="selectCashOutSum" resultType="Double">