From f2846e7b5bcdc041fcb77dfec1ca6a164ca30aa7 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 22 十月 2024 16:39:04 +0800
Subject: [PATCH] fix: id

---
 src/main/resources/mapper/report/OrderReportMapper.xml |  429 +++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 349 insertions(+), 80 deletions(-)

diff --git a/src/main/resources/mapper/report/OrderReportMapper.xml b/src/main/resources/mapper/report/OrderReportMapper.xml
index 6925cc6..783a239 100644
--- a/src/main/resources/mapper/report/OrderReportMapper.xml
+++ b/src/main/resources/mapper/report/OrderReportMapper.xml
@@ -5,6 +5,7 @@
     <select id="getOrderDateReport" resultType="com.mzl.flower.dto.response.report.OrderReportResultVO">
         select
         sum(order_total)  as order_total,
+        sum(total_amount)  as total_amount,
         sum(order_supplier_price_amount)  as order_supplier_price_amount,
         sum(order_markup_one_amount)  as order_markup_one_amount,
         sum(order_markup_two_amount)  as order_markup_two_amount,
@@ -160,9 +161,7 @@
             )
         </if>
     </select>
-    <select id="getPartnerOrderDateReport" resultType="com.mzl.flower.dto.response.report.OrderPartnerReportResultVO">
-        <include refid="partnerBaseSql"></include>
-    </select>
+
     <select id="getPartnerOrderDateReportStatis"
             resultType="com.mzl.flower.dto.response.report.OrderPartnerReportResultVO">
         select
@@ -190,71 +189,82 @@
             sum(order_reduce_num) as order_reduce_num,
             sum(order_lack_num) as order_lack_num,
             sum(real_sale_num) as real_sale_num
-        from <include refid="partnerBaseSql"></include>
+        from ( <include refid="partnerBaseSqlWithDate"></include> ) t
     </select>
 
-    <sql id="partnerBaseSql">
-        select
-        sum(order_total)  as order_total,
-        sum(order_supplier_price_amount)+sum(order_markup_one_amount)+sum(order_markup_two_amount)  as order_partner_price_amount,
-        sum(order_supplier_price_amount)  as order_supplier_price_amount,
-        sum(order_markup_one_amount)  as order_markup_one_amount,
-        sum(order_markup_two_amount)  as order_markup_two_amount,
-        sum(order_markup_partner_amount)  as order_markup_partner_amount,
-        sum(order_price_discount_amount)  as order_price_discount_amount,
-        sum(order_coupon_amount_total)  as order_coupon_amount_total,
-        sum(order_check_fee)  as order_check_fee,
-        sum(order_lack_fee_supplier)  as order_lack_fee_supplier,
-        sum(order_replace_fee)  as order_replace_fee,
-        sum(order_fee_supplier)  as order_fee_supplier,
-        sum(order_fee_partner)  as order_fee_partner,
-        sum(order_fee_platform)  as order_fee_platform,
-        sum(order_fee_platform_pack)  as order_fee_platform_pack,
-        sum(order_fee_platform_check)  as order_fee_platform_check,
-        sum(order_fee_platform_transport)  as order_fee_platform_transport,
-        sum(order_total_fee)  as order_total_fee,
-        sum(order_fee_packing_transport)  as order_fee_packing_transport,
-        sum(order_num) as order_num,
-        sum(order_replace_num) as order_replace_num,
-        sum(order_reduce_num) as order_reduce_num,
-        sum(order_lack_num) as order_lack_num,
-        sum(order_num)-sum(order_lack_num) as real_sale_num,
-        partner_id,
-        partner_name
-        from (
-            select
-                o.order_no,o.payment_time,o.status_backend,vor.*,ci.partner_id,p.name as partner_name
-            from t_order o
-            left join (
-                <include refid="baseSql"></include>
-            ) vor
-            on o.id =vor.order_id
-            left join t_customer_info ci
-            on o.create_by=ci.user_id
-            left join t_partner_info p
-            on ci.partner_id=p.id
-            where o.deleted=0
-            and o.status_backend not in ('PENDING','CANCEL','REFUND')
-            and ci.partner_id is not null
-            <if test="dto.startDate != null">
-                and o.payment_time &gt; #{dto.startDate}
-            </if>
-            <if test="dto.endDate != null">
-                and o.payment_time &lt;= #{dto.endDate}
-            </if>
-            <if test="dto.partnerId != null">
-                and ci.partner_id = #{dto.partnerId}
-            </if>
-        ) t
-        group by partner_id,partner_name
-    </sql>
+    <select id="getPartnerOrderDateReportPage"
+            resultType="com.mzl.flower.dto.response.report.OrderPartnerReportResultVO">
+        <include refid="partnerBaseSqlWithDate"></include>
+    </select>
+    <select id="getPartnerOrderDateReportList"
+            resultType="com.mzl.flower.dto.response.report.OrderPartnerReportResultVO">
+        <include refid="partnerBaseSqlWithDate"></include>
+    </select>
 
