From 7a4f9541331bef779a506b38a27ed5c3373c0bec Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 15 五月 2025 13:53:22 +0800
Subject: [PATCH] 开发二级等保功能及心跳消息队列修改
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrderAccountingStrategy.java | 15 +++++++++++----
1 files changed, 11 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 b616194..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;
@@ -73,7 +74,7 @@
@TableField("period_electric_price")
private BigDecimal periodElectricPrice;
- @ApiModelProperty(value = "时段服务费")
+ @ApiModelProperty(value = "时段服务费(最终服务费 含折扣)")
@TableField("period_service_price")
private BigDecimal periodServicePrice;
@@ -81,8 +82,17 @@
@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 = "会员抵扣")
@@ -93,9 +103,6 @@
@TableField(exist = false)
private BigDecimal couponDiscount;
- @ApiModelProperty(value = "最终服务费")
- @TableField(exist = false)
- private BigDecimal finalService;
}
--
Gitblit v1.7.1