Merge branch 'test' into feauture-20261104

# Conflicts:
#	bms-front/src/views/price/billing/components/BillDetail.vue

bms-back/bms-system/src/main/resources/mapper/price/OracleUpstreamOrderMapper.xml

@@ -66,14 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="query.endTime != null and query.endTime != ''">
             AND o.PICKUP_DATE &lt;= TO_DATE(#{query.endTime}, 'YYYY-MM-DD HH24:MI:SS')
         </if>
-        <choose>
-            <when test="query.blPickup != null">
-                AND o.BL_PICKUP = #{query.blPickup}
-            </when>
-<!--            <otherwise>-->
-<!--                AND o.BL_PICKUP = 1-->
-<!--            </otherwise>-->
-        </choose>
+        AND o.BL_PICKUP = 1
         <if test="query.orderStatuses != null and query.orderStatuses.size() > 0">
             AND o.ORDER_STATUS IN
             <foreach collection="query.orderStatuses" item="st" open="(" separator="," close=")">
@@ -281,14 +274,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <foreach collection="batch" item="bid" open="(" separator="," close=")">
             #{bid}
         </foreach>
-        <choose>
-            <when test="blPickup != null">
-           AND o.BL_PICKUP = #{blPickup}
-            </when>
-<!--            <otherwise>-->
-<!--           AND o.BL_PICKUP = 1-->
-<!--            </otherwise>-->
-        </choose>
+           AND o.BL_PICKUP = 1
            AND o.ORDER_STATUS IN (3, 4, 5, 6, 7, 8, 11)
         <if test="customerCodes != null and customerCodes.size() > 0">
            AND o.CUSTOMER_CODE IN

bms-back/bms-system/src/main/resources/mapper/price/PrcPriceSetDetailMapper.xml

@@ -158,6 +158,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select count(1) from prc_price_set_detail where psv_id = #{psvId} and ifnull(is_del, '0') = '0'
     </select>
 
+    <select id="countByPsvIdAll" parameterType="Long" resultType="int">
+        select count(1) from prc_price_set_detail where psv_id = #{psvId}
+    </select>
+
     <select id="selectDetailOptionRows" resultMap="PrcPriceSetDetailResult">
         select distinct product_code, product_name, country_code, country_name, zone_code, zone_name
         from prc_price_set_detail

bms-back/bms-system/src/main/resources/mapper/price/PrcPriceSetVersionMapper.xml

@@ -37,7 +37,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectPrcPriceSetVersionList" parameterType="PrcPriceSetVersion" resultMap="PrcPriceSetVersionResult">
         <include refid="selectPrcPriceSetVersionVo"/>
         <where>
-            and ifnull(is_del, '0') = '0'
+            <choose>
+                <when test="isDel != null and isDel != ''">
+                    and ifnull(is_del, '0') = #{isDel}
+                </when>
+                <otherwise>
+                    and ifnull(is_del, '0') = '0'
+                </otherwise>
+            </choose>
             <if test="priceSetId != null">
                 AND price_set_id = #{priceSetId}
             </if>

bms-back/bms-system/src/main/resources/mapper/price/SrvBillAirFeeMapper.xml

@@ -0,0 +1,76 @@
+<?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.bms.price.mapper.SrvBillAirFeeMapper">
+
+    <select id="selectByBillCode" resultType="com.bms.price.airbill.domain.SrvBillAirFee">
+        select id, bill_code as billCode, fee_type as feeType, price, currency, remark,
+               create_by as createBy, create_time as createTime, update_by as updateBy,
+               update_time as updateTime, del_flag as delFlag
+        from srv_bill_air_fee
+        where bill_code = #{billCode}
+          and del_flag = '0'
+        order by id
+    </select>
+
+    <select id="selectLive" resultType="com.bms.price.airbill.domain.SrvBillAirFee">
+        select id, bill_code as billCode, fee_type as feeType, price, currency, remark,
+               create_by as createBy, create_time as createTime, update_by as updateBy,
+               update_time as updateTime, del_flag as delFlag
+        from srv_bill_air_fee
+        where id = #{id}
+          and bill_code = #{billCode}
+          and del_flag = '0'
+    </select>
+
+    <insert id="insertFee" useGeneratedKeys="true" keyProperty="id">
+        insert into srv_bill_air_fee (
+            bill_code, fee_type, price, currency, remark,
+            create_by, create_time, update_by, update_time, del_flag
+        ) values (
+            #{billCode}, #{feeType}, #{price}, #{currency}, #{remark},
+            #{createBy}, #{createTime}, #{updateBy}, #{updateTime}, '0'
+        )
+    </insert>
+
+    <update id="updateFee">
+        update srv_bill_air_fee
+        set fee_type = #{feeType},
+            price = #{price},
+            currency = #{currency},
+            remark = #{remark},
+            update_by = #{updateBy},
+            update_time = #{updateTime}
+        where id = #{id}
+          and bill_code = #{billCode}
+          and del_flag = '0'
+    </update>
+
+    <update id="deleteFee">
+        update srv_bill_air_fee
+        set del_flag = '1',
+            update_by = #{updateBy},
+            update_time = #{updateTime}
+        where id = #{id}
+          and bill_code = #{billCode}
+          and del_flag = '0'
+    </update>
+
+    <insert id="insertLog" useGeneratedKeys="true" keyProperty="logId">
+        insert into srv_bill_air_fee_log (
+            bill_code, fee_id, operation_type, summary, change_content,
+            create_by, create_by_name, create_time
+        ) values (
+            #{billCode}, #{feeId}, #{operationType}, #{summary}, #{changeContent},
+            #{createBy}, #{createByName}, #{createTime}
+        )
+    </insert>
+
+    <select id="selectLogs" resultType="com.bms.price.airbill.domain.SrvBillAirFeeLog">
+        select log_id as logId, bill_code as billCode, fee_id as feeId, operation_type as operationType,
+               summary, change_content as changeContent, create_by as createBy,
+               create_by_name as createByName, create_time as createTime
+        from srv_bill_air_fee_log
+        where bill_code = #{billCode}
+        order by log_id desc
+    </select>
+</mapper>