From 2e43d137c7832e149f3df4145aa7fcca2153ef9c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 31 八月 2024 16:52:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrderAccountingStrategy.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrderAccountingStrategy.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrderAccountingStrategy.java
index 67a9f61..68c2568 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrderAccountingStrategy.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrderAccountingStrategy.java
@@ -72,5 +72,17 @@
@TableField("period_service_price")
private BigDecimal periodServicePrice;
+ @ApiModelProperty(value = "会员抵扣")
+ @TableField(exist = false)
+ private BigDecimal vipDiscount;
+
+ @ApiModelProperty(value = "优惠券抵扣")
+ @TableField(exist = false)
+ private BigDecimal couponDiscount;
+
+ @ApiModelProperty(value = "最终服务费")
+ @TableField(exist = false)
+ private BigDecimal finalService;
+
}
--
Gitblit v1.7.1