From a70433b2ee5bb37823ab73422a01251343cb5f58 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 29 九月 2026 17:55:50 +0800
Subject: [PATCH] 修改订单业务流程和其他功能修改
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TCardChargingOrderAccountingStrategy.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TCardChargingOrderAccountingStrategy.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TCardChargingOrderAccountingStrategy.java
index 4fad790..b80d034 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TCardChargingOrderAccountingStrategy.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TCardChargingOrderAccountingStrategy.java
@@ -1,11 +1,27 @@
package com.ruoyi.order.api.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("t_card_charging_order_accounting_strategy")
public class TCardChargingOrderAccountingStrategy extends TChargingOrderAccountingStrategy {
+
+ @ApiModelProperty("时段原始电费（未优惠，企业优惠设置改造新增）")
+ @TableField("period_original_electric_price")
+ private BigDecimal periodOriginalElectricPrice;
+
+ @ApiModelProperty("时段优惠电费（原始-最终）")
+ @TableField("period_discount_electric_price")
+ private BigDecimal periodDiscountElectricPrice;
+
+ @ApiModelProperty("时段优惠服务费（原始-最终）")
+ @TableField("period_discount_service_price")
+ private BigDecimal periodDiscountServicePrice;
}
--
Gitblit v1.7.1