1.花材统计报表：增加父类名称

陶杰

2024-12-21 ae3dd677f3bbbc26d7c41aebc0e6048e2d20593c

 src/main/resources/mapper/payment/OrderSettlementDetailMapper.xml

@@ -3,7 +3,7 @@
<mapper namespace="com.mzl.flower.mapper.payment.OrderSettlementDetailMapper">

    <select id="selectSettlementDetailList" resultType="com.mzl.flower.dto.response.payment.OrderSettlementDetailDTO">
        SELECT s.*, oi.flower_name, oi.flower_level, o.receive_time, oi.check_time
        SELECT s.*, oi.flower_name, oi.flower_level, o.receive_time, oi.check_time, o.order_no, s.order_id
        FROM t_order_settlement_detail s
        join t_order_item oi on oi.id = s.order_item_id
        join t_order o on o.id = s.order_id
@@ -12,4 +12,18 @@
        ORDER BY o.receive_time desc, o.id, oi.flower_name
    </select>


    <select id="selectSettlementDetailLists" resultType="com.mzl.flower.dto.response.payment.OrderSettlementDetailDTO">
        SELECT s.*, oi.flower_name, oi.flower_level, o.receive_time, oi.check_time, o.order_no, s.order_id, oi.supplier_id
        FROM t_order_settlement_detail s
                 join t_order_item oi on oi.id = s.order_item_id
                 join t_order o on o.id = s.order_id
                 join t_order_settlement os on os.id = s.settlement_id
        WHERE s.deleted = 0
          and  o.status = 'COMPLETED'
          AND os.type = 'supplier'
          AND os.status in  ('PENDING','FAILED')
        ORDER BY o.receive_time desc, o.id, oi.flower_name
    </select>

</mapper>