+
+    <sql id="partnerBaseSqlWithDate">
+        select
+        t3.payment_date as orderDate ,t3.partner_id,t3.partner_name,
+        IFNULL(sum(order_total),0)  as order_total,
+        IFNULL(sum(order_supplier_price_amount)+sum(order_markup_one_amount)+sum(order_markup_two_amount),0)  as order_partner_price_amount,
+        IFNULL(sum(order_supplier_price_amount),0)  as order_supplier_price_amount,
+        IFNULL(sum(order_markup_one_amount),0)  as order_markup_one_amount,
+        IFNULL(sum(order_markup_two_amount),0)  as order_markup_two_amount,
+        IFNULL(sum(order_markup_partner_amount),0)  as order_markup_partner_amount,
+        IFNULL(sum(order_price_discount_amount),0)  as order_price_discount_amount,
+        IFNULL(sum(order_coupon_amount_total),0)  as order_coupon_amount_total,
+        IFNULL(sum(order_check_fee),0)  as order_check_fee,
+        IFNULL(sum(order_lack_fee_supplier),0)  as order_lack_fee_supplier,
+        IFNULL(sum(order_replace_fee),0)  as order_replace_fee,
+        IFNULL(sum(order_fee_supplier),0)  as order_fee_supplier,
+        IFNULL(sum(order_fee_partner),0)  as order_fee_partner,
+        IFNULL(sum(order_fee_platform),0)  as order_fee_platform,
+        IFNULL(sum(order_fee_platform_pack),0)  as order_fee_platform_pack,
+        IFNULL(sum(order_fee_platform_check),0)  as order_fee_platform_check,
+        IFNULL(sum(order_fee_platform_transport),0)  as order_fee_platform_transport,
+        IFNULL(sum(order_total_fee),0)  as order_total_fee,
+        IFNULL(sum(order_fee_packing_transport),0)  as order_fee_packing_transport,
+        IFNULL(sum(order_num),0) as order_num,
+        IFNULL(sum(order_replace_num),0) as order_replace_num,
+        IFNULL(sum(order_reduce_num),0) as order_reduce_num,
+        IFNULL(sum(order_lack_num),0) as order_lack_num,
+        IFNULL(sum(order_num)-sum(order_lack_num),0) as real_sale_num
+        from (
+        select t2.payment_date,t2.id,t2.order_no,t2.create_by,t2.partner_id,p.name as partner_name,r2.* from (
+            SELECT t.*,
+            CASE
+            WHEN t.payment_time > DATE(t.payment_time) + INTERVAL 17 HOUR THEN DATE(t.payment_time) + INTERVAL 1 DAY
+            ELSE DATE(t.payment_time)
+            END AS payment_date,
+            t.payment_time as payment_time2
+            FROM t_order t
+            WHERE t.deleted = 0
+            and t.status_backend not in ('PENDING','CANCEL','REFUND')
+            )t2
+            left join  ( <include refid="baseSqlWithDate"></include> ) r2
+            on t2.id = r2.order_id
+            left join t_partner_info p
+            on t2.partner_id=p.id
+        )t3
+        where t3.partner_id is not null
+        <if test="dto.paymentDateStart != null">
+            and t3.payment_date &gt;= #{dto.paymentDateStart}
+        </if>
+        <if test="dto.paymentDateEnd != null">
+            and t3.payment_date &lt;= #{dto.paymentDateEnd}
+        </if>
+        <if test="dto.partnerId != null">
+            and t3.partner_id = #{dto.partnerId}
+        </if>
+        group by t3.payment_date,t3.partner_id,t3.partner_name
+        order by t3.payment_date desc,t3.partner_id
+    </sql>
 
     <sql id="baseSql">
         select t2.*,
                IFNULL(t3.fee_supplier,0) as order_fee_supplier,
                IFNULL(t3.fee_partner,0) as order_fee_partner,
