Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyujie

2025-12-18 b0a4de74b47e2626f51eb4a844db3e62f6a4bf9d

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

@@ -5,12 +5,23 @@
<mapper namespace="com.example.erp.mapper.sd.OrderOtherMoneyMapper">
    <select id="findById">
        select
            a.*,
            b.alias
        from order_other_money as a
        left join  basic_other_money as b
        on a.`column` = b.`column`
        where a.order_id = #{orderId}
            a.order_id,
            b.`column`,
            a.quantity,
            a.price,
            a.money,
            a.create_time,
            b.alias,
            b.id
        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 ifnull(sum(money),0) from order_other_money where order_id = #{orderId}

    </select>