Merge branch 'master' of http://git.lionquexpress.com/wuweihua/BMS

bms-back/ruoyi-system/src/main/resources/mapper/ar/ArBalanceWriteoffMapper.xml

@@ -0,0 +1,88 @@
+<?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.ar.mapper.ArBalanceWriteoffMapper">
+
+    <resultMap id="ArBalanceWriteoffResult" type="ArBalanceWriteoff">
+        <id     property="writeoffId"      column="writeoff_id"/>
+        <result property="writeoffNo"      column="writeoff_no"/>
+        <result property="arBillId"        column="ar_bill_id"/>
+        <result property="billNo"          column="bill_no"/>
+        <result property="customerId"      column="customer_id"/>
+        <result property="accountId"       column="account_id"/>
+        <result property="currency"        column="currency"/>
+        <result property="writeoffAmount"  column="writeoff_amount"/>
+        <result property="balanceFlowId"   column="balance_flow_id"/>
+        <result property="reverseFlowId"   column="reverse_flow_id"/>
+        <result property="writeoffDate"    column="writeoff_date"/>
+        <result property="status"          column="status"/>
+        <result property="remark"          column="remark"/>
+        <result property="createBy"        column="create_by"/>
+        <result property="createTime"      column="create_time"/>
+        <result property="cancelBy"        column="cancel_by"/>
+        <result property="cancelTime"      column="cancel_time"/>
+        <result property="cancelRemark"    column="cancel_remark"/>
+        <result property="billName"        column="bill_name"/>
+        <result property="customerName"    column="customer_name"/>
+    </resultMap>
+
+    <sql id="selectColumns">
+        select w.writeoff_id, w.writeoff_no, w.ar_bill_id, w.bill_no, w.customer_id, w.account_id,
+               w.currency, w.writeoff_amount, w.balance_flow_id, w.reverse_flow_id,
+               w.writeoff_date, w.status, w.remark, w.create_by, w.create_time,
+               w.cancel_by, w.cancel_time, w.cancel_remark,
+               b.bill_name, b.customer_name
+        from ar_balance_writeoff w
+        left join ar_bill b on b.ar_bill_id = w.ar_bill_id
+    </sql>
+
+    <insert id="insertArBalanceWriteoff" parameterType="ArBalanceWriteoff"
+            useGeneratedKeys="true" keyProperty="writeoffId">
+        insert into ar_balance_writeoff (
+            writeoff_no, ar_bill_id, bill_no, customer_id, account_id, currency,
+            writeoff_amount, balance_flow_id, reverse_flow_id, writeoff_date,
+            status, remark, create_by, create_time
+        ) values (
+            #{writeoffNo}, #{arBillId}, #{billNo}, #{customerId}, #{accountId}, #{currency},
+            #{writeoffAmount}, #{balanceFlowId}, #{reverseFlowId}, #{writeoffDate},
+            #{status}, #{remark}, #{createBy}, sysdate()
+        )
+    </insert>
+
+    <update id="updateFlowRefs">
+        update ar_balance_writeoff
+        set account_id = #{accountId},
+            balance_flow_id = #{balanceFlowId}
+        where writeoff_id = #{writeoffId}
+    </update>
+
+    <select id="selectByIdForUpdate" resultMap="ArBalanceWriteoffResult">
+        <include refid="selectColumns"/>
+        where w.writeoff_id = #{writeoffId}
+        for update
+    </select>
+
+    <update id="updateCancelled">
+        update ar_balance_writeoff
+        set status = 'CANCELLED',
+            reverse_flow_id = #{reverseFlowId},
+            cancel_by = #{cancelBy},
+            cancel_time = sysdate(),
+            cancel_remark = #{cancelRemark}
+        where writeoff_id = #{writeoffId} and status = 'EFFECTIVE'
+    </update>
+
+    <select id="selectWriteoffList" parameterType="ArBalanceWriteoff" resultMap="ArBalanceWriteoffResult">
+        <include refid="selectColumns"/>
+        <where>
+            <if test="customerId != null">and w.customer_id = #{customerId}</if>
+            <if test="arBillId != null">and w.ar_bill_id = #{arBillId}</if>
+            <if test="status != null and status != ''">and w.status = #{status}</if>
+            <if test="currency != null and currency != ''">and w.currency = #{currency}</if>
+            <if test="writeoffNo != null and writeoffNo != ''">and w.writeoff_no like concat('%', #{writeoffNo}, '%')</if>
+            <if test="billNo != null and billNo != ''">and w.bill_no like concat('%', #{billNo}, '%')</if>
+        </where>
+        order by w.create_time desc, w.writeoff_id desc
+    </select>
+</mapper>

bms-back/ruoyi-system/src/main/resources/mapper/ar/ArBillDetailFeeMapper.xml

@@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap id="ArBillDetailFeeResult" type="ArBillDetailFee">
         <id property="detailFeeId" column="detail_fee_id"/>
         <result property="detailId" column="detail_id"/>
-        <result property="prcFeeId" column="prc_fee_id"/>
+        <result property="prcIncomeBillFeeId" column="prc_income_bill_fee_id"/>
         <result property="feeNo" column="fee_no"/>
         <result property="feeType" column="fee_type"/>
         <result property="feeName" column="fee_name"/>
@@ -24,13 +24,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <select id="selectByDetailId" parameterType="long" resultMap="ArBillDetailFeeResult">
-        select detail_fee_id, detail_id, prc_fee_id, fee_no, fee_type, fee_name, sc_id, quantity,
+        select detail_fee_id, detail_id, prc_income_bill_fee_id, fee_no, fee_type, fee_name, sc_id, quantity,
                unit, unit_price, amount, currency, calculation_formula, round_mode, remark, create_by, create_time
         from ar_bill_detail_fee where detail_id = #{detailId} order by fee_no, detail_fee_id
     </select>
 
     <select id="selectByBillId" parameterType="long" resultMap="ArBillDetailFeeResult">
-        select detail_fee_id, detail_id, prc_fee_id, fee_no, fee_type, fee_name, sc_id, quantity,
+        select detail_fee_id, detail_id, prc_income_bill_fee_id, fee_no, fee_type, fee_name, sc_id, quantity,
                unit, unit_price, amount, currency, calculation_formula, round_mode, remark, create_by, create_time
         from ar_bill_detail_fee
         where detail_id in (select detail_id from ar_bill_detail where ar_bill_id = #{arBillId})
@@ -39,10 +39,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <insert id="insert" parameterType="ArBillDetailFee" useGeneratedKeys="true" keyProperty="detailFeeId">
         insert into ar_bill_detail_fee (
-            detail_id, prc_fee_id, fee_no, fee_type, fee_name, sc_id, quantity, unit, unit_price,
+            detail_id, prc_income_bill_fee_id, fee_no, fee_type, fee_name, sc_id, quantity, unit, unit_price,
             amount, currency, calculation_formula, round_mode, remark, create_by, create_time
         ) values (
-            #{detailId}, #{prcFeeId}, #{feeNo}, #{feeType}, #{feeName}, #{scId}, #{quantity}, #{unit},
+            #{detailId}, #{prcIncomeBillFeeId}, #{feeNo}, #{feeType}, #{feeName}, #{scId}, #{quantity}, #{unit},
             #{unitPrice}, #{amount}, #{currency}, #{calculationFormula}, #{roundMode}, #{remark},
             #{createBy}, sysdate()
         )
@@ -50,11 +50,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="detailFeeId">
         insert into ar_bill_detail_fee (
-            detail_id, prc_fee_id, fee_no, fee_type, fee_name, sc_id, quantity, unit, unit_price,
+            detail_id, prc_income_bill_fee_id, fee_no, fee_type, fee_name, sc_id, quantity, unit, unit_price,
             amount, currency, calculation_formula, round_mode, remark, create_by, create_time
         ) values
         <foreach collection="list" item="item" separator=",">
-            (#{item.detailId}, #{item.prcFeeId}, #{item.feeNo}, #{item.feeType}, #{item.feeName}, #{item.scId},
+            (#{item.detailId}, #{item.prcIncomeBillFeeId}, #{item.feeNo}, #{item.feeType}, #{item.feeName}, #{item.scId},
              #{item.quantity}, #{item.unit}, #{item.unitPrice}, #{item.amount}, #{item.currency},
              #{item.calculationFormula}, #{item.roundMode}, #{item.remark}, #{item.createBy}, sysdate())
         </foreach>

bms-back/ruoyi-system/src/main/resources/mapper/ar/ArBillDetailMapper.xml

@@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap id="ArBillDetailResult" type="ArBillDetail">
         <id property="detailId" column="detail_id"/>
         <result property="arBillId" column="ar_bill_id"/>
-        <result property="prcBillId" column="prc_bill_id"/>
+        <result property="prcOrderBillId" column="prc_order_bill_id"/>
         <result property="detailNo" column="detail_no"/>
         <result property="orderNo" column="order_no"/>
         <result property="trackingNo" column="tracking_no"/>
@@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <select id="selectByBillId" parameterType="long" resultMap="ArBillDetailResult">
-        select detail_id, ar_bill_id, prc_bill_id, detail_no, order_no, tracking_no, receive_time,
+        select detail_id, ar_bill_id, prc_order_bill_id, detail_no, order_no, tracking_no, receive_time,
                product_code, product_name, goods_description, country_code, country_name, dest_postcode,
                actual_weight, volume_weight, charge_weight, pkg_length, pkg_width, pkg_height,
                currency, total_amount, remark, create_by, create_time
@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <collection property="fees" ofType="ArBillDetailFee">
             <id property="detailFeeId" column="fee_detail_id"/>
             <result property="detailId" column="fee_parent_detail_id"/>
-            <result property="prcFeeId" column="fee_prc_fee_id"/>
+            <result property="prcIncomeBillFeeId" column="fee_prc_income_bill_fee_id"/>
             <result property="feeNo" column="fee_no"/>
             <result property="feeType" column="fee_type"/>
             <result property="feeName" column="fee_name"/>
@@ -61,11 +61,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <select id="selectByBillIdWithFees" parameterType="long" resultMap="ArBillDetailWithFeesResult">
-        select d.detail_id, d.ar_bill_id, d.prc_bill_id, d.detail_no, d.order_no, d.tracking_no, d.receive_time,
+        select d.detail_id, d.ar_bill_id, d.prc_order_bill_id, d.detail_no, d.order_no, d.tracking_no, d.receive_time,
                d.product_code, d.product_name, d.goods_description, d.country_code, d.country_name, d.dest_postcode,
                d.actual_weight, d.volume_weight, d.charge_weight, d.pkg_length, d.pkg_width, d.pkg_height,
                d.currency, d.total_amount, d.remark, d.create_by, d.create_time,
-               f.detail_fee_id as fee_detail_id, f.detail_id as fee_parent_detail_id, f.prc_fee_id as fee_prc_fee_id,
+               f.detail_fee_id as fee_detail_id, f.detail_id as fee_parent_detail_id,
+               f.prc_income_bill_fee_id as fee_prc_income_bill_fee_id,
                f.fee_no, f.fee_type, f.fee_name, f.sc_id as fee_sc_id, f.quantity as fee_quantity,
                f.unit as fee_unit, f.unit_price as fee_unit_price, f.amount as fee_amount,
                f.currency as fee_currency, f.calculation_formula as fee_calculation_formula,
@@ -79,12 +80,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <insert id="insert" parameterType="ArBillDetail" useGeneratedKeys="true" keyProperty="detailId">
         insert into ar_bill_detail (
-            ar_bill_id, prc_bill_id, detail_no, order_no, tracking_no, receive_time, product_code,
+            ar_bill_id, prc_order_bill_id, detail_no, order_no, tracking_no, receive_time, product_code,
             product_name, goods_description, country_code, country_name, dest_postcode, actual_weight,
             volume_weight, charge_weight, pkg_length, pkg_width, pkg_height, currency, total_amount,
             remark, create_by, create_time
         ) values (
-            #{arBillId}, #{prcBillId}, #{detailNo}, #{orderNo}, #{trackingNo}, #{receiveTime},
+            #{arBillId}, #{prcOrderBillId}, #{detailNo}, #{orderNo}, #{trackingNo}, #{receiveTime},
             #{productCode}, #{productName}, #{goodsDescription}, #{countryCode}, #{countryName},
             #{destPostcode}, #{actualWeight}, #{volumeWeight}, #{chargeWeight}, #{pkgLength}, #{pkgWidth},
             #{pkgHeight}, #{currency}, #{totalAmount}, #{remark}, #{createBy}, sysdate()
@@ -93,13 +94,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <insert id="insertBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="detailId">
         insert into ar_bill_detail (
-            ar_bill_id, prc_bill_id, detail_no, order_no, tracking_no, receive_time, product_code,
+            ar_bill_id, prc_order_bill_id, detail_no, order_no, tracking_no, receive_time, product_code,
             product_name, goods_description, country_code, country_name, dest_postcode, actual_weight,
             volume_weight, charge_weight, pkg_length, pkg_width, pkg_height, currency, total_amount,
             remark, create_by, create_time
         ) values
         <foreach collection="list" item="item" separator=",">
-            (#{item.arBillId}, #{item.prcBillId}, #{item.detailNo}, #{item.orderNo}, #{item.trackingNo},
+            (#{item.arBillId}, #{item.prcOrderBillId}, #{item.detailNo}, #{item.orderNo}, #{item.trackingNo},
              #{item.receiveTime}, #{item.productCode}, #{item.productName}, #{item.goodsDescription},
              #{item.countryCode}, #{item.countryName}, #{item.destPostcode}, #{item.actualWeight},
              #{item.volumeWeight}, #{item.chargeWeight}, #{item.pkgLength}, #{item.pkgWidth}, #{item.pkgHeight},

bms-back/ruoyi-system/src/main/resources/mapper/ar/ArBillMapper.xml

@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from ar_bill
     </sql>
 
-    <select id="selectArBillList" parameterType="ArBill" resultMap="ArBillResult">
+    <select id="selectArBillList" parameterType="com.ruoyi.ar.domain.vo.ArBillQuery" resultMap="ArBillResult">
         <include refid="selectArBillColumns"/>
         <where>
             <if test="billNo != null and billNo != ''">and bill_no like concat('%', #{billNo}, '%')</if>
@@ -51,8 +51,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="customerId != null">and customer_id = #{customerId}</if>
             <if test="status != null and status != ''">and status = #{status}</if>
             <if test="currency != null and currency != ''">and currency = #{currency}</if>
-            <if test="billPeriodStart != null">and bill_period_end &gt;= #{billPeriodStart}</if>
-            <if test="billPeriodEnd != null">and bill_period_start &lt;= #{billPeriodEnd}</if>
+            <if test="billDateStart != null">and bill_date &gt;= #{billDateStart}</if>
+            <if test="billDateEnd != null">and bill_date &lt;= #{billDateEnd}</if>
+            <if test="billPeriodEnd != null">and bill_period_end = #{billPeriodEnd}</if>
         </where>
         order by create_time desc, ar_bill_id desc
     </select>
@@ -80,6 +81,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectArBillColumns"/> where ar_bill_id = #{arBillId} for update
     </select>
 
+    <select id="selectUnsettledByCustomer" resultMap="ArBillResult">
+        <include refid="selectArBillColumns"/>
+        where customer_id = #{customerId}
+          and status in ('CONFIRMED', 'PARTIAL_WRITTEN_OFF')
+          and unwritten_amount &gt; 0
+        order by bill_date asc, ar_bill_id asc
+    </select>
+
     <insert id="insertArBill" parameterType="ArBill" useGeneratedKeys="true" keyProperty="arBillId">
         insert into ar_bill (
             bill_no, bill_name, customer_id, customer_code, customer_name, bill_period_start, bill_period_end,

bms-back/ruoyi-system/src/main/resources/mapper/customer/BmsCustomerMapper.xml

@@ -198,6 +198,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           and (biz_type = 'customer' or biz_type is null or biz_type = '')
     </update>
 
+    <!-- 额度调整后回写客户档案额度字段（数据源为客户余额账户） -->
+    <update id="updateCustomerCredit">
+        update bms_customer
+        set credit_ed = #{creditEd},
+            temp_ed = #{tempEd},
+            update_by = #{updateBy},
+            update_time = now()
+        where customer_id = #{customerId}
+    </update>
+
+    <!-- 只取档案物理额度列（列表查询里的 credit_ed 是账户可用额度子查询） -->
+    <select id="selectRawCreditByCustomerId" resultType="BmsCustomer">
+        select customer_id as customerId,
+               credit_ed as creditEd,
+               temp_ed as tempEd
+        from bms_customer
+        where customer_id = #{customerId}
+    </select>
+
     <delete id="deleteBmsCustomerAttachmentByAttachmentIds" parameterType="String">
         update bms_customer_attachment set del_flag = '2' where attachment_id in
         <foreach item="attachmentId" collection="attachmentIds" open="(" separator="," close=")">
@@ -287,12 +306,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             service_user_id = #{serviceUserId},
             service_user = #{serviceUser},
             <if test="settlementType != null">settlement_type = #{settlementType},</if>
-            <if test="tempEd != null">temp_ed = #{tempEd},</if>
             <if test="accountBalance != null">account_balance = #{accountBalance},</if>
             <if test="foreignCurrencyBalance != null">foreign_currency_balance = #{foreignCurrencyBalance},</if>
             <if test="weightThreshold != null">weight_threshold = #{weightThreshold},</if>
             <if test="throwRatio != null">throw_ratio = #{throwRatio},</if>
-            <if test="creditEd != null">credit_ed = #{creditEd},</if>
             <if test="productIds != null">product_ids = #{productIds},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="createBy != null">create_by = #{createBy},</if>

bms-back/ruoyi-system/src/main/resources/mapper/customer/BmsCustomerPriceSetMapper.xml

@@ -0,0 +1,128 @@
+<?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.customer.customerinfo.mapper.BmsCustomerPriceSetMapper">
+
+    <resultMap type="com.ruoyi.customer.customerinfo.domain.BmsCustomerPriceSet" id="BmsCustomerPriceSetResult">
+        <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"          />
+        <result property="prEnddate"           column="pr_enddate"            />
+        <result property="priceSetNote"        column="price_set_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"           />
+        <result property="priceSetCode"        column="price_set_code"        />
+        <result property="priceSetName"        column="price_set_name"        />
+        <result property="setType"             column="set_type"              />
+        <result property="priceSetStatus"      column="price_set_status"      />
+        <result property="setEffectiveDate"    column="set_effective_date"    />
+        <result property="setExpireDate"       column="set_expire_date"       />
+    </resultMap>
+
+    <resultMap type="com.ruoyi.customer.customerinfo.domain.BmsPriceSetOption" id="BmsPriceSetOptionResult">
+        <id     property="priceSetId"    column="price_set_id"    />
+        <result property="priceSetCode"  column="price_set_code"  />
+        <result property="priceSetName"  column="price_set_name"  />
+        <result property="setType"       column="set_type"        />
+        <result property="status"        column="status"          />
+        <result property="effectiveDate" column="effective_date"  />
+        <result property="expireDate"    column="expire_date"     />
+    </resultMap>
+
+    <sql id="bindVo">
+        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.create_time, c.updated_by, c.update_time,
+               s.price_set_code, s.price_set_name, s.set_type,
+               s.status as price_set_status,
+               s.effective_date as set_effective_date, s.expire_date as set_expire_date
+        from prc_customer_price_set c
+        left join prc_price_set s on s.price_set_id = c.price_set_id
+    </sql>
+
+    <select id="selectBindListByCustomerId" resultMap="BmsCustomerPriceSetResult">
+        <include refid="bindVo"/>
+        where c.customer_id = #{customerId}
+        order by c.bind_priority asc, c.customer_priceset_id asc
+    </select>
+
+    <select id="selectBindById" parameterType="Long" resultMap="BmsCustomerPriceSetResult">
+        <include refid="bindVo"/>
+        where c.customer_priceset_id = #{customerPricesetId}
+    </select>
+
+    <select id="selectBindByCustomerId" resultMap="BmsCustomerPriceSetResult">
+        select customer_priceset_id, price_set_id, customer_id, customer_code, customer_name,
+               bind_priority, pr_begindate, pr_enddate, price_set_note,
+               created_by, create_time, updated_by, update_time
+        from prc_customer_price_set
+        where customer_id = #{customerId}
+        limit 1
+    </select>
+
+    <insert id="insertBind" parameterType="com.ruoyi.customer.customerinfo.domain.BmsCustomerPriceSet"
+            useGeneratedKeys="true" keyProperty="customerPricesetId">
+        insert into prc_customer_price_set (
+            price_set_id, customer_id, customer_code, customer_name,
+            bind_priority, pr_begindate, pr_enddate, price_set_note,
+            created_by, create_time
+        ) values (
+            #{priceSetId}, #{customerId}, #{customerCode}, #{customerName},
+            #{bindPriority}, #{prBegindate}, #{prEnddate}, #{priceSetNote},
+            #{createBy}, sysdate()
+        )
+    </insert>
+
+    <update id="updateBind" parameterType="com.ruoyi.customer.customerinfo.domain.BmsCustomerPriceSet">
+        update prc_customer_price_set
+        set price_set_id   = #{priceSetId},
+            customer_code  = #{customerCode},
+            customer_name  = #{customerName},
+            bind_priority  = #{bindPriority},
+            pr_begindate   = #{prBegindate},
+            pr_enddate     = #{prEnddate},
+            price_set_note = #{priceSetNote},
+            updated_by     = #{updateBy},
+            update_time    = sysdate()
+        where customer_priceset_id = #{customerPricesetId}
+    </update>
+
+    <delete id="deleteBindByIds" parameterType="Long">
+        delete from prc_customer_price_set where customer_priceset_id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <select id="selectPriceSetOptionList"
+            parameterType="com.ruoyi.customer.customerinfo.domain.BmsPriceSetOption"
+            resultMap="BmsPriceSetOptionResult">
+        select price_set_id, price_set_code, price_set_name, set_type, status, effective_date, expire_date
+        from prc_price_set
+        <where>
+            status = 'E'
+            <if test="setType != null and setType != ''">
+                and set_type = #{setType}
+            </if>
+            <if test="keyword != null and keyword != ''">
+                and (price_set_code like concat('%', #{keyword}, '%')
+                     or price_set_name like concat('%', #{keyword}, '%'))
+            </if>
+        </where>
+        order by price_set_id desc
+    </select>
+
+    <select id="selectPriceSetOptionById" resultMap="BmsPriceSetOptionResult">
+        select price_set_id, price_set_code, price_set_name, set_type, status, effective_date, expire_date
+        from prc_price_set
+        where price_set_id = #{priceSetId}
+    </select>
+
+</mapper>

bms-back/ruoyi-system/src/main/resources/mapper/customer/CustomerMoneyMapper.xml

@@ -13,6 +13,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="frozenBalance" column="frozen_balance" />
         <result property="totalCredit"   column="total_credit"   />
         <result property="extraCredit"   column="extra_credit"   />
+        <result property="extraEffectiveDate" column="extra_effective_date" />
+        <result property="extraExpireDate" column="extra_expire_date" />
         <result property="usedCredit"    column="used_credit"    />
         <result property="tax"           column="tax"            />
         <result property="version"       column="version"        />
@@ -25,7 +27,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCustomerAccountVo">
-        select id, customer_id, currency, balance, frozen_balance, total_credit, extra_credit, used_credit,
+        select id, customer_id, currency, balance, frozen_balance, total_credit, extra_credit,
+               extra_effective_date, extra_expire_date, used_credit,
                tax, version, create_by, create_time, update_by, update_time, remark, del_flag
         from customer_account
     </sql>
@@ -90,6 +93,112 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id} and version = #{version} and del_flag = '0'
     </update>
 
+    <!-- 乐观锁更新额度（信用/临时额度及临时额度有效期） -->
+    <update id="updateAccountCredit">
+        update customer_account
+        set total_credit         = #{totalCredit},
+            extra_credit         = #{extraCredit},
+            extra_effective_date  = #{extraEffectiveDate},
+            extra_expire_date   = #{extraExpireDate},
+            version              = version + 1,
+            update_by            = #{updateBy},
+            update_time          = now()
+        where id = #{id} and version = #{version} and del_flag = '0'
+    </update>
+
+    <!-- ================= 客户额度流水 ================= -->
+    <resultMap type="com.ruoyi.customer.customermoney.domain.CustomerCreditFlow" id="CustomerCreditFlowResult">
+        <id     property="id"           column="id"            />
+        <result property="flowNo"       column="flow_no"       />
+        <result property="customerId"   column="customer_id"    />
+        <result property="accountId"    column="account_id"      />
+        <result property="creditType"   column="credit_type"     />
+        <result property="changeType"    column="change_type"     />
+        <result property="direction"     column="direction"       />
+        <result property="beforeAmount"  column="before_amount"  />
+        <result property="changeAmount"  column="change_amount"  />
+        <result property="afterAmount"   column="after_amount"   />
+        <result property="usedCredit"    column="used_credit"     />
+        <result property="effectiveDate" column="effective_date"  />
+        <result property="expireDate"    column="expire_date"     />
+        <result property="reason"       column="reason"          />
+        <result property="adjustMode"   column="adjust_mode"     />
+        <result property="operatorId"    column="operator_id"      />
+        <result property="createBy"      column="create_by"       />
+        <result property="createTime"    column="create_time"     />
+        <result property="updateBy"      column="update_by"       />
+        <result property="updateTime"    column="update_time"     />
+        <result property="remark"        column="remark"         />
+        <result property="delFlag"       column="del_flag"        />
+    </resultMap>
+
+    <sql id="selectCustomerCreditFlowVo">
+        select id, flow_no, customer_id, account_id, credit_type, change_type, direction,
+               before_amount, change_amount, after_amount, used_credit,
+               effective_date, expire_date, reason, adjust_mode, operator_id,
+               create_by, create_time, update_by, update_time, remark, del_flag
+        from customer_credit_flow
+    </sql>
+
+    <select id="selectCreditFlowList" parameterType="com.ruoyi.customer.customermoney.domain.CustomerCreditFlow"
+            resultMap="CustomerCreditFlowResult">
+        <include refid="selectCustomerCreditFlowVo"/>
+        <where>
+            <if test="customerId != null"> and customer_id = #{customerId}</if>
+            <if test="creditType != null and creditType != ''"> and credit_type = #{creditType}</if>
+            <if test="changeType != null and changeType != ''"> and change_type = #{changeType}</if>
+            <if test="params.beginTime != null and params.beginTime != ''"> and date(create_time) &gt;= #{params.beginTime}</if>
+            <if test="params.endTime != null and params.endTime != ''"> and date(create_time) &lt;= #{params.endTime}</if>
+            and del_flag = '0'
+        </where>
+        order by create_time desc, id desc
+    </select>
+
+    <insert id="insertCreditFlow" parameterType="com.ruoyi.customer.customermoney.domain.CustomerCreditFlow"
+            useGeneratedKeys="true" keyProperty="id">
+        insert into customer_credit_flow
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="flowNo != null">flow_no,</if>
+            <if test="customerId != null">customer_id,</if>
+            <if test="accountId != null">account_id,</if>
+            <if test="creditType != null">credit_type,</if>
+            <if test="changeType != null">change_type,</if>
+            <if test="direction != null">direction,</if>
+            <if test="beforeAmount != null">before_amount,</if>
+            <if test="changeAmount != null">change_amount,</if>
+            <if test="afterAmount != null">after_amount,</if>
+            <if test="usedCredit != null">used_credit,</if>
+            <if test="effectiveDate != null">effective_date,</if>
+            <if test="expireDate != null">expire_date,</if>
+            <if test="reason != null">reason,</if>
+            <if test="adjustMode != null">adjust_mode,</if>
+            <if test="operatorId != null">operator_id,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="remark != null">remark,</if>
+            <if test="delFlag != null">del_flag,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="flowNo != null">#{flowNo},</if>
+            <if test="customerId != null">#{customerId},</if>
+            <if test="accountId != null">#{accountId},</if>
+            <if test="creditType != null">#{creditType},</if>
+            <if test="changeType != null">#{changeType},</if>
+            <if test="direction != null">#{direction},</if>
+            <if test="beforeAmount != null">#{beforeAmount},</if>
+            <if test="changeAmount != null">#{changeAmount},</if>
+            <if test="afterAmount != null">#{afterAmount},</if>
+            <if test="usedCredit != null">#{usedCredit},</if>
+            <if test="effectiveDate != null">#{effectiveDate},</if>
+            <if test="expireDate != null">#{expireDate},</if>
+            <if test="reason != null">#{reason},</if>
+            <if test="adjustMode != null">#{adjustMode},</if>
+            <if test="operatorId != null">#{operatorId},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+        </trim>
+    </insert>
+
     <!-- ================= 客户收款 ================= -->
     <resultMap type="com.ruoyi.customer.customermoney.domain.CustomerReceipt" id="CustomerReceiptResult">
         <id     property="id"                  column="id"                    />