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-09-10 14:23:58 +08:00
parent 05c8d3f90d
commit 6d718320e6
24 changed files with 475 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bms-back/ruoyi-system/src/main/resources/mapper/price/PrcCustomerPriceSetMapper.xml
+33 -2
View File
@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<id property="customerPricesetId" column="customer_priceset_id" />
<result property="priceSetId" column="price_set_id" />
<result property="customerId" column="customer_id" />
<result property="customerCode" column="customer_code" />
<result property="customerName" column="customer_name" />
<result property="bindPriority" column="bind_priority" />
<result property="prBegindate" column="pr_begindate" />
@@ -20,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectPrcCustomerPriceSetVo">
select customer_priceset_id, price_set_id, customer_id, customer_name, bind_priority,
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
from prc_customer_price_set
@@ -40,6 +41,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="customerId != null">
AND customer_id = #{customerId}
</if>
<if test="customerCode != null and customerCode != ''">
AND customer_code = #{customerCode}
</if>
<if test="customerName != null and customerName != ''">
AND customer_name like concat('%', #{customerName}, '%')
</if>
@@ -62,6 +66,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
</select>
<select id="countByCustomerCode" resultType="int">
select count(1) from prc_customer_price_set
where customer_code = #{customerCode}
<if test="excludeId != null">
AND customer_priceset_id &lt;&gt; #{excludeId}
</if>
<if test="excludePriceSetId != null">
AND price_set_id &lt;&gt; #{excludePriceSetId}
</if>
</select>
<select id="countOverlap" resultType="int">
select count(1)
from prc_customer_price_set c
@@ -76,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectEffectiveByCustomer" resultMap="PrcCustomerPriceSetResult">
select c.customer_priceset_id, c.price_set_id, c.customer_id, c.customer_name, c.bind_priority,
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
from prc_customer_price_set c
@@ -88,10 +103,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by c.bind_priority asc, c.pr_begindate desc, c.customer_priceset_id asc
</select>
<select id="selectEffectiveByCustomerCode" resultMap="PrcCustomerPriceSetResult">
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
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}
and s.status = 'E'
and c.pr_begindate &lt;= #{bizDate}
and ifnull(c.pr_enddate, '9999-12-31') &gt;= #{bizDate}
order by c.bind_priority asc, c.pr_begindate desc, c.customer_priceset_id asc
</select>
<insert id="insertPrcCustomerPriceSet" parameterType="PrcCustomerPriceSet" useGeneratedKeys="true" keyProperty="customerPricesetId">
insert into prc_customer_price_set (
<if test="priceSetId != null">price_set_id,</if>
<if test="customerId != null">customer_id,</if>
<if test="customerCode != null and customerCode != ''">customer_code,</if>
<if test="customerName != null">customer_name,</if>
<if test="bindPriority != null">bind_priority,</if>
<if test="prBegindate != null">pr_begindate,</if>
@@ -102,6 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
) values (
<if test="priceSetId != null">#{priceSetId},</if>
<if test="customerId != null">#{customerId},</if>
<if test="customerCode != null and customerCode != ''">#{customerCode},</if>
<if test="customerName != null">#{customerName},</if>
<if test="bindPriority != null">#{bindPriority},</if>
<if test="prBegindate != null">#{prBegindate},</if>
@@ -116,6 +146,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update prc_customer_price_set
<set>
<if test="customerId != null">customer_id = #{customerId},</if>
<if test="customerCode != null">customer_code = #{customerCode},</if>
<if test="customerName != null">customer_name = #{customerName},</if>
<if test="bindPriority != null">bind_priority = #{bindPriority},</if>
<if test="prBegindate != null">pr_begindate = #{prBegindate},</if>
bms-back/ruoyi-system/src/main/resources/mapper/price/PrcQuoteFeeMapper.xml
+7 -7
View File
@@ -17,32 +17,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createdAt" column="created_at" />
</resultMap>
<select id="selectByQuoteId" parameterType="Long" resultMap="PrcQuoteFeeResult">
<select id="selectByQuoteId" parameterType="String" resultMap="PrcQuoteFeeResult">
select fee_id, quote_id, fee_type, fee_name, sc_id, amount, currency, round_mode, remark, created_at
from prc_quote_fee
where quote_id = #{quoteId}
order by field(fee_type, 'BASIC_FREIGHT', 'REGISTRATION_FEE', 'SURCHARGE'), fee_id
</select>
<insert id="insertPrcQuoteFee" parameterType="PrcQuoteFee" useGeneratedKeys="true" keyProperty="feeId">
<insert id="insertPrcQuoteFee" parameterType="PrcQuoteFee">
insert into prc_quote_fee (
quote_id, fee_type, fee_name, sc_id, amount, currency, round_mode, remark, created_at
fee_id, quote_id, fee_type, fee_name, sc_id, amount, currency, round_mode, remark, created_at
) values (
#{quoteId}, #{feeType}, #{feeName}, #{scId}, #{amount}, #{currency}, #{roundMode}, #{remark}, sysdate()
#{feeId}, #{quoteId}, #{feeType}, #{feeName}, #{scId}, #{amount}, #{currency}, #{roundMode}, #{remark}, sysdate()
)
</insert>
<insert id="insertBatch" parameterType="java.util.List">
insert into prc_quote_fee (
quote_id, fee_type, fee_name, sc_id, amount, currency, round_mode, remark, created_at
fee_id, quote_id, fee_type, fee_name, sc_id, amount, currency, round_mode, remark, created_at
) values
<foreach collection="list" item="item" separator=",">
(#{item.quoteId}, #{item.feeType}, #{item.feeName}, #{item.scId}, #{item.amount},
(#{item.feeId}, #{item.quoteId}, #{item.feeType}, #{item.feeName}, #{item.scId}, #{item.amount},
#{item.currency}, #{item.roundMode}, #{item.remark}, sysdate())
</foreach>
</insert>
<delete id="deleteByQuoteId" parameterType="Long">
<delete id="deleteByQuoteId" parameterType="String">
delete from prc_quote_fee where quote_id = #{quoteId}
</delete>
</mapper>
bms-back/ruoyi-system/src/main/resources/mapper/price/PrcQuoteMapper.xml
+4 -4
View File
@@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where quote_key = #{quoteKey}
</select>
<select id="selectPrcQuoteById" parameterType="Long" resultMap="PrcQuoteResult">
<select id="selectPrcQuoteById" parameterType="String" resultMap="PrcQuoteResult">
<include refid="selectPrcQuoteVo"/>
where quote_id = #{quoteId}
</select>
@@ -100,9 +100,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by quote_id desc
</select>
<insert id="insertPrcQuote" parameterType="PrcQuote" useGeneratedKeys="true" keyProperty="quoteId">
<insert id="insertPrcQuote" parameterType="PrcQuote">
insert into prc_quote (
quote_key, customer_id, product_code, product_name,
quote_id, quote_key, customer_id, product_code, product_name,
country_code, country_name, weight, biz_date, tms_id,
match_source, match_message, price_set_id, price_set_code, price_set_name,
set_type, bind_priority, customer_priceset_id, product_country_id,
@@ -111,7 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
freight_amount, surcharge_amount, payable_total, currency, round_mode,
created_at
) values (
#{quoteKey}, #{customerId}, #{productCode}, #{productName},
#{quoteId}, #{quoteKey}, #{customerId}, #{productCode}, #{productName},
#{countryCode}, #{countryName}, #{weight}, #{bizDate}, #{tmsId},
#{matchSource}, #{matchMessage}, #{priceSetId}, #{priceSetCode}, #{priceSetName},
#{setType}, #{bindPriority}, #{customerPricesetId}, #{productCountryId},