From 852ec1d729b61077d8131591a5349c7e4a1bed79 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期五, 30 八月 2024 17:20:55 +0800
Subject: [PATCH] Merge branch 'master' into master-v2

---
 src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml b/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
index f6b9e26..96ba750 100644
--- a/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
+++ b/src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
@@ -26,7 +26,7 @@
     </select>
 
     <select id="selectDoItemListByTime" resultType="com.mzl.flower.dto.response.payment.DeliveryOrderItemStatisticsDTO">
-        SELECT oi.flower_name, oi.flower_level, sum(oi.num) num, sum(oi.supplier_price) price
+        SELECT oi.flower_name, oi.flower_level, sum(oi.num) num, sum(oi.supplier_price*oi.num) price
         FROM t_delivery_order_item doi
         join t_delivery_order q on q.id = doi.delivery_id
         join t_order_item oi on oi.id = doi.order_item_id
@@ -65,7 +65,7 @@
     </select>
 
     <select id="getSupplierStatisticsByTime" resultType="com.mzl.flower.dto.response.payment.DeliveryOrderItemStatisticsDTO">
-        SELECT sum(oi.num) num, sum(oi.supplier_price) price
+        SELECT sum(oi.num) num, sum(oi.supplier_price*oi.num) price
         FROM t_delivery_order_item doi
         join t_delivery_order q on q.id = doi.delivery_id
         join t_order_item oi on oi.id = doi.order_item_id

--
Gitblit v1.9.3