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

zhongzheng-system/src/main/resources/mapper/modules/top/TopDivideOrderMapper.xml

@@ -292,9 +292,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="tenantId != null and tenantId != ''">
             AND v.tenant_id = #{tenantId}
         </if>
-        <if test="payStatus != null and payStatus.size()!=0">
-            AND cl.pay_status in
-            <foreach collection="payStatus" item="item" index="index" open="(" close=")" separator=",">
+        <if test="checkStatus != null and checkStatus.size()!=0">
+            AND cl.check_status in
+            <foreach collection="checkStatus" item="item" index="index" open="(" close=")" separator=",">
                 #{item}
             </foreach>
         </if>

zhongzheng-system/src/main/resources/mapper/modules/user/UserStudyRecordMapper.xml

@@ -813,14 +813,11 @@
         ( SELECT m.category_name FROM major m WHERE   m.id =g.major_id LIMIT 1) AS category_name,
         ( SELECT i.business_name FROM course_business i WHERE i.id = g.business_id LIMIT 1) AS business_name,
         ( SELECT p.project_name FROM course_project_type p WHERE p.id = g.project_id LIMIT 1) AS project_name,
-        s.service_start_time,
-        s.service_end_time,
-        ( SELECT count(*) FROM course_file cf WHERE  cf.handouts_id =g.handouts_id AND cf.type = 1 AND cf.`status` = 1 ) AS file_num,
+        ( SELECT count(*) FROM course_file cf WHERE  cf.handouts_id =g.handouts_id AND cf.type = 1 AND cf.`status` = 1 ) AS file_num
         FROM
         goods g
         LEFT JOIN order_goods s ON g.goods_id = s.goods_id
         LEFT JOIN `order` o ON o.order_sn = s.order_sn
-        WHERE
         where 1=1
         AND s.refund_status in (0,1,3)
         AND s.pay_status in (2,3,4)
@@ -921,14 +918,11 @@
         gc.goods_id = g.goods_id
         AND cm.type = 1)) as section_num,
         (SELECT COUNT(DISTINCT section_id) FROM user_study_record r where r.order_goods_id=s.order_goods_id  AND r.current_status = 1)
-        as stu_all_num,
-        s.service_start_time,
-        s.service_end_time
+        as stu_all_num
         FROM
         goods g
         LEFT JOIN order_goods s ON g.goods_id = s.goods_id
         LEFT JOIN `order` o ON o.order_sn = s.order_sn
-        WHERE
         where 1=1
         AND s.refund_status in (0,1,3)
         AND s.pay_status in (2,3,4)