增加订单对应的字段

bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcOrderBill.java

@@ -75,6 +75,10 @@ public class PrcOrderBill extends BaseEntity
     private String setType;
     private Integer bindPriority;
     private Long customerPricesetId;
+    /** 套餐版本ID（prc_price_set_version.psv_id） */
+    private Long psvId;
+    /** 套餐明细ID（prc_price_set_detail.psd_id） */
+    private Long psdId;
     private Long productCountryId;
     private BigDecimal weightMin;
     private BigDecimal weightMax;

bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcOrderBillServiceImpl.java

@@ -268,6 +268,8 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService
         bill.setSetType(result.getSetType());
         bill.setBindPriority(result.getBindPriority());
         bill.setCustomerPricesetId(result.getCustomerPricesetId());
+        bill.setPsvId(result.getPsvId());
+        bill.setPsdId(result.getPsdId());
         bill.setProductCountryId(result.getProductCountryId());
         bill.setWeightMin(result.getWeightMin());
         bill.setWeightMax(result.getWeightMax());
@@ -635,6 +637,8 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService
         r.setSetType(bill.getSetType());
         r.setBindPriority(bill.getBindPriority());
         r.setCustomerPricesetId(bill.getCustomerPricesetId());
+        r.setPsvId(bill.getPsvId());
+        r.setPsdId(bill.getPsdId());
         r.setProductCode(bill.getProductCode());
         r.setProductName(bill.getProductName());
         r.setCountryCode(bill.getCountryCode());

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

@@ -48,6 +48,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="setType"             column="set_type"              />
         <result property="bindPriority"        column="bind_priority"         />
         <result property="customerPricesetId"  column="customer_priceset_id"  />
+        <result property="psvId"               column="psv_id"                />
+        <result property="psdId"               column="psd_id"                />
         <result property="productCountryId"    column="product_country_id"    />
         <result property="weightMin"           column="weight_min"            />
         <result property="weightMax"           column="weight_max"            />
@@ -81,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                shipper_name, consignee_name, dest_postcode, warehouse_code, order_time, order_remark,
                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,
+               set_type, bind_priority, customer_priceset_id, psv_id, psd_id, product_country_id,
                weight_min, weight_max, weight_label, effective_date, charge_weight,
                freight_rate, base_freight_rate, discount_percent, registration_fee,
                freight_amount, surcharge_amount, income_total, pay_total, currency, ar_bill_status,
@@ -354,7 +356,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             shipper_name, consignee_name, dest_postcode, warehouse_code, order_time, order_remark,
             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,
+            set_type, bind_priority, customer_priceset_id, psv_id, psd_id, product_country_id,
             weight_min, weight_max, weight_label, effective_date, charge_weight,
             freight_rate, base_freight_rate, discount_percent, registration_fee,
             freight_amount, surcharge_amount, income_total, pay_total, currency, ar_bill_status,
@@ -368,7 +370,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{shipperName}, #{consigneeName}, #{destPostcode}, #{warehouseCode}, #{orderTime}, #{orderRemark},
             #{productCode}, #{productName}, #{countryCode}, #{countryName}, #{weight}, #{bizDate}, #{tmsId},
             #{matchSource}, #{matchMessage}, #{priceSetId}, #{priceSetCode}, #{priceSetName},
-            #{setType}, #{bindPriority}, #{customerPricesetId}, #{productCountryId},
+            #{setType}, #{bindPriority}, #{customerPricesetId}, #{psvId}, #{psdId}, #{productCountryId},
             #{weightMin}, #{weightMax}, #{weightLabel}, #{effectiveDate}, #{chargeWeight},
             #{freightRate}, #{baseFreightRate}, #{discountPercent}, #{registrationFee},
             #{freightAmount}, #{surchargeAmount}, #{incomeTotal}, #{payTotal}, #{currency}, #{arBillStatus},
@@ -420,6 +422,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             set_type = #{setType},
             bind_priority = #{bindPriority},
             customer_priceset_id = #{customerPricesetId},
+            psv_id = #{psvId},
+            psd_id = #{psdId},
             product_country_id = #{productCountryId},
             weight_min = #{weightMin},
             weight_max = #{weightMax},

bms-back/sql/price/order_bill_psv_psd_alter.sql

@@ -0,0 +1,8 @@
+-- prc_order_bill：增加套餐版本ID、套餐明细ID
+SET NAMES utf8mb4;
+
+ALTER TABLE prc_order_bill
+  ADD COLUMN psv_id BIGINT DEFAULT NULL COMMENT '套餐版本ID，对应 prc_price_set_version.psv_id' AFTER customer_priceset_id,
+  ADD COLUMN psd_id BIGINT DEFAULT NULL COMMENT '套餐明细ID，对应 prc_price_set_detail.psd_id' AFTER psv_id,
+  ADD KEY idx_order_bill_psv (psv_id),
+  ADD KEY idx_order_bill_psd (psd_id);

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

@@ -72,6 +72,7 @@
             </el-descriptions-item>
             <el-descriptions-item label="套餐">{{ priceSetLabel(detail) }}</el-descriptions-item>
             <el-descriptions-item label="套餐版本">{{ detail.versionNo || (detail.psvId ? ('psv=' + detail.psvId) : '-') }}</el-descriptions-item>
+            <el-descriptions-item label="套餐明细ID">{{ detail.psdId != null ? detail.psdId : '-' }}</el-descriptions-item>
             <el-descriptions-item label="币种">
               <dict-tag :options="bms_currency" :value="displayCurrency(detail.currency)" />
             </el-descriptions-item>