平台净利润折现图修改

alien-entity/src/main/resources/mapper/ManagementInfoMapper.xml

@@ -349,26 +349,20 @@
         ),
         order_data AS (
         SELECT
-        o.id,
-        si.commission_rate,
-        o.final_price,
-        ocm.used_time
-        FROM life_user_order o
-        LEFT JOIN order_coupon_middle ocm ON ocm.order_id = o.id
-        LEFT JOIN store_info si ON si.id = o.store_id
-        WHERE o.delete_flag = 0 and o.status = 2
+        sidr.commission,
+        sidr.created_time
+        FROM store_income_details_record sidr where 1=1
         <if test="dataTime != null and dataTime != ''">
-            AND ocm.used_time >= #{dataTime}
+            AND sidr.created_time >= #{dataTime}
         </if>
         )
 
         SELECT
         concat(h.hour_num,":00") AS hour_num,
-        COALESCE(ROUND(SUM(o.final_price) * (IFNULL(o.commission_rate, 3)/100), 2), 0) AS profit
+        COALESCE(IFNULL(ROUND(sum(o.commission)/100,2), 0)) AS profit
         FROM
         hours h
-        LEFT JOIN order_data o ON h.hour_num = HOUR(o.used_time)
-
+        LEFT JOIN order_data o ON h.hour_num = HOUR(o.created_time)
         GROUP BY
         h.hour_num
         ORDER BY
@@ -384,23 +378,18 @@
         ),
         order_data AS (
         SELECT
-        o.id,
-        si.commission_rate,
-        o.final_price,
-        ocm.used_time
-        FROM life_user_order o
-        LEFT JOIN order_coupon_middle ocm ON ocm.order_id = o.id
-        LEFT JOIN store_info si ON si.id = o.store_id
-        WHERE o.delete_flag = 0 and o.status = 2
+        sidr.commission,
+        sidr.created_time
+        FROM store_income_details_record sidr
         )
         SELECT
         DATE_FORMAT(ds.hour_num, '%c-%d') AS hour_num,
-        COALESCE(ROUND(SUM(o.final_price) * (IFNULL(o.commission_rate, 3)/100), 2), 0) AS profit
+        COALESCE(IFNULL(ROUND(sum(o.commission)/100,2), 0)) AS profit
         FROM
         date_sequence ds
         LEFT JOIN order_data o ON
-        o.used_time >= ds.hour_num
-        AND o.used_time &lt; ds.hour_num + INTERVAL 1 DAY
+        o.created_time >= ds.hour_num
+        AND o.created_time &lt; ds.hour_num + INTERVAL 1 DAY
         GROUP BY
         ds.hour_num
         ORDER BY
@@ -416,22 +405,17 @@
         ),
         order_data AS (
         SELECT
-        o.id,
-        si.commission_rate,
-        o.final_price,
-        ocm.used_time
-        FROM life_user_order o
-        LEFT JOIN order_coupon_middle ocm ON ocm.order_id = o.id
-        LEFT JOIN store_info si ON si.id = o.store_id
-        WHERE o.delete_flag = 0 and o.status = 2
+        sidr.commission,
+        sidr.created_time
+        FROM store_income_details_record sidr
         )
         SELECT
         DATE_FORMAT(ds.hour_num, '%c-%d') AS hour_num,
-        COALESCE(ROUND(SUM(o.final_price) * (IFNULL(o.commission_rate, 3)/100), 2), 0) AS profit
+        COALESCE(IFNULL(ROUND(sum(o.commission)/100,2), 0)) AS profit
         FROM
         date_sequence ds
         LEFT JOIN order_data o ON
-        o.used_time >= ds.hour_num AND o.used_time &lt; DATE_ADD(ds.hour_num, INTERVAL 1 DAY)
+        o.created_time >= ds.hour_num AND o.created_time &lt; DATE_ADD(ds.hour_num, INTERVAL 1 DAY)
         GROUP BY
         ds.hour_num
         ORDER BY
@@ -447,23 +431,18 @@
         ),
         order_data AS (
         SELECT
-        o.id,
-        si.commission_rate,
-        o.final_price,
-        ocm.used_time
-        FROM life_user_order o
-        LEFT JOIN order_coupon_middle ocm ON ocm.order_id = o.id
-        LEFT JOIN store_info si ON si.id = o.store_id
-        WHERE o.delete_flag = 0 and o.status = 2
+        sidr.commission,
+        sidr.created_time
+        FROM store_income_details_record sidr
         )
         SELECT
         CONCAT(ms.hour_num,'月') AS hour_num,
-        COALESCE(ROUND(SUM(o.final_price) * (IFNULL(o.commission_rate, 3)/100), 2), 0) AS profit
+        COALESCE(IFNULL(ROUND(sum(o.commission)/100,2), 0)) AS profit
         FROM
         month_sequence ms
         LEFT JOIN order_data o ON
-        MONTH(o.used_time) = ms.hour_num
-        AND YEAR(o.used_time) = YEAR(#{dataTime})
+        MONTH(o.created_time) = ms.hour_num
+        AND YEAR(o.created_time) = YEAR(#{dataTime})
         GROUP BY
         ms.hour_num
         ORDER BY