Merge remote-tracking branch 'origin/master'

廖井涛

2025-08-25 fec9f42e00f2df68a2a20cbf132b17bdeed8e63a

 north-glass-erp/src/main/resources/mapper/sd/OrderOtherMoneyMapper.xml

@@ -6,21 +6,21 @@
    <select id="findById">
        select
            a.order_id,
            a.`column`,
            b.`column`,
            a.quantity,
            a.price,
            a.money,
            a.create_time,
            b.alias,
            b.id
        from order_other_money as a
        left join  basic_other_money as b
        on a.`column` = b.`column`
        where a.order_id = #{orderId}
        from basic_other_money as b
        left join  order_other_money as a
        on a.`column` = b.`column` and a.order_id = #{orderId}
        where b.`column` like 'M%' and b.state=1
    </select>

    <select id="selectGrossAmount">
        select sum(money) from order_other_money where order_id = #{orderId}
        select ifnull(sum(money),0) from order_other_money where order_id = #{orderId}

    </select>