From 3b054d0694de1a04c111f7adef089f264143cc8c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 27 八月 2025 11:52:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderStatisticsDetail.java | 29 ++++++++++-------------------
1 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderStatisticsDetail.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderStatisticsDetail.java
index 46b6a90..df370de 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderStatisticsDetail.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderStatisticsDetail.java
@@ -1,39 +1,30 @@
package com.ruoyi.order.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
import lombok.Data;
+import lombok.NoArgsConstructor;
+import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
@Data
+@AllArgsConstructor
+@NoArgsConstructor
public class OrderStatisticsDetail {
- private String date;
- /**
- * 服务订单数量
- */
- private Integer serviceTotal;
- /**
- * 单品订单数量
- */
- private Integer singleTotal;
-
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate dateTime;
/**
* 订单总数量
*/
private Integer total;
-
/**
* 订单总金额
*/
private BigDecimal totalMoney;
- /**
- * 服务订单金额
- */
- private BigDecimal serviceTotalMoney;
- /**
- * 单品订单金额
- */
- private BigDecimal singleTotalMoney;
}
--
Gitblit v1.7.1