优化红包消耗统计

fs-service/src/main/java/com/fs/course/vo/FsCourseRedPacketLogListPVO.java

@@ -103,4 +103,6 @@ public class FsCourseRedPacketLogListPVO extends BaseEntity
 
     private Long deptId;
     private Long companyId;
+
+    private String createDate;
 }

fs-service/src/main/resources/mapper/course/FsCourseRedPacketLogMapper.xml

@@ -217,14 +217,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     </select>
     <select id="getReadPackageTotal" resultType="com.fs.course.vo.FsCourseRedPacketLogListPVO">
-        select c.company_name,l.company_id,sum(l.amount) as amount,l.create_time as createTime from fs_course_red_packet_log l
-        inner join company  c on c.company_id = l.company_id
-        WHERE  l.create_time &gt;= #{beginTime}
-        AND l.create_time &lt;#{endTime}
-        and l.status =1
+        SELECT
+        c.company_name,
+        t.company_id,
+        t.createDate,
+        t.amount
+        FROM (
+        SELECT
+        company_id,
+        DATE(create_time) as createDate,
+        SUM(amount) as amount
+        FROM fs_course_red_packet_log
+        WHERE create_time &gt;= #{beginTime}
+        AND create_time &lt; #{endTime}
+        AND status = 1
         <if test="companyId != null and  companyId != '' ">
-            and l.company_id = #{companyId}
+            and company_id = #{companyId}
         </if>
-        GROUP BY l.company_id
+        GROUP BY company_id, DATE(create_time)
+        ) t
+        INNER JOIN company c ON c.company_id = t.company_id
+        ORDER BY t.createDate DESC
     </select>
 </mapper>