From ae1471f378f399f76518539ec8992e64a3673436 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 08 一月 2025 15:26:06 +0800
Subject: [PATCH] 1.订单提交：订单最小金额配置
---
src/main/java/com/mzl/flower/dto/response/report/OrderReportResultVO.java | 53 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 32 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/report/OrderReportResultVO.java b/src/main/java/com/mzl/flower/dto/response/report/OrderReportResultVO.java
index 50d3d8e..4fffd79 100644
--- a/src/main/java/com/mzl/flower/dto/response/report/OrderReportResultVO.java
+++ b/src/main/java/com/mzl/flower/dto/response/report/OrderReportResultVO.java
@@ -1,71 +1,82 @@
package com.mzl.flower.dto.response.report;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
@Data
public class OrderReportResultVO {
@ApiModelProperty("下单日期")
- private String orderDate;
+ @JsonFormat(pattern="yyyy-MM-dd" ,timezone="GMT+8")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ private LocalDateTime orderDate;
@ApiModelProperty("销售额")
- private BigDecimal saleFeeAmount;
+ private BigDecimal orderTotal;
+
+ @ApiModelProperty("销售合计（实付）")
+ private BigDecimal totalAmount;
@ApiModelProperty("花农底价")
- private BigDecimal supplierFeeAmount;
+ private BigDecimal orderSupplierPriceAmount;
@ApiModelProperty("平台区间加价")
- private BigDecimal platformSectionFeeAmount;
+ private BigDecimal orderMarkupOneAmount;
@ApiModelProperty("平台加价")
- private BigDecimal platformFeeAmount;
+ private BigDecimal orderMarkupTwoAmount;
- @ApiModelProperty("平台区域加价")
+ @ApiModelProperty("平台区域加价--暂无")
private BigDecimal platformAreaFeeAmount;
@ApiModelProperty("合伙人加价")
- private BigDecimal partnerFeeAmount;
+ private BigDecimal orderMarkupPartnerAmount;
- @ApiModelProperty("合伙人区间加价")
+ @ApiModelProperty("合伙人区间加价--暂无")
private BigDecimal partnerSectionFeeAmount;
@ApiModelProperty("会员折扣")
- private BigDecimal memberDiscountFeeAmount;
+ private BigDecimal orderPriceDiscountAmount;
@ApiModelProperty("优惠券")
- private BigDecimal couponFeeAmount;
+ private BigDecimal orderCouponAmountTotal;
@ApiModelProperty("降级扣款")
- private BigDecimal demotionFeeAmount;
+ private BigDecimal orderCheckFee;
@ApiModelProperty("缺货扣款")
- private BigDecimal stockoutFeeAmount;
+ private BigDecimal orderLackFeeSupplier;
@ApiModelProperty("补货扣款")
- private BigDecimal replenishmentFeeAmount;
+ private BigDecimal orderReplaceFee;
@ApiModelProperty("售后扣合伙人款")
- private BigDecimal afterSalePartnerFeeAmount;
+ private BigDecimal orderFeePartner;
@ApiModelProperty("售后扣花农款")
- private BigDecimal afterSaleSupplierFeeAmount;
+ private BigDecimal orderFeeSupplier;
@ApiModelProperty("售后扣平台款")
- private BigDecimal afterSalePlatformFeeAmount;
+ private BigDecimal orderFeePlatform;
- @ApiModelProperty("总包干费")
+ @ApiModelProperty("总包干费--暂无")
private BigDecimal partnerTotalFeeAmount;
- @ApiModelProperty("销售扎数")
- private Integer saleAmount;
+ @ApiModelProperty("总销售扎数")
+ private Integer orderNum;
- @ApiModelProperty("利润")
+ @ApiModelProperty("实际销售扎数")
+ private Integer realSaleNum;
+
+ @ApiModelProperty("利润--总包干费没有无法计算")
private BigDecimal profitFeeAmount;
- @ApiModelProperty("结算状态")
+ @ApiModelProperty("结算状态--暂无")
private String settleStatus;
}
--
Gitblit v1.9.3