From c4664502dfdaffff555b532e65b51a57ac8b29c2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 十月 2024 17:51:32 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrderAccountingStrategy.java | 13 +++++++++++++
1 files changed, 13 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 68c2568..b616194 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
@@ -11,6 +11,7 @@
import java.io.Serializable;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
/**
* <p>
@@ -35,6 +36,10 @@
@ApiModelProperty(value = "充电订单id")
@TableField("charging_order_id")
private Long chargingOrderId;
+
+ @ApiModelProperty(value = "计费策略明细id")
+ @TableField("accounting_strategy_detail_id")
+ private Integer accountingStrategyDetailId;
@ApiModelProperty(value = "阶段（1=尖阶段，2=峰阶段，3=平阶段，4=谷阶段）")
@TableField("type")
@@ -71,6 +76,14 @@
@ApiModelProperty(value = "时段服务费")
@TableField("period_service_price")
private BigDecimal periodServicePrice;
+
+ @ApiModelProperty(value = "时段原服务费（不含折扣）")
+ @TableField("period_original_service_price")
+ private BigDecimal periodOriginalServicePrice;
+
+ @ApiModelProperty(value = "首次添加时间")
+ @TableField("create_time")
+ private LocalDateTime createTime;
@ApiModelProperty(value = "会员抵扣")
@TableField(exist = false)
--
Gitblit v1.7.1