fix:商城首页统计

cooleshow-mall/mall-admin/src/main/resources/config/mybatis/OmsOrderDao.xml

@@ -120,4 +120,51 @@
             sum(if(status = 2 and confirm_status = 0,1,0)) as waitReceiptOrder
         from oms_order
     </select>
+
+    <select id="selectOrderCountAndAmount" resultType="com.yonge.cooleshow.admin.dto.OrderStatistical">
+
+        select
+        <choose>
+            <when test="dateFormat == 'DAY'">
+                date_format(create_time,'%Y-%m-%d') as date,
+            </when>
+            <when test="dateFormat == 'WEEK'">
+                YEARWEEK(date_format(create_time,'%Y-%m-%d'),7) as date,
+            </when>
+            <when test="dateFormat == 'MONTH'">
+                date_format(create_time,'%Y-%m')  as date,
+            </when>
+        </choose>
+        count(1) as orderNum,
+        sum(pay_amount) as orderAmount
+        from oms_order
+        where status in (1,2,3) and create_time between #{startTime} and  #{endTime}
+
+        group by
+
+        <choose>
+            <when test="dateFormat == 'DAY'">
+                date_format(create_time,'%Y-%m-%d')
+            </when>
+            <when test="dateFormat == 'WEEK'">
+                YEARWEEK(date_format(create_time,'%Y-%m-%d'),7)
+            </when>
+            <when test="dateFormat == 'MONTH'">
+                date_format(create_time,'%Y-%m')
+            </when>
+        </choose>
+
+        order by
+        <choose>
+            <when test="dateFormat == 'DAY'">
+                date_format(create_time,'%Y-%m-%d')
+            </when>
+            <when test="dateFormat == 'WEEK'">
+                YEARWEEK(date_format(create_time,'%Y-%m-%d'),7)
+            </when>
+            <when test="dateFormat == 'MONTH'">
+                date_format(create_time,'%Y-%m')
+            </when>
+        </choose>
+    </select>
 </mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -670,6 +670,7 @@
         left join course_schedule_replied csr on cs.id_ = csr.course_schedule_id_
         where cs.teacher_id_ = #{userId} and cs.status_ = 'COMPLETE' and cs.type_ = 'PRACTICE'
         and csr.student_replied_ is not null
+        and YEARWEEK(date_format(csr.create_time_,'%Y-%m-%d'),7) = YEARWEEK(now(),7)
     </select>
     <select id="selectStartTime" resultType="java.lang.String" parameterType="java.lang.String">
         SELECT s.start_time_