From bca4733e4b0fcd9b6496e608304549a09f982463 Mon Sep 17 00:00:00 2001
From: yanderong <307678080@qq.com>
Date: 星期五, 02 十月 2026 19:56:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.3' into 2.3
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
index 6b4dcfd..19e9da4 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
@@ -252,6 +252,34 @@
@TableField("discount_service_charge")
private BigDecimal discountServiceCharge;
+ @ApiModelProperty(value = "锁定额度是否已释放（0=未释放，1=已释放；防重复释放幂等标记）")
+ @TableField("lock_released")
+ private Integer lockReleased;
+
+ @ApiModelProperty(value = "结算完成标记（NULL/0=未结算，1=已结算；结算成功后置位，兜底扫描不回退已结算订单）")
+ @TableField("settle_status")
+ private Integer settleStatus;
+
+ @ApiModelProperty(value = "企业优惠方式快照（1=不优惠，2=按比例优惠，3=按优惠单价收费；为空=建单时未固化，结算按实时查询并回填）")
+ @TableField("preferential_type")
+ private Integer preferentialType;
+
+ @ApiModelProperty(value = "服务费优惠比例快照（%，方式2使用）")
+ @TableField("service_discount_rate")
+ private BigDecimal serviceDiscountRate;
+
+ @ApiModelProperty(value = "计费模板ID快照（方式3使用）")
+ @TableField("billing_template_id")
+ private Integer billingTemplateId;
+
+ @ApiModelProperty(value = "计费模板明细快照JSON（方式3使用，抵抗模板后续变更/删除）")
+ @TableField("billing_template_snapshot")
+ private String billingTemplateSnapshot;
+
+ @ApiModelProperty(value = "优惠快照固化时间")
+ @TableField("preferential_snapshot_time")
+ private LocalDateTime preferentialSnapshotTime;
+
@ApiModelProperty(value = "会员折扣")
@TableField("vip_discount")
private BigDecimal vipDiscount;
--
Gitblit v1.7.1