-               IFNULL(t3.fee_platform,0) as order_fee_platform,
+               IFNULL(t3.fee_platform,0) +  IFNULL(t3.fee_packing_transport,0)  as order_fee_platform,
                IFNULL(t3.fee_platform_pack,0) as order_fee_platform_pack,
                IFNULL(t3.fee_platform_check,0) as order_fee_platform_check,
                IFNULL(t3.fee_platform_transport,0) as order_fee_platform_transport,
@@ -262,10 +272,11 @@
                IFNULL(t3.fee_packing_transport,0) as order_fee_packing_transport
         from (
                  select
-                     t1.order_id,sum(t1.num) as order_num , sum(t1.total) as order_total, sum(t1.supplier_price_amount) as order_supplier_price_amount, sum(t1.markup_one_amount) as order_markup_one_amount,sum(t1.markup_two_amount) as order_markup_two_amount, sum(t1.markup_partner_amount) as order_markup_partner_amount,sum(t1.price_amount) as order_price_amount,sum(t1.original_price_amount) as order_original_price_amount,sum(t1.price_discount_amount) as order_price_discount_amount,sum(t1.coupon_amount_total) as order_coupon_amount_total,sum(t1.check_fee) as order_check_fee,sum(t1.lack_fee_supplier) as order_lack_fee_supplier,sum(t1.replace_fee) as order_replace_fee,
+                     t1.order_id, t1.total_amount ,sum(t1.num) as order_num , (t1.flower_amount + t1.packing_fee + t1.transport_fee) as order_total, sum(t1.supplier_price_amount) as order_supplier_price_amount, sum(t1.markup_one_amount) as order_markup_one_amount,sum(t1.markup_two_amount) as order_markup_two_amount, sum(t1.markup_partner_amount) as order_markup_partner_amount,sum(t1.price_amount) as order_price_amount,sum(t1.original_price_amount) as order_original_price_amount,sum(t1.price_discount_amount) as order_price_discount_amount,sum(t1.coupon_amount_total) as order_coupon_amount_total,sum(t1.check_fee) as order_check_fee,sum(t1.lack_fee_supplier) as order_lack_fee_supplier,sum(t1.replace_fee) as order_replace_fee,
                      sum(replace_num) as order_replace_num,sum(reduce_num) as order_reduce_num,sum(lack_num) as order_lack_num
                  from (
                    SELECT
+                       o.total_amount,  o.flower_amount, o.packing_fee, o.transport_fee,
                        oi.order_id,
                        oi.id,
                        IFNULL(oi.num,0) as num,
@@ -299,9 +310,9 @@
                        IFNULL(ois.lack_fee_supplier,0) as lack_fee_supplier,
                        IFNULL(ois.replace_fee,0) as replace_fee
 
-                      ,IFNULL( (select oic.num from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'replace'),0) as replace_num
-                      ,IFNULL( (select oic.num from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'reduce'),0) as reduce_num
-                      ,IFNULL( (select oic.num from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'lack'),0) as lack_num
+                      ,IFNULL( (select oic.num from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'replace' and oic.audit_status='AGREED'),0) as replace_num
+                      ,IFNULL( (select oic.num from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'reduce' and oic.audit_status='AGREED'),0) as reduce_num
+                      ,IFNULL( (select oic.num from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'lack' and oic.audit_status='AGREED'),0) as lack_num
                    FROM  t_order o
                    left join t_order_item oi
                    on oi.order_id=o.id
@@ -337,6 +348,104 @@
     </sql>
 
 
+    <sql id="baseSqlWithDate">
+        select t2.*,
+        IFNULL(t3.fee_supplier,0) as order_fee_supplier,
+        IFNULL(t3.fee_partner,0) as order_fee_partner,
+        IFNULL(t3.fee_platform,0) as order_fee_platform,
+        IFNULL(t3.fee_platform_pack,0) as order_fee_platform_pack,
+        IFNULL(t3.fee_platform_check,0) as order_fee_platform_check,
+        IFNULL(t3.fee_platform_transport,0) as order_fee_platform_transport,
+        IFNULL(t3.total_fee,0) as order_total_fee,
+        IFNULL(t3.fee_packing_transport,0) as order_fee_packing_transport
+        from (
+        select
+        t1.order_id,sum(t1.num) as order_num , sum(t1.total) as order_total, sum(t1.supplier_price_amount) as order_supplier_price_amount, sum(t1.markup_one_amount) as order_markup_one_amount,sum(t1.markup_two_amount) as order_markup_two_amount, sum(t1.markup_partner_amount) as order_markup_partner_amount,sum(t1.price_amount) as order_price_amount,sum(t1.original_price_amount) as order_original_price_amount,sum(t1.price_discount_amount) as order_price_discount_amount,sum(t1.coupon_amount_total) as order_coupon_amount_total,sum(t1.check_fee) as order_check_fee,sum(t1.lack_fee_supplier) as order_lack_fee_supplier,sum(t1.replace_fee) as order_replace_fee,
+        sum(replace_num) as order_replace_num,sum(reduce_num) as order_reduce_num,sum(lack_num) as order_lack_num
+        from (
+        SELECT
+            CASE
+            WHEN o.payment_time > DATE(o.payment_time) + INTERVAL 17 HOUR THEN DATE(o.payment_time) + INTERVAL 1 DAY
+            ELSE DATE(o.payment_time)
+            END AS payment_date,
+            oi.order_id,
+            oi.id,
+            IFNULL(oi.num,0) as num,
+            IFNULL(oi.total,0) as total,
+            IFNULL(oi.supplier_price,0) as supplier_price,
+            IFNULL(oi.supplier_price,0) * IFNULL(oi.num,0) as supplier_price_amount,
+
+            IFNULL(oi.markup_one,0) as markup_one,
+            IFNULL(oi.markup_one,0)* IFNULL(oi.num,0) as markup_one_amount,
+
+            IFNULL(oi.markup_two,0) as markup_two,
+            IFNULL(oi.markup_two,0)* IFNULL(oi.num,0) as markup_two_amount,
+
+            IFNULL(oi.markup_partner,0) as markup_partner,
+            IFNULL(oi.markup_partner,0)* IFNULL(oi.num,0) as markup_partner_amount,
+            IFNULL(oi.price,0) as price,
+            IFNULL(oi.price,0)* IFNULL(oi.num,0) as price_amount,
+
+            IFNULL(oi.original_price,0) as original_price,
+            IFNULL(oi.original_price,0)*IFNULL(oi.num,0) as original_price_amount,
+
+            IFNULL(oi.original_price,0)*IFNULL(oi.num,0) - IFNULL(oi.price,0)* IFNULL(oi.num,0) as price_discount_amount,
+
+
+            IFNULL(oi.real_price,0) as real_price,
+            IFNULL(oi.real_total,0) as real_total,
+
+            IFNULL(oi.coupon_amount_total,0) as coupon_amount_total,
+
+            IFNULL(ois.check_fee,0) as check_fee,
+            IFNULL(ois.lack_fee_supplier,0) as lack_fee_supplier,
+            IFNULL(ois.replace_fee,0) as replace_fee
+
+            ,IFNULL( (select oic.num from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'replace' and oic.audit_status='AGREED'),0) as replace_num
+            ,IFNULL( (select oic.num from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'reduce' and oic.audit_status='AGREED'),0) as reduce_num
+            ,IFNULL( (select oic.num from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'lack' and oic.audit_status='AGREED'),0) as lack_num
+            FROM  t_order o
+            left join t_order_item oi
+            on oi.order_id=o.id
+            left join t_station s on s.id = oi.station_id
+            left join t_supplier_info si on si.id = oi.supplier_id
+            left join t_order_item_settlement ois on ois.order_item_id = oi.id
+            WHERE oi.deleted = 0
+            <if test="dto.startDate != null">
+                and o.payment_time &gt; #{dto.startDate}
+            </if>
+            <if test="dto.endDate != null">
+                and o.payment_time &lt;= #{dto.endDate}
+            </if>
+        )t1
+        where 1=1
+        <if test="dto.paymentDateStart != null">
+            and t1.payment_date &gt;= #{dto.paymentDateStart}
+        </if>
+        <if test="dto.paymentDateEnd != null">
+            and t1.payment_date &lt;= #{dto.paymentDateEnd}
+        </if>
+        group by order_id
+        ) t2
+        left join (
+        select
+        ois.order_id,
+        IFNULL(sum(ois.fee_supplier),0) as fee_supplier,
+        IFNULL(sum(ois.fee_partner),0) as fee_partner,
+        IFNULL(sum(ois.fee_platform),0) as fee_platform,
+        IFNULL(sum(ois.fee_platform_pack),0) as fee_platform_pack,
+        IFNULL(sum(ois.fee_platform_check),0) as fee_platform_check,
+        IFNULL(sum(ois.fee_platform_transport),0) as fee_platform_transport,
+        IFNULL(sum(ois.total_fee),0) as total_fee,
+        IFNULL(sum(ois.fee_packing_transport),0) as fee_packing_transport
+        from t_order_item_sales ois
+        group by order_id
+        )t3
+        on t2.order_id =t3.order_id
+    </sql>
+
+
+
     <sql id="baseSupplierSql">
         SELECT
         t2.*,
@@ -370,7 +479,7 @@
         IFNULL( ois.check_fee, 0 ) AS check_fee,
         IFNULL( ois.replace_fee, 0 ) AS replace_fee,
         IFNULL( ois.lack_fee_supplier, 0 ) AS lack_fee_supplier,
-        IFNULL( (select oic.num from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'lack'),0) as lack_num
+        IFNULL( (select oic.num from t_order_item_check oic where oic.order_item_id = oi.id and oic.type = 'lack' and oic.audit_status='AGREED'),0) as lack_num
         FROM
         t_order o
         LEFT JOIN t_order_item oi ON oi.order_id = o.id
@@ -380,6 +489,7 @@
         WHERE
         oi.deleted = 0
         and  o.payment_time is not null
+        and  o.status_backend not in ('PENDING','CANCEL','REFUND')
         <if test="dto.startDate != null">
             and o.payment_time >= #{dto.startDate}
         </if>
@@ -387,7 +497,7 @@
             and o.payment_time &lt;= #{dto.endDate}
         </if>
         <if test="dto.supplierId != null">
-            and oi.supplierId &lt;= #{dto.supplierId}
+            and oi.supplier_id = #{dto.supplierId}
         </if>
         ) t1
         GROUP BY
@@ -405,18 +515,47 @@
         sum(order_replace_fee) + sum(order_lack_fee_supplier) order_lack_fee_supplier,
         sum(order_num)-sum(order_lack_num) as real_sale_num,
         sum(sales_fee_supplier) sales_fee_supplier,
-        sum(order_supplier_price_amount) -   sum(order_check_fee) - sum(order_replace_fee) -  sum(order_lack_fee_supplier) -  sum(sales_fee_supplier) profitFeeAmount
+        sum(order_supplier_price_amount) -   sum(order_check_fee) - sum(order_replace_fee) -  sum(order_lack_fee_supplier) -  sum(sales_fee_supplier) profitFeeAmount,
+        case when  COUNT(CASE WHEN status_backend IS NULL THEN 1 ELSE NULL END)  = 0 Then '已完成' Else '进行中' end as settleStatus
         from(
         SELECT
-        oi.id,vor.*,p.name as supplierName
-        FROM   t_order_item oi
-        left join (<include refid="baseSupplierSql"></include>) vor
-        on oi.id =vor.order_item_id
+        oi.id,vor.*,p.name as supplierName,o.status_backend
+        FROM
+        (<include refid="baseSupplierSql"></include>) vor
+        left join t_order_item oi
+        on vor.order_item_id = oi.id
         left join t_supplier_info p
         on vor.supplier_id=p.id
         left join t_order o
         on vor.order_id= o.id
-        and o.status_backend not in ('PENDING','CANCEL','REFUND')
+--         and o.status_backend not in ('PENDING','CANCEL','REFUND')
+        )  s group by dateinfo,supplier_id
+    </select>
+
+    <select id="getOrderSupplierReport" resultType="com.mzl.flower.dto.response.report.OrderSupplierReportResultVO">
+        select
+        dateinfo,
+        supplier_id,
+        supplierName,
+        sum(order_supplier_price_amount) order_supplier_price_amount,
+        sum(order_check_fee) order_check_fee,
+        sum(order_replace_fee) + sum(order_lack_fee_supplier) order_lack_fee_supplier,
+        sum(order_num)-sum(order_lack_num) as real_sale_num,
+        sum(sales_fee_supplier) sales_fee_supplier,
+        sum(order_supplier_price_amount) -   sum(order_check_fee) - sum(order_replace_fee) -  sum(order_lack_fee_supplier) -  sum(sales_fee_supplier) profitFeeAmount,
+        case when  COUNT(CASE WHEN status_backend IS NULL THEN 1 ELSE NULL END)  = 0 Then '已完成' Else '进行中' end as settleStatus
+        from(
+        SELECT
+        oi.id,vor.*,p.name as supplierName,o.status_backend
+        FROM
+        (<include refid="baseSupplierSql"></include>) vor
+        left join t_order_item oi
+        on vor.order_item_id = oi.id
+        left join t_supplier_info p
+        on vor.supplier_id=p.id
+        left join t_order o
+        on vor.order_id= o.id
+--         and o.status_backend not in ('PENDING','CANCEL','REFUND')
         )  s group by dateinfo,supplier_id
     </select>
 
@@ -438,20 +577,150 @@
         sum(order_replace_fee) + sum(order_lack_fee_supplier) order_lack_fee_supplier,
         sum(order_num)-sum(order_lack_num) as real_sale_num,
         sum(sales_fee_supplier) sales_fee_supplier,
-        sum(order_supplier_price_amount) - sum(order_check_fee) - sum(order_replace_fee) - sum(order_lack_fee_supplier)
-        - sum(sales_fee_supplier) profitFeeAmount
+        sum(order_supplier_price_amount) -   sum(order_check_fee) - sum(order_replace_fee) -  sum(order_lack_fee_supplier) -  sum(sales_fee_supplier) profitFeeAmount
         from(
         SELECT
         oi.id,vor.*,p.name as supplierName
-        FROM t_order_item oi
-        left join (<include refid="baseSupplierSql"></include>) vor
-        on oi.id =vor.order_item_id
+        FROM
+        (<include refid="baseSupplierSql"></include>) vor
+        left join t_order_item oi
+        on vor.order_item_id = oi.id
         left join t_supplier_info p
         on vor.supplier_id=p.id
         left join t_order o
         on vor.order_id= o.id
-        and o.status_backend not in ('PENDING','CANCEL','REFUND')
-        )
-        ) s
+--         and o.status_backend not in ('PENDING','CANCEL','REFUND')
+        )  s group by dateinfo,supplier_id
+        ) s2
     </select>
