From f38160a365599318dae24eb2b9f07de8b78f7e1e Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 11 十月 2024 08:41:04 +0800
Subject: [PATCH] Merge branch 'master-v2' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v2
---
src/main/java/com/mzl/flower/dto/response/report/OrderPartnerReportResultVO.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/report/OrderPartnerReportResultVO.java b/src/main/java/com/mzl/flower/dto/response/report/OrderPartnerReportResultVO.java
index b19dcca..0676964 100644
--- a/src/main/java/com/mzl/flower/dto/response/report/OrderPartnerReportResultVO.java
+++ b/src/main/java/com/mzl/flower/dto/response/report/OrderPartnerReportResultVO.java
@@ -6,15 +6,14 @@
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
@Data
public class OrderPartnerReportResultVO {
@ApiModelProperty("下单日期")
- @JsonFormat(pattern="yyyy-MM-dd" ,timezone="GMT+8")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- private LocalDateTime orderDate;
+ private String orderDate;
@ApiModelProperty("销售额")
private BigDecimal orderTotal;
@@ -29,20 +28,20 @@
private BigDecimal orderPartnerPriceAmount;
- @ApiModelProperty("平台区间加价")
- private BigDecimal orderMarkupOneAmount;
+// @ApiModelProperty("平台区间加价")
+// private BigDecimal orderMarkupOneAmount;
- @ApiModelProperty("平台加价")
- private BigDecimal orderMarkupTwoAmount;
-
- @ApiModelProperty("平台区域加价--暂无")
- private BigDecimal platformAreaFeeAmount;
+// @ApiModelProperty("平台加价")
+// private BigDecimal orderMarkupTwoAmount;
+//
+// @ApiModelProperty("平台区域加价--暂无")
+// private BigDecimal platformAreaFeeAmount;
@ApiModelProperty("合伙人加价")
private BigDecimal orderMarkupPartnerAmount;
- @ApiModelProperty("合伙人区间加价--暂无")
- private BigDecimal partnerSectionFeeAmount;
+// @ApiModelProperty("合伙人区间加价--暂无")
+// private BigDecimal partnerSectionFeeAmount;
@ApiModelProperty("会员折扣")
private BigDecimal orderPriceDiscountAmount;
--
Gitblit v1.9.3