From 9483bb48991aaf01b8c287af8cfe93e1f1365a22 Mon Sep 17 00:00:00 2001 From: caojia <1301869380@qq.com> Date: Tue, 17 Nov 2026 11:24:23 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E5=BA=94=E6=94=B6=E8=B4=A6?= =?UTF-8?q?=E5=8D=95=E8=AE=A1=E8=B4=B9=E9=87=8D=E4=BC=98=E5=85=88=E5=8F=96?= =?UTF-8?q?=20charge=5Fweight=EF=BC=8C=E7=A9=BA=E5=80=BC=E5=9B=9E=E9=80=80?= =?UTF-8?q?=20weight?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/price/PrcOrderBillMapper.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bms-back/bms-system/src/main/resources/mapper/price/PrcOrderBillMapper.xml b/bms-back/bms-system/src/main/resources/mapper/price/PrcOrderBillMapper.xml index 51a928c6..9a16173e 100644 --- a/bms-back/bms-system/src/main/resources/mapper/price/PrcOrderBillMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/price/PrcOrderBillMapper.xml @@ -104,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from prc_order_bill p - + select p.bill_id, p.bill_key, p.order_no, p.tracking_no, p.transfer_no, p.belong_saler, p.belong_saler_code, p.settlement_man, p.settlement_man_code, p.service_man, p.service_man_code, @@ -114,7 +114,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" p.product_code, p.product_name, p.country_code, p.country_name, p.weight, p.biz_date, p.tms_id, p.product_floor_code, p.product_floor, p.price_set_id, p.price_set_code, p.price_set_name, p.set_type, p.bind_priority, p.customer_priceset_id, p.psv_id, p.psd_id, - p.weight_min, p.weight_max, p.weight_label, p.effective_date, p.charge_weight, + p.weight_min, p.weight_max, p.weight_label, p.effective_date, + coalesce(p.charge_weight, p.weight) as charge_weight, p.freight_rate, p.base_freight_rate, p.discount_percent, p.registration_fee, p.freight_amount, p.surcharge_amount, (select coalesce(sum(f.amount), 0)