应付费用重算优化以及样式调整

This commit is contained in:
liuminghui
2026-11-17 10:16:00 +08:00
parent f00f8c619a
commit 54ac6428e7
20 changed files with 1496 additions and 200 deletions
@@ -16,6 +16,8 @@
p.currency as currency,
b.pay_calc_status as payCalcStatus,
b.pay_calc_msg as payCalcMsg,
b.update_by as updateBy,
b.update_time as updateTime,
p.biz_date as bizDate
from prc_order_bill p
left join prc_order_bill_ext e on e.bill_id = p.bill_id
@@ -11,23 +11,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="feeName" column="fee_name" />
<result property="amount" column="amount" />
<result property="currency" column="currency" />
<result property="beforeFeeName" column="before_fee_name" />
<result property="beforeAmount" column="before_amount" />
<result property="beforeCurrency" column="before_currency" />
<result property="afterFeeName" column="after_fee_name" />
<result property="afterAmount" column="after_amount" />
<result property="afterCurrency" column="after_currency" />
<result property="operationType" column="operation_type" />
<result property="remark" column="remark" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
</resultMap>
<insert id="insertBatch">
insert into prc_pay_bill_fee_log (
fee_id, bill_id, fee_name, amount, currency, operation_type, create_by, create_time
fee_id, bill_id, fee_name, amount, currency,
before_fee_name, before_amount, before_currency,
after_fee_name, after_amount, after_currency,
operation_type, remark, create_by, create_time
) values
<foreach collection="list" item="item" separator=",">
(#{item.feeId}, #{item.billId}, #{item.feeName}, #{item.amount}, #{item.currency},
#{item.operationType}, #{item.createBy}, sysdate())
#{item.beforeFeeName}, #{item.beforeAmount}, #{item.beforeCurrency},
#{item.afterFeeName}, #{item.afterAmount}, #{item.afterCurrency},
#{item.operationType}, #{item.remark}, #{item.createBy}, sysdate())
</foreach>
</insert>
<select id="selectByBillId" resultMap="PrcPayBillFeeLogResult">
select log_id, fee_id, bill_id, fee_name, amount, currency, operation_type, create_by, create_time
select log_id, fee_id, bill_id, fee_name, amount, currency,
before_fee_name, before_amount, before_currency,
after_fee_name, after_amount, after_currency,
operation_type, remark, create_by, create_time
from prc_pay_bill_fee_log
where bill_id = #{billId}
order by log_id desc
@@ -28,10 +28,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="feeItemName">
case
when f.fee_source = 'MANUAL' and nullif(trim(f.fee_name), '') is not null then f.fee_name
when f.fee_source = 'LADING' and nullif(trim(air_sc.sc_name), '') is not null then air_sc.sc_name
when f.fee_type = 'SURCHARGE' and nullif(trim(item_sc.sc_name), '') is not null then item_sc.sc_name
when nullif(trim(f.fee_name), '') is not null then f.fee_name
when f.fee_source = 'LADING' and nullif(trim(air_sc.sc_name), '') is not null then air_sc.sc_name
when f.fee_type = 'SURCHARGE' and nullif(trim(pay_sc.fee_name), '') is not null then pay_sc.fee_name
when f.fee_type = 'SURCHARGE' and nullif(trim(item_sc.sc_name), '') is not null then item_sc.sc_name
when f.fee_type = 'BASIC_FREIGHT' then '基础运费'
when nullif(trim(dict.dict_label), '') is not null then dict.dict_label
else f.fee_type
end
@@ -40,7 +41,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="feeItemJoin">
left join srv_bill_air_fee air on f.fee_source = 'LADING' and air.id = f.sc_id
left join prc_surcharge air_sc on air_sc.sc_id = air.sc_id
left join prc_surcharge item_sc on ifnull(f.fee_source, '') &lt;&gt; 'LADING' and item_sc.sc_id = f.sc_id
left join pay_surcharge pay_sc on f.fee_type = 'SURCHARGE' and ifnull(f.fee_source, '') &lt;&gt; 'LADING' and pay_sc.surcharge_id = f.sc_id
left join prc_surcharge item_sc on f.fee_type = 'SURCHARGE' and ifnull(f.fee_source, '') &lt;&gt; 'LADING' and item_sc.sc_id = f.sc_id
left join sys_dict_data dict on dict.dict_type = 'bms_fee_type' and dict.dict_value = f.fee_type
</sql>
@@ -89,21 +91,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertPrcPayBillFee" parameterType="PrcPayBillFee">
insert into prc_pay_bill_fee (
fee_id, bill_id, pay_bill_id, fee_type, sc_id, fee_level, amount, currency, round_mode, remark,
fee_id, bill_id, pay_bill_id, fee_type, fee_name, sc_id, fee_level, amount, currency, round_mode, remark,
fee_source, source_id, is_deleted, create_time
) values (
#{feeId}, #{billId}, #{payBillId}, #{feeType}, #{scId}, #{feeLevel}, #{amount}, #{currency}, #{roundMode}, #{remark},
#{feeId}, #{billId}, #{payBillId}, #{feeType}, #{feeName}, #{scId}, #{feeLevel}, #{amount}, #{currency}, #{roundMode}, #{remark},
ifnull(#{feeSource}, 'CALC'), #{sourceId}, ifnull(#{isDeleted}, '0'), sysdate()
)
</insert>
<insert id="insertBatch" parameterType="java.util.List">
insert into prc_pay_bill_fee (
fee_id, bill_id, pay_bill_id, fee_type, sc_id, fee_level, amount, currency, round_mode, remark,
fee_id, bill_id, pay_bill_id, fee_type, fee_name, sc_id, fee_level, amount, currency, round_mode, remark,
fee_source, source_id, is_deleted, create_time
) values
<foreach collection="list" item="item" separator=",">
(#{item.feeId}, #{item.billId}, #{item.payBillId}, #{item.feeType}, #{item.scId}, #{item.feeLevel},
(#{item.feeId}, #{item.billId}, #{item.payBillId}, #{item.feeType}, #{item.feeName}, #{item.scId}, #{item.feeLevel},
#{item.amount}, #{item.currency}, #{item.roundMode}, #{item.remark}, ifnull(#{item.feeSource}, 'CALC'),
#{item.sourceId}, ifnull(#{item.isDeleted}, '0'), sysdate())
</foreach>