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/vo/TActivityStatisticslVO.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TActivityStatisticslVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TActivityStatisticslVO.java
index f20373b..29445d2 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TActivityStatisticslVO.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TActivityStatisticslVO.java
@@ -1,5 +1,6 @@
package com.ruoyi.order.api.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.ser.Serializers;
import com.ruoyi.common.core.web.domain.BasePojo;
import com.ruoyi.order.api.model.*;
@@ -8,6 +9,7 @@
import lombok.Data;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
@Data
@ApiModel(value = "管理后台活动费用统计分页列表", description = "管理后台活动费用统计分页列表")
@@ -15,6 +17,8 @@
@ApiModelProperty(value = "用户手机号")
private String phone;
+ @ApiModelProperty(value = "用户id")
+ private Long appUserId;
@ApiModelProperty(value = "参与类型 优惠券 会员抵扣 会员活动 赠送会员")
private String type;
@@ -33,16 +37,17 @@
@ApiModelProperty(value = "实付")
private BigDecimal paymentAmount;
@ApiModelProperty(value = "消费时间")
- private String time;
- @ApiModelProperty(value = "消费时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime time;
+ @ApiModelProperty(value = "总计优惠")
private BigDecimal total;
- @ApiModelProperty(value = "消费时间")
+ @ApiModelProperty(value = "优惠券优惠")
private BigDecimal coupon;
- @ApiModelProperty(value = "消费时间")
+ @ApiModelProperty(value = "会员抵扣")
private BigDecimal discount;
- @ApiModelProperty(value = "消费时间")
+ @ApiModelProperty(value = "会员活动")
private BigDecimal vipActivity;
- @ApiModelProperty(value = "消费时间")
+ @ApiModelProperty(value = "赠送会员")
private BigDecimal grantVip;
}
--
Gitblit v1.7.1