+    <select id="getAppSupplierAmountStatistics"
+            resultType="com.mzl.flower.dto.response.report.AppSupplierStatisticsVO">
+        select
+          ( <include refid="all_supplier_amount"></include> ) as all_supplier_amount
+        , (	<include refid="cur_mon_supplier_amount"></include> ) as cur_mon_supplier_amount
+        , (	<include refid="last_mon_supplier_amount"></include> ) as last_mon_supplier_amount
+        , (	<include refid="today_supplier_amount"></include> ) as today_supplier_amount
+        , (	<include refid="cur_mon_lack_num"></include> ) as cur_mon_lack_num
+        , (	<include refid="last_mon_lack_num"></include> ) as last_mon_lack_num
+        , (	<include refid="cur_mon_reduce_num"></include> ) as cur_mon_reduce_num
+        , ( <include refid="last_mon_reduce_num"></include> ) as last_mon_reduce_num
+        , ( <include refid="cur_mon_replace_num"></include> ) as cur_mon_replace_num
+        , (	<include refid="last_mon_replace_num"></include> ) as last_mon_replace_num
+
+    </select>
+
+    <!--供应商总价款-->
+    <sql id="all_supplier_amount">
+        select IFNULL(sum(oi.supplier_price*oi.num),0) as supplier_amount from t_order_item oi where oi.supplier_id=287
+    </sql>
+    <!--本月成交:本月售卖的底价合计-->
+    <sql id="cur_mon_supplier_amount">
+        select IFNULL(sum(oi.supplier_price*oi.num),0) as cur_mon_supplier_amount
+        from t_order_item oi
+        left join t_order o
+        on oi.order_id = o.id
+        where oi.supplier_id = #{dto.supplierId}
+        and o.payment_time &gt; DATE_FORMAT(LAST_DAY(DATE_SUB(CURRENT_DATE(), INTERVAL 1 MONTH)), '%Y-%m-%d 17:00:00')
+        and o.payment_time &lt;= DATE_FORMAT(LAST_DAY(CURRENT_DATE()), '%Y-%m-%d 17:00:00')
+    </sql>
+    <!--上月成交:上月售卖的底价合计-->
+    <sql id="last_mon_supplier_amount">
+        select IFNULL(sum(oi.supplier_price*oi.num),0) as last_mon_supplier_amount
+        from t_order_item oi
+        left join t_order o
+        on oi.order_id = o.id
+        where oi.supplier_id =  #{dto.supplierId}
+        and o.payment_time &gt; DATE_FORMAT(LAST_DAY(DATE_SUB(CURRENT_DATE(), INTERVAL 2 MONTH)), '%Y-%m-%d 17:00:00')
+        and o.payment_time &lt;= DATE_FORMAT(DATE_SUB(DATE_FORMAT(CURRENT_DATE(), '%Y-%m-01'), INTERVAL 1 DAY), '%Y-%m-%d 17:00:00')
+    </sql>
+    <!--今日成交:今日售卖的底价合计 // todo 需要根据当前时间判断今日的开始时间和结束时间-->
+    <sql id="today_supplier_amount">
+        select IFNULL(sum(oi.supplier_price*oi.num),0) as today_supplier_amount
+        from t_order_item oi
+        left join t_order o
+        on oi.order_id = o.id
+        where oi.supplier_id =  #{dto.supplierId}
+        and o.payment_time &gt; #{dto.startDateTime}
+        and o.payment_time &lt;= #{dto.endDateTime}
+    </sql>
+    <!--缺货(本月):本月质检缺货,并且web端审核通过的数量合计-->
+    <sql id="cur_mon_lack_num">
+        select IFNULL(sum(oic.num),0) as cur_mon_lack_num
+        from t_order_item_check oic
+        left join t_order_item oi
+        on oic.order_item_id=oi.ID
+        left join t_order o
+        on oi.order_id = o.id
+        where oi.supplier_id =  #{dto.supplierId}
+        and oic.type = 'lack' and oic.audit_status='AGREED'
+        and o.payment_time &gt; DATE_FORMAT(LAST_DAY(DATE_SUB(CURRENT_DATE(), INTERVAL 1 MONTH)), '%Y-%m-%d 17:00:00')
+        and o.payment_time &lt;= DATE_FORMAT(LAST_DAY(CURRENT_DATE()), '%Y-%m-%d 17:00:00')
+    </sql>
+    <!--缺货(上月):上月质检缺货,并且web端审核通过的数量合计-->
+    <sql id="last_mon_lack_num">
+        select IFNULL(sum(oic.num),0) as last_mon_lack_num
+        from t_order_item_check oic
+        left join t_order_item oi
+        on oic.order_item_id=oi.ID
+        left join t_order o
+        on oi.order_id = o.id
+        where oi.supplier_id =  #{dto.supplierId}
+        and oic.type = 'lack' and oic.audit_status='AGREED'
+        and o.payment_time &gt; DATE_FORMAT(LAST_DAY(DATE_SUB(CURRENT_DATE(), INTERVAL 2 MONTH)), '%Y-%m-%d 17:00:00')
+        and o.payment_time &lt;= DATE_FORMAT(DATE_SUB(DATE_FORMAT(CURRENT_DATE(), '%Y-%m-01'), INTERVAL 1 DAY), '%Y-%m-%d 17:00:00')
+    </sql>
+    <!--降级(本月):本月质检降级,并且web端审核通过的数量合计-->
+    <sql id="cur_mon_reduce_num">
+        select IFNULL(sum(oic.num),0) as cur_mon_reduce_num
+        from t_order_item_check oic
+        left join t_order_item oi
+        on oic.order_item_id=oi.ID
+        left join t_order o
+        on oi.order_id = o.id
+        where oi.supplier_id =  #{dto.supplierId}
+        and oic.type = 'reduce' and oic.audit_status='AGREED'
+        and o.payment_time &gt; DATE_FORMAT(LAST_DAY(DATE_SUB(CURRENT_DATE(), INTERVAL 1 MONTH)), '%Y-%m-%d 17:00:00')
+        and o.payment_time &lt;= DATE_FORMAT(LAST_DAY(CURRENT_DATE()), '%Y-%m-%d 17:00:00')
+    </sql>
+
+<!--    降级(上月):上月质检降级,并且web端审核通过的数量合计-->
+    <sql id="last_mon_reduce_num">
+        select IFNULL(sum(oic.num),0) as last_mon_reduce_num
+        from t_order_item_check oic
+        left join t_order_item oi
+        on oic.order_item_id=oi.ID
+        left join t_order o
+        on oi.order_id = o.id
+        where oi.supplier_id =  #{dto.supplierId}
+        and oic.type = 'reduce' and oic.audit_status='AGREED'
+        and o.payment_time &gt; DATE_FORMAT(LAST_DAY(DATE_SUB(CURRENT_DATE(), INTERVAL 2 MONTH)), '%Y-%m-%d 17:00:00')
+        and o.payment_time &lt;= DATE_FORMAT(DATE_SUB(DATE_FORMAT(CURRENT_DATE(), '%Y-%m-01'), INTERVAL 1 DAY), '%Y-%m-%d 17:00:00')
+    </sql>
+<!--    补货(本月):本月质检补货,并且web端审核通过的数量合计-->
+    <sql id="cur_mon_replace_num">
+        select IFNULL(sum(oic.num),0) as cur_mon_replace_num
+        from t_order_item_check oic
+        left join t_order_item oi
+        on oic.order_item_id=oi.ID
+        left join t_order o
+        on oi.order_id = o.id
+        where oi.supplier_id =  #{dto.supplierId}
+        and oic.type = 'replace' and oic.audit_status='AGREED'
+        and o.payment_time &gt; DATE_FORMAT(LAST_DAY(DATE_SUB(CURRENT_DATE(), INTERVAL 1 MONTH)), '%Y-%m-%d 17:00:00')
+        and o.payment_time &lt;= DATE_FORMAT(LAST_DAY(CURRENT_DATE()), '%Y-%m-%d 17:00:00')
+    </sql>
+   <!-- 补货(上月):上月质检补货,并且web端审核通过的数量合计-->
+    <sql id="last_mon_replace_num">
+        select IFNULL(sum(oic.num),0) as last_mon_replace_num
+        from t_order_item_check oic
+        left join t_order_item oi
+        on oic.order_item_id=oi.ID
+        left join t_order o
+        on oi.order_id = o.id
+        where oi.supplier_id =  #{dto.supplierId}
+        and oic.type = 'replace' and oic.audit_status='AGREED'
+        and o.payment_time &gt; DATE_FORMAT(LAST_DAY(DATE_SUB(CURRENT_DATE(), INTERVAL 2 MONTH)), '%Y-%m-%d 17:00:00')
+        and o.payment_time &lt;= DATE_FORMAT(DATE_SUB(DATE_FORMAT(CURRENT_DATE(), '%Y-%m-01'), INTERVAL 1 DAY), '%Y-%m-%d 17:00:00')
+    </sql>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3