wuweihua/BMS
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增按国家去重区块标题接口，优化计费列表请求方式

Browse Source
This commit is contained in:
wuweihua
2026-11-12 13:45:09 +08:00
parent d2c75e0c51
commit cf336f7a67
22 changed files with 436 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bms-back/bms-system/src/main/resources/mapper/price/PayPostcodeMapper.xml
+20
View File
@@ -30,6 +30,26 @@
order by group_id desc
</select>
<select id="selectBlockTitlesByCountry" resultType="string">
select distinct block_title
from pay_postcode_group
where block_title is not null
and block_title &lt;&gt; ''
<if test="countryCode != null and countryCode != ''">
and (
upper(ifnull(country_code, '')) = upper(#{countryCode})
or upper(ifnull(catalog_country, '')) = upper(#{countryCode})
)
</if>
<if test="countryName != null and countryName != ''">
and (
country_name like concat('%', #{countryName}, '%')
or catalog_country like concat('%', #{countryName}, '%')
)
</if>
order by block_title asc
</select>
<select id="selectLineList" parameterType="com.bms.price.domain.PayPostcodeLine" resultType="com.bms.price.domain.PayPostcodeLine">
select line_id as lineId, group_id as groupId, country_name as countryName, country_code as countryCode,
region_name as regionName, region_name_cn as regionNameCn, city_name as cityName, region_code as regionCode,
bms-back/bms-system/src/main/resources/mapper/price/PrcSurchargeMapper.xml
+14 -2
View File
@@ -9,12 +9,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="scName" column="sc_name" />
<result property="feeType" column="fee_type" />
<result property="chargeType" column="charge_type" />
<result property="dictValue" column="dict_value" />
<result property="chargeValue" column="charge_value" />
<result property="currency" column="currency" />
<result property="roundMode" column="round_mode" />
<result property="ssCode" column="ss_code" />
<result property="isDel" column="is_del" />
<result property="countryCode" column="country_code" />
<result property="blockTitle" column="block_title" />
<result property="scNote" column="sc_note" />
<result property="tmsId" column="tms_id" />
<result property="createBy" column="created_by" />
@@ -24,8 +26,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectPrcSurchargeVo">
select sc_id, sc_name, fee_type, charge_type, charge_value, currency, round_mode, ss_code, is_del,
country_code, sc_note, tms_id, created_by, create_time, updated_by, update_time
select sc_id, sc_name, fee_type, charge_type, dict_value, charge_value, currency, round_mode,
ss_code, is_del, country_code, block_title, sc_note, tms_id, created_by, create_time, updated_by, update_time
from prc_surcharge
</sql>
@@ -55,6 +57,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="chargeType != null and chargeType != ''">
AND charge_type = #{chargeType}
</if>
<if test="dictValue != null and dictValue != ''">
AND dict_value = #{dictValue}
</if>
<if test="blockTitle != null and blockTitle != ''">
AND block_title like concat('%', #{blockTitle}, '%')
</if>
<if test="roundMode != null and roundMode != ''">
AND round_mode = #{roundMode}
</if>
@@ -82,12 +90,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="scName != null and scName != ''">sc_name,</if>
<if test="feeType != null and feeType != ''">fee_type,</if>
<if test="chargeType != null and chargeType != ''">charge_type,</if>
<if test="dictValue != null">dict_value,</if>
<if test="chargeValue != null">charge_value,</if>
<if test="currency != null and currency != ''">currency,</if>
<if test="roundMode != null and roundMode != ''">round_mode,</if>
<if test="ssCode != null and ssCode != ''">ss_code,</if>
is_del,
<if test="countryCode != null">country_code,</if>
<if test="blockTitle != null">block_title,</if>
<if test="scNote != null">sc_note,</if>
<if test="tmsId != null">tms_id,</if>
<if test="createBy != null and createBy != ''">created_by,</if>
@@ -96,12 +106,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="scName != null and scName != ''">#{scName},</if>
<if test="feeType != null and feeType != ''">#{feeType},</if>
<if test="chargeType != null and chargeType != ''">#{chargeType},</if>
<if test="dictValue != null">#{dictValue},</if>
<if test="chargeValue != null">#{chargeValue},</if>
<if test="currency != null and currency != ''">#{currency},</if>
<if test="roundMode != null and roundMode != ''">#{roundMode},</if>
<if test="ssCode != null and ssCode != ''">#{ssCode},</if>
ifnull(#{isDel}, '0'),
<if test="countryCode != null">#{countryCode},</if>
<if test="blockTitle != null">#{blockTitle},</if>
<if test="scNote != null">#{scNote},</if>
<if test="tmsId != null">#{tmsId},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>