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 | 9 ++++++++- 1 files changed, 8 insertions(+), 1 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 b949598..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 @@ -82,6 +82,14 @@ @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") @@ -94,7 +102,6 @@ @ApiModelProperty(value = "优惠券抵扣") @TableField(exist = false) private BigDecimal couponDiscount; - -- Gitblit v1.7.1