From 78ee8ee2da738aa0d91a4d4d9ec489eb5ae09a59 Mon Sep 17 00:00:00 2001 From: wuweihua <88888888> Date: Mon, 14 Sep 2026 09:13:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/price/BmsProductCountryMapper.xml | 10 ++-- .../mapper/price/BmsProductMapper.xml | 12 ++-- .../mapper/price/PrcBillFeeMapper.xml | 8 +-- .../resources/mapper/price/PrcBillMapper.xml | 18 +++--- .../price/PrcCustomerPriceSetMapper.xml | 14 ++--- .../mapper/price/PrcPriceSetDetailMapper.xml | 10 ++-- .../mapper/price/PrcPriceSetMapper.xml | 12 ++-- .../mapper/price/PrcQuoteFeeMapper.xml | 8 +-- .../resources/mapper/price/PrcQuoteMapper.xml | 14 ++--- .../mapper/price/PrcSurchargeMapper.xml | 10 ++-- .../mapper/price/PrcSurchargeRelMapper.xml | 8 +-- .../price/PrcWeightSectionDetailMapper.xml | 10 ++-- .../price/PrcWeightSectionTemplateMapper.xml | 10 ++-- .../mapper/price/XtdZoneCountryMapper.xml | 10 ++-- .../mapper/price/XtdZoneDivisionMapper.xml | 10 ++-- .../mapper/price/XtdZoneSchemeMapper.xml | 10 ++-- bms-back/sql/price/bill.sql | 6 +- bms-back/sql/price/price_set.sql | 12 ++-- bms-back/sql/price/product.sql | 8 +-- bms-back/sql/price/quote_fee.sql | 6 +- bms-back/sql/price/quote_uuid_backup.sql | 6 +- .../sql/price/rename_create_update_time.sql | 57 +++++++++++++++++++ bms-back/sql/price/surcharge.sql | 4 +- bms-back/sql/price/surcharge_rel.sql | 4 +- bms-back/sql/price/zone_weight.sql | 20 +++---- 25 files changed, 177 insertions(+), 120 deletions(-) create mode 100644 bms-back/sql/price/rename_create_update_time.sql diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/price/BmsProductCountryMapper.xml b/bms-back/ruoyi-system/src/main/resources/mapper/price/BmsProductCountryMapper.xml index 6d1c959f..281eea16 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/price/BmsProductCountryMapper.xml +++ b/bms-back/ruoyi-system/src/main/resources/mapper/price/BmsProductCountryMapper.xml @@ -20,15 +20,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - + + select detail_id, product_id, product_code, country_name, country_code, weight_min, weight_max, freight_price, registration_fee, size_limit, last_mile, lead_time, - effective_date, expire_date, status, created_at, updated_at + effective_date, expire_date, status, create_time, update_time from bms_product_country @@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into bms_product_country ( product_id, product_code, country_name, country_code, weight_min, weight_max, freight_price, registration_fee, size_limit, last_mile, lead_time, - effective_date, expire_date, status, created_at + effective_date, expire_date, status, create_time ) values ( #{productId}, #{productCode}, #{countryName}, #{countryCode}, #{weightMin}, #{weightMax}, #{freightPrice}, #{registrationFee}, #{sizeLimit}, #{lastMile}, #{leadTime}, @@ -114,7 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update bms_product_country set expire_date = #{newEffectiveDate}, - updated_at = sysdate() + update_time = sysdate() where product_code = #{productCode} and expire_date is null and (effective_date is null or effective_date < #{newEffectiveDate}) diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/price/BmsProductMapper.xml b/bms-back/ruoyi-system/src/main/resources/mapper/price/BmsProductMapper.xml index bebb6a78..5aec79ee 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/price/BmsProductMapper.xml +++ b/bms-back/ruoyi-system/src/main/resources/mapper/price/BmsProductMapper.xml @@ -20,9 +20,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select p.product_id, p.product_code, p.product_name, p.service_level, p.cargo_attr, p.dest_region, p.update_note, p.tax_mode, p.effective_date, p.expire_date, p.status, - p.source_sheet, p.remark, p.tms_id, p.created_by, p.created_at, p.updated_by, p.updated_at, + p.source_sheet, p.remark, p.tms_id, p.created_by, p.create_time, p.updated_by, p.update_time, (select count(distinct c.country_name) from bms_product_country c where c.product_id = p.product_id or (c.product_id is null and c.product_code = p.product_code @@ -123,7 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" remark, tms_id, created_by, - created_at + create_time ) values ( #{productCode}, #{productName}, @@ -160,7 +160,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" remark = #{remark}, tms_id = #{tmsId}, updated_by = #{updateBy}, - updated_at = sysdate() + update_time = sysdate() where product_id = #{productId} @@ -175,7 +175,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update bms_product set expire_date = #{newEffectiveDate}, - updated_at = sysdate() + update_time = sysdate() where product_code = #{productCode} and expire_date is null and (effective_date is null or effective_date < #{newEffectiveDate}) diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcBillFeeMapper.xml b/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcBillFeeMapper.xml index 5875acad..9eff5768 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcBillFeeMapper.xml +++ b/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcBillFeeMapper.xml @@ -14,11 +14,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -133,7 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" weight_min, weight_max, weight_label, effective_date, charge_weight, freight_rate, base_freight_rate, discount_percent, registration_fee, freight_amount, surcharge_amount, payable_total, currency, round_mode, - created_at + create_time ) values ( #{billId}, #{billKey}, #{orderNo}, #{trackingNo}, #{customerId}, #{customerCode}, #{customerName}, #{pieces}, #{actualWeight}, #{volume}, #{volumeWeight}, #{pkgLength}, #{pkgWidth}, #{pkgHeight}, @@ -198,7 +198,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" payable_total = #{payableTotal}, currency = #{currency}, round_mode = #{roundMode}, - updated_at = sysdate() + update_time = sysdate() where bill_id = #{billId} @@ -206,7 +206,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update prc_bill set surcharge_amount = #{surchargeAmount}, payable_total = #{payableTotal}, - updated_at = sysdate() + update_time = sysdate() where bill_id = #{billId} diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcCustomerPriceSetMapper.xml b/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcCustomerPriceSetMapper.xml index cc463d8e..31570ad7 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcCustomerPriceSetMapper.xml +++ b/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcCustomerPriceSetMapper.xml @@ -15,15 +15,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + select customer_priceset_id, price_set_id, customer_id, customer_code, customer_name, bind_priority, pr_begindate, pr_enddate, price_set_note, - created_by, created_at, updated_by, updated_at + created_by, create_time, updated_by, update_time from prc_customer_price_set @@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select c.customer_priceset_id, c.price_set_id, c.customer_id, c.customer_code, c.customer_name, c.bind_priority, c.pr_begindate, c.pr_enddate, c.price_set_note, - c.created_by, c.created_at, c.updated_by, c.updated_at + c.created_by, c.create_time, c.updated_by, c.update_time from prc_customer_price_set c inner join prc_price_set s on s.price_set_id = c.price_set_id where c.customer_code = #{customerCode} @@ -127,7 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" pr_enddate, price_set_note, created_by, - created_at + create_time ) values ( #{priceSetId}, #{customerId}, @@ -153,7 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" pr_enddate = #{prEnddate}, price_set_note = #{priceSetNote}, updated_by = #{updateBy}, - updated_at = sysdate() + update_time = sysdate() where customer_priceset_id = #{customerPricesetId} diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcPriceSetDetailMapper.xml b/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcPriceSetDetailMapper.xml index 4b845448..e4cd50b6 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcPriceSetDetailMapper.xml +++ b/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcPriceSetDetailMapper.xml @@ -20,14 +20,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - + + select psd_id, price_set_id, product_code, product_name, country_code, country_name, zd_id, wsd_id, weight_label, product_country_id, fv_value, fv_registration_fee, - discount_value, round_mode, pr_id, created_at, updated_at + discount_value, round_mode, pr_id, create_time, update_time from prc_price_set_detail @@ -76,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" discount_value, round_mode, pr_id, - created_at + create_time ) values ( #{priceSetId}, #{productCode}, @@ -112,7 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" discount_value = #{discountValue}, round_mode = #{roundMode}, pr_id = #{prId}, - updated_at = sysdate() + update_time = sysdate() where psd_id = #{psdId} diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcPriceSetMapper.xml b/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcPriceSetMapper.xml index 6a3c5e0f..2e190a16 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcPriceSetMapper.xml +++ b/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcPriceSetMapper.xml @@ -18,9 +18,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select s.price_set_id, s.price_set_code, s.price_set_name, s.price_set_note, s.set_type, s.default_discount, s.default_type, s.calculate_sign, s.effective_date, s.expire_date, s.status, s.tms_id, - s.created_by, s.created_at, s.updated_by, s.updated_at, + s.created_by, s.create_time, s.updated_by, s.update_time, (select count(distinct d.product_code) from prc_price_set_detail d where d.price_set_id = s.price_set_id) as product_count, (select count(1) from prc_customer_price_set c where c.price_set_id = s.price_set_id) as customer_count from prc_price_set s @@ -98,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" status, tms_id, created_by, - created_at + create_time ) values ( #{priceSetCode}, #{priceSetName}, @@ -131,7 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" status = #{status}, tms_id = #{tmsId}, updated_by = #{updateBy}, - updated_at = sysdate() + update_time = sysdate() where price_set_id = #{priceSetId} @@ -141,7 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" status = #{status}, updated_by = #{updateBy}, - updated_at = sysdate() + update_time = sysdate() where price_set_id = #{priceSetId} diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcQuoteFeeMapper.xml b/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcQuoteFeeMapper.xml index 5a2efcd2..fc4a5be4 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcQuoteFeeMapper.xml +++ b/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcQuoteFeeMapper.xml @@ -14,11 +14,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - +