From 3b0a898df3cafe2c876d20b5bf9dd0f1734acc81 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 02 九月 2024 10:49:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrderAccountingStrategy.java | 20 ++++++++++++++++++++
1 files changed, 20 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 aeb158e..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
@@ -64,5 +64,25 @@
@TableField("charging_capacity")
private BigDecimal chargingCapacity;
+ @ApiModelProperty(value = "时段电费")
+ @TableField("period_electric_price")
+ private BigDecimal periodElectricPrice;
+
+ @ApiModelProperty(value = "时段服务费")
+ @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