fix: id

cloudroam

2024-10-22 f2846e7b5bcdc041fcb77dfec1ca6a164ca30aa7

 src/main/resources/mapper/report/OrderReportMapper.xml

@@ -17,7 +17,7 @@
        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) + sum(order_fee_packing_transport)  as order_fee_platform,
        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,
@@ -264,7 +264,7 @@
        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,
@@ -593,4 +593,134 @@
        )  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>