From d6c8f09fd628bd0111de4ee7071844465df9adb1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 28 十月 2024 18:57:35 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrderAccountingStrategy.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 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..53137bd 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -11,6 +12,7 @@
import java.io.Serializable;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
/**
* <p>
@@ -35,6 +37,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")
@@ -68,9 +74,26 @@
@TableField("period_electric_price")
private BigDecimal periodElectricPrice;
- @ApiModelProperty(value = "时段服务费")
+ @ApiModelProperty(value = "时段服务费(最终服务费 含折扣)")
@TableField("period_service_price")
private BigDecimal periodServicePrice;
+
+ @ApiModelProperty(value = "时段原服务费（不含折扣）")
+ @TableField("period_original_service_price")
+ private BigDecimal periodOriginalServicePrice;
+
+ @ApiModelProperty(value = "优惠券抵扣金额")
+ @TableField("coupon_discount_amount")
+ private BigDecimal couponDiscountAmount;
+
+ @ApiModelProperty(value = "会员优惠金额")
+ @TableField("vip_discount_amount")
+ private BigDecimal vipDiscountAmount;
+
+ @ApiModelProperty(value = "首次添加时间")
+ @TableField("create_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createTime;
@ApiModelProperty(value = "会员抵扣")
@TableField(exist = false)
@@ -80,9 +103,6 @@
@TableField(exist = false)
private BigDecimal couponDiscount;
- @ApiModelProperty(value = "最终服务费")
- @TableField(exist = false)
- private BigDecimal finalService;
}
--
Gitblit v1.7.1