修改套餐价格

This commit is contained in:
wuweihua
2026-09-16 17:14:19 +08:00
parent 7172621fd3
commit 4441aa12bf
48 changed files with 4258 additions and 682 deletions
@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="PrcPriceSetDetail" id="PrcPriceSetDetailResult">
<id property="psdId" column="psd_id" />
<result property="priceSetId" column="price_set_id" />
<result property="psvId" column="psv_id" />
<result property="productCode" column="product_code" />
<result property="productName" column="product_name" />
<result property="countryCode" column="country_code" />
@@ -17,21 +18,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="zdId" column="zd_id" />
<result property="wsdId" column="wsd_id" />
<result property="weightLabel" column="weight_label" />
<result property="weightMin" column="weight_min" />
<result property="weightMax" column="weight_max" />
<result property="productCountryId" column="product_country_id" />
<result property="fvValue" column="fv_value" />
<result property="fvRegistrationFee" column="fv_registration_fee" />
<result property="discountValue" column="discount_value" />
<result property="roundMode" column="round_mode" />
<result property="prId" column="pr_id" />
<result property="effectiveDate" column="effective_date" />
<result property="expireDate" column="expire_date" />
<result property="createTime" column="create_time" />
<result property="updateTime" column="update_time" />
</resultMap>
<sql id="selectPrcPriceSetDetailVo">
select psd_id, price_set_id, product_code, product_name, country_code, country_name,
select psd_id, price_set_id, psv_id, product_code, product_name, country_code, country_name,
zone_id, zone_code, zone_name,
zd_id, wsd_id, weight_label, product_country_id, fv_value, fv_registration_fee,
discount_value, round_mode, pr_id, create_time, update_time
zd_id, wsd_id, weight_label, weight_min, weight_max, product_country_id, fv_value, fv_registration_fee,
discount_value, round_mode, pr_id, effective_date, expire_date, create_time, update_time
from prc_price_set_detail
</sql>
@@ -46,6 +51,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="priceSetId != null">
AND price_set_id = #{priceSetId}
</if>
<if test="psvId != null">
AND psv_id = #{psvId}
</if>
<if test="productCode != null and productCode != ''">
AND product_code = #{productCode}
</if>
@@ -55,6 +63,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="zoneCode != null and zoneCode != ''">
AND zone_code = #{zoneCode}
</if>
<if test="keyword != null and keyword != ''">
AND (
product_code like concat('%', #{keyword}, '%')
or product_name like concat('%', #{keyword}, '%')
or country_code like concat('%', #{keyword}, '%')
or country_name like concat('%', #{keyword}, '%')
or zone_code like concat('%', #{keyword}, '%')
or zone_name like concat('%', #{keyword}, '%')
or weight_label like concat('%', #{keyword}, '%')
)
</if>
</where>
order by psd_id asc
</select>
@@ -67,9 +86,90 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select count(1) from prc_price_set_detail where price_set_id = #{priceSetId}
</select>
<select id="countByPsvId" parameterType="Long" resultType="int">
select count(1) from prc_price_set_detail where psv_id = #{psvId}
</select>
<!-- FIXED: join active products + country by product_id only (avoid OR-join row explosion) -->
<insert id="insertFixedDetailsFromLibrary">
insert ignore into prc_price_set_detail (
price_set_id, psv_id, product_code, product_name,
country_code, country_name, zone_id, zone_code, zone_name,
weight_label, weight_min, weight_max, product_country_id,
fv_value, fv_registration_fee, round_mode,
effective_date, expire_date, create_time
)
select
#{priceSetId},
#{psvId},
p.product_code,
p.product_name,
c.country_code,
c.country_name,
c.zone_id,
c.zone_code,
c.zone_name,
case
when c.weight_min is null and c.weight_max is null then null
else concat(
ifnull(trim(trailing '0' from trim(trailing '.' from cast(c.weight_min as char))), ''),
'&lt;W≤',
ifnull(trim(trailing '0' from trim(trailing '.' from cast(c.weight_max as char))), '')
)
end,
c.weight_min,
c.weight_max,
c.detail_id,
c.freight_price,
c.registration_fee,
'HALF_UP',
c.effective_date,
c.expire_date,
sysdate()
from bms_product p
inner join bms_product_country c on c.product_id = p.product_id
where p.status = '1'
and p.product_id = (
select max(p2.product_id) from bms_product p2
where p2.product_code = p.product_code and p2.status = '1'
)
and ifnull(c.status, '1') &lt;&gt; '2'
<choose>
<when test="openOnly">
and (c.expire_date is null or date(c.expire_date) &gt; curdate())
</when>
<otherwise>
and date(c.effective_date) &lt;= date(#{asOf})
and (c.expire_date is null or date(c.expire_date) &gt; date(#{asOf}))
</otherwise>
</choose>
order by p.product_code asc, c.country_name asc, c.zone_code asc, c.weight_min asc, c.detail_id asc
</insert>
<insert id="insertDiscountDetailsFromLibrary">
insert ignore into prc_price_set_detail (
price_set_id, psv_id, product_code, product_name, round_mode, create_time
)
select
#{priceSetId},
#{psvId},
p.product_code,
p.product_name,
'HALF_UP',
sysdate()
from bms_product p
where p.status = '1'
and p.product_id = (
select max(p2.product_id) from bms_product p2
where p2.product_code = p.product_code and p2.status = '1'
)
order by p.product_code asc
</insert>
<insert id="insertPrcPriceSetDetail" parameterType="PrcPriceSetDetail" useGeneratedKeys="true" keyProperty="psdId">
insert into prc_price_set_detail (
<if test="priceSetId != null">price_set_id,</if>
<if test="psvId != null">psv_id,</if>
<if test="productCode != null and productCode != ''">product_code,</if>
<if test="productName != null">product_name,</if>
<if test="countryCode != null">country_code,</if>
@@ -80,15 +180,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="zdId != null">zd_id,</if>
<if test="wsdId != null">wsd_id,</if>
<if test="weightLabel != null">weight_label,</if>
<if test="weightMin != null">weight_min,</if>
<if test="weightMax != null">weight_max,</if>
<if test="productCountryId != null">product_country_id,</if>
<if test="fvValue != null">fv_value,</if>
<if test="fvRegistrationFee != null">fv_registration_fee,</if>
<if test="discountValue != null">discount_value,</if>
<if test="roundMode != null and roundMode != ''">round_mode,</if>
<if test="prId != null">pr_id,</if>
<if test="effectiveDate != null">effective_date,</if>
expire_date,
create_time
) values (
<if test="priceSetId != null">#{priceSetId},</if>
<if test="psvId != null">#{psvId},</if>
<if test="productCode != null and productCode != ''">#{productCode},</if>
<if test="productName != null">#{productName},</if>
<if test="countryCode != null">#{countryCode},</if>
@@ -99,12 +204,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="zdId != null">#{zdId},</if>
<if test="wsdId != null">#{wsdId},</if>
<if test="weightLabel != null">#{weightLabel},</if>
<if test="weightMin != null">#{weightMin},</if>
<if test="weightMax != null">#{weightMax},</if>
<if test="productCountryId != null">#{productCountryId},</if>
<if test="fvValue != null">#{fvValue},</if>
<if test="fvRegistrationFee != null">#{fvRegistrationFee},</if>
<if test="discountValue != null">#{discountValue},</if>
<if test="roundMode != null and roundMode != ''">#{roundMode},</if>
<if test="prId != null">#{prId},</if>
<if test="effectiveDate != null">#{effectiveDate},</if>
#{expireDate},
sysdate()
)
</insert>
@@ -112,6 +221,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="updatePrcPriceSetDetail" parameterType="PrcPriceSetDetail">
update prc_price_set_detail
<set>
<if test="psvId != null">psv_id = #{psvId},</if>
<if test="productCode != null and productCode != ''">product_code = #{productCode},</if>
<if test="productName != null">product_name = #{productName},</if>
country_code = #{countryCode},
@@ -122,12 +232,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
zd_id = #{zdId},
wsd_id = #{wsdId},
weight_label = #{weightLabel},
weight_min = #{weightMin},
weight_max = #{weightMax},
product_country_id = #{productCountryId},
fv_value = #{fvValue},
fv_registration_fee = #{fvRegistrationFee},
discount_value = #{discountValue},
<if test="roundMode != null and roundMode != ''">round_mode = #{roundMode},</if>
pr_id = #{prId},
effective_date = #{effectiveDate},
expire_date = #{expireDate},
update_time = sysdate()
</set>
where psd_id = #{psdId}
@@ -144,6 +258,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
delete from prc_price_set_detail where price_set_id = #{priceSetId}
</delete>
<delete id="deletePrcPriceSetDetailByPsvId" parameterType="Long">
delete from prc_price_set_detail where psv_id = #{psvId}
</delete>
<delete id="deleteOrphanDetailsByPriceSetId" parameterType="Long">
delete from prc_price_set_detail where price_set_id = #{priceSetId} and psv_id is null
</delete>
<select id="selectFixedMatch" resultMap="PrcPriceSetDetailResult">
<include refid="selectPrcPriceSetDetailVo"/>
where price_set_id = #{priceSetId}
@@ -189,4 +311,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
limit 1
</select>
<insert id="copyDetailsFromVersion">
insert into prc_price_set_detail (
price_set_id, psv_id, product_code, product_name, country_code, country_name,
zone_id, zone_code, zone_name, zd_id, wsd_id, weight_label, weight_min, weight_max,
product_country_id, fv_value, fv_registration_fee, discount_value, round_mode,
pr_id, effective_date, expire_date, create_time
)
select
price_set_id, #{newPsvId}, product_code, product_name, country_code, country_name,
zone_id, zone_code, zone_name, zd_id, wsd_id, weight_label, weight_min, weight_max,
product_country_id, fv_value, fv_registration_fee, discount_value, round_mode,
pr_id, effective_date, expire_date, sysdate()
from prc_price_set_detail
where psv_id = #{srcPsvId}
order by psd_id asc
</insert>
</mapper>
@@ -140,6 +140,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update prc_price_set
<set>
status = #{status},
<if test="effectiveDate != null">effective_date = #{effectiveDate},</if>
<if test="updateBy != null and updateBy != ''">updated_by = #{updateBy},</if>
update_time = sysdate()
</set>
@@ -0,0 +1,103 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.price.mapper.PrcPriceSetVersionMapper">
<resultMap type="PrcPriceSetVersion" id="PrcPriceSetVersionResult">
<id property="psvId" column="psv_id" />
<result property="priceSetId" column="price_set_id" />
<result property="versionNo" column="version_no" />
<result property="versionSeq" column="version_seq" />
<result property="effectiveTime" column="effective_time" />
<result property="expireTime" column="expire_time" />
<result property="status" column="status" />
<result property="createBy" column="created_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="updated_by" />
<result property="updateTime" column="update_time" />
</resultMap>
<sql id="selectPrcPriceSetVersionVo">
select psv_id, price_set_id, version_no, version_seq, effective_time, expire_time, status,
created_by, create_time, updated_by, update_time
from prc_price_set_version
</sql>
<select id="selectPrcPriceSetVersionById" parameterType="Long" resultMap="PrcPriceSetVersionResult">
<include refid="selectPrcPriceSetVersionVo"/>
where psv_id = #{psvId}
</select>
<select id="selectPrcPriceSetVersionList" parameterType="PrcPriceSetVersion" resultMap="PrcPriceSetVersionResult">
<include refid="selectPrcPriceSetVersionVo"/>
<where>
<if test="priceSetId != null">
AND price_set_id = #{priceSetId}
</if>
<if test="versionNo != null and versionNo != ''">
AND version_no = #{versionNo}
</if>
<if test="status != null and status != ''">
AND status = #{status}
</if>
</where>
order by version_seq desc
</select>
<select id="selectMaxVersionSeq" resultType="java.lang.Integer">
select max(version_seq) from prc_price_set_version where price_set_id = #{priceSetId}
</select>
<insert id="insertPrcPriceSetVersion" parameterType="PrcPriceSetVersion" useGeneratedKeys="true" keyProperty="psvId">
insert into prc_price_set_version (
<if test="priceSetId != null">price_set_id,</if>
<if test="versionNo != null and versionNo != ''">version_no,</if>
<if test="versionSeq != null">version_seq,</if>
<if test="effectiveTime != null">effective_time,</if>
<if test="expireTime != null">expire_time,</if>
<if test="status != null and status != ''">status,</if>
<if test="createBy != null and createBy != ''">created_by,</if>
create_time
) values (
<if test="priceSetId != null">#{priceSetId},</if>
<if test="versionNo != null and versionNo != ''">#{versionNo},</if>
<if test="versionSeq != null">#{versionSeq},</if>
<if test="effectiveTime != null">#{effectiveTime},</if>
<if test="expireTime != null">#{expireTime},</if>
<if test="status != null and status != ''">#{status},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
sysdate()
)
</insert>
<update id="updatePrcPriceSetVersion" parameterType="PrcPriceSetVersion">
update prc_price_set_version
<set>
<if test="versionNo != null and versionNo != ''">version_no = #{versionNo},</if>
<if test="versionSeq != null">version_seq = #{versionSeq},</if>
<if test="effectiveTime != null">effective_time = #{effectiveTime},</if>
expire_time = #{expireTime},
<if test="status != null and status != ''">status = #{status},</if>
<if test="updateBy != null and updateBy != ''">updated_by = #{updateBy},</if>
update_time = sysdate()
</set>
where psv_id = #{psvId}
</update>
<delete id="deletePrcPriceSetVersionByIds" parameterType="Long">
delete from prc_price_set_version where psv_id in
<foreach item="psvId" collection="array" open="(" separator="," close=")">
#{psvId}
</foreach>
</delete>
<delete id="deletePrcPriceSetVersionByPriceSetId" parameterType="Long">
delete from prc_price_set_version where price_set_id = #{priceSetId}
</delete>
<select id="selectPriceSetIds" resultType="Long">
select distinct price_set_id from prc_price_set_version
</select>
</mapper>
@@ -0,0 +1,208 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.price.mapper.PrcPriceSetVersionSurchargeMapper">
<resultMap type="PrcPriceSetVersionSurcharge" id="PrcPriceSetVersionSurchargeResult">
<id property="psvsId" column="psvs_id" />
<result property="psvId" column="psv_id" />
<result property="scId" column="sc_id" />
<result property="productCode" column="product_code" />
<result property="psdId" column="psd_id" />
<result property="scName" column="sc_name" />
<result property="feeType" column="fee_type" />
<result property="chargeType" column="charge_type" />
<result property="chargeValue" column="charge_value" />
<result property="currency" column="currency" />
<result property="roundMode" column="round_mode" />
<result property="countryCode" column="country_code" />
<result property="scNote" column="sc_note" />
<result property="createBy" column="created_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="updated_by" />
<result property="updateTime" column="update_time" />
</resultMap>
<sql id="selectPrcPriceSetVersionSurchargeVo">
select psvs_id, psv_id, sc_id, product_code, psd_id, sc_name, fee_type, charge_type,
charge_value, currency, round_mode, country_code, sc_note,
created_by, create_time, updated_by, update_time
from prc_price_set_version_surcharge
</sql>
<select id="selectPrcPriceSetVersionSurchargeById" parameterType="Long" resultMap="PrcPriceSetVersionSurchargeResult">
<include refid="selectPrcPriceSetVersionSurchargeVo"/>
where psvs_id = #{psvsId}
</select>
<select id="selectPrcPriceSetVersionSurchargeList" parameterType="PrcPriceSetVersionSurcharge" resultMap="PrcPriceSetVersionSurchargeResult">
<include refid="selectPrcPriceSetVersionSurchargeVo"/>
<where>
<if test="psvId != null">
AND psv_id = #{psvId}
</if>
<if test="scId != null">
AND sc_id = #{scId}
</if>
<if test="productCode != null and productCode != ''">
AND product_code = #{productCode}
</if>
<if test="psdId != null">
AND psd_id = #{psdId}
</if>
</where>
order by psvs_id asc
</select>
<insert id="insertPrcPriceSetVersionSurcharge" parameterType="PrcPriceSetVersionSurcharge" useGeneratedKeys="true" keyProperty="psvsId">
insert into prc_price_set_version_surcharge (
<if test="psvId != null">psv_id,</if>
<if test="psdId != null">psd_id,</if>
<if test="scId != null">sc_id,</if>
<if test="productCode != null">product_code,</if>
<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="chargeValue != null">charge_value,</if>
<if test="currency != null and currency != ''">currency,</if>
<if test="roundMode != null and roundMode != ''">round_mode,</if>
<if test="countryCode != null">country_code,</if>
<if test="scNote != null">sc_note,</if>
<if test="createBy != null and createBy != ''">created_by,</if>
create_time
) values (
<if test="psvId != null">#{psvId},</if>
<if test="psdId != null">#{psdId},</if>
<if test="scId != null">#{scId},</if>
<if test="productCode != null">#{productCode},</if>
<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="chargeValue != null">#{chargeValue},</if>
<if test="currency != null and currency != ''">#{currency},</if>
<if test="roundMode != null and roundMode != ''">#{roundMode},</if>
<if test="countryCode != null">#{countryCode},</if>
<if test="scNote != null">#{scNote},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
sysdate()
)
</insert>
<update id="updatePrcPriceSetVersionSurcharge" parameterType="PrcPriceSetVersionSurcharge">
update prc_price_set_version_surcharge
<set>
<if test="psdId != null">psd_id = #{psdId},</if>
<if test="scId != null">sc_id = #{scId},</if>
product_code = #{productCode},
<if test="scName != null and scName != ''">sc_name = #{scName},</if>
<if test="feeType != null and feeType != ''">fee_type = #{feeType},</if>
<if test="chargeType != null and chargeType != ''">charge_type = #{chargeType},</if>
<if test="chargeValue != null">charge_value = #{chargeValue},</if>
<if test="currency != null and currency != ''">currency = #{currency},</if>
<if test="roundMode != null and roundMode != ''">round_mode = #{roundMode},</if>
country_code = #{countryCode},
sc_note = #{scNote},
<if test="updateBy != null and updateBy != ''">updated_by = #{updateBy},</if>
update_time = sysdate()
</set>
where psvs_id = #{psvsId}
</update>
<delete id="deletePrcPriceSetVersionSurchargeByIds" parameterType="Long">
delete from prc_price_set_version_surcharge where psvs_id in
<foreach item="psvsId" collection="array" open="(" separator="," close=")">
#{psvsId}
</foreach>
</delete>
<delete id="deleteByPsvId" parameterType="Long">
delete from prc_price_set_version_surcharge where psv_id = #{psvId}
</delete>
<delete id="deleteByPsdId" parameterType="Long">
delete from prc_price_set_version_surcharge where psd_id = #{psdId}
</delete>
<select id="selectByPsdIds" resultMap="PrcPriceSetVersionSurchargeResult">
<include refid="selectPrcPriceSetVersionSurchargeVo"/>
where psd_id in
<foreach item="id" collection="psdIds" open="(" separator="," close=")">
#{id}
</foreach>
order by psvs_id asc
</select>
<!-- Join detail x surcharge_rel x surcharge; skip OF fuel; product-level or same detail_id -->
<insert id="insertFromLibraryRels">
insert into prc_price_set_version_surcharge (
psv_id, psd_id, sc_id, product_code, sc_name, fee_type, charge_type,
charge_value, currency, round_mode, country_code, sc_note,
created_by, create_time
)
select
d.psv_id,
d.psd_id,
r.sc_id,
d.product_code,
s.sc_name,
ifnull(nullif(s.fee_type, ''), 'SURCHARGE'),
ifnull(nullif(s.charge_type, ''), 'FIXED'),
s.charge_value,
ifnull(nullif(s.currency, ''), 'CNY'),
ifnull(nullif(s.round_mode, ''), 'HALF_UP'),
s.country_code,
s.sc_note,
#{createBy},
sysdate()
from prc_price_set_detail d
inner join prc_surcharge_rel r on r.product_code = d.product_code
inner join prc_surcharge s on s.sc_id = r.sc_id
where d.psv_id = #{psvId}
and ifnull(s.sc_name, '') &lt;&gt; ''
and s.charge_value is not null
and lower(ifnull(s.ss_code, '')) &lt;&gt; 'of'
and (r.detail_id is null or r.detail_id = d.product_country_id)
and (
s.country_code is null or s.country_code = ''
or d.country_code is null or d.country_code = ''
or upper(s.country_code) = upper(d.country_code)
)
</insert>
<insert id="copySurchargesFromVersion">
insert into prc_price_set_version_surcharge (
psv_id, psd_id, sc_id, product_code, sc_name, fee_type, charge_type,
charge_value, currency, round_mode, country_code, sc_note,
created_by, create_time
)
select
#{newPsvId},
nd.psd_id,
sc.sc_id,
sc.product_code,
sc.sc_name,
sc.fee_type,
sc.charge_type,
sc.charge_value,
sc.currency,
sc.round_mode,
sc.country_code,
sc.sc_note,
#{createBy},
sysdate()
from prc_price_set_version_surcharge sc
inner join prc_price_set_detail od
on od.psd_id = sc.psd_id and od.psv_id = #{srcPsvId}
inner join prc_price_set_detail nd
on nd.psv_id = #{newPsvId}
and nd.product_code = od.product_code
and ifnull(nd.country_code, '') = ifnull(od.country_code, '')
and ifnull(nd.zone_code, '') = ifnull(od.zone_code, '')
and ifnull(nd.weight_label, '') = ifnull(od.weight_label, '')
and ifnull(nd.product_country_id, 0) = ifnull(od.product_country_id, 0)
and ifnull(nd.discount_value, -1) = ifnull(od.discount_value, -1)
where sc.psv_id = #{srcPsvId}
</insert>
</mapper>