From 5997dc8acfa81a6c867c28810d1c3c9714efc46c Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期六, 29 三月 2025 14:55:42 +0800
Subject: [PATCH] fix: 登录
---
src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemSettlementDTO.java | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemSettlementDTO.java b/src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemSettlementDTO.java
index 8057870..b6abfbb 100644
--- a/src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemSettlementDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemSettlementDTO.java
@@ -8,11 +8,12 @@
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
-import java.time.LocalDate;
import java.time.LocalDateTime;
@Data
public class DeliveryOrderItemSettlementDTO extends AbstractTransDTO {
+ @ApiModelProperty(value = "订单商品id")
+ private String orderItemId;
@ApiModelProperty(value = "商品名称")
private String flowerName;
@@ -41,14 +42,32 @@
private String statusBackend;
private String statusBackendStr;
- @ApiModelProperty(value = "质检扣款")
+ @ApiModelProperty(value = "降级数量")
+ private Integer checkNum;
+
+ @ApiModelProperty(value = "降级扣款")
private BigDecimal checkFee;
+
+ @ApiModelProperty(value = "补货数量")
+ private Integer replaceNum;
+
+ @ApiModelProperty(value = "补货扣款")
+ private BigDecimal replaceFee;
+
+ @ApiModelProperty(value = "缺货数量")
+ private Integer lackNum;
+
+ @ApiModelProperty(value = "缺货扣款")
+ private BigDecimal lackFee;
@ApiModelProperty(value = "集货站运费")
private BigDecimal stationFee;
@ApiModelProperty(value = "售后退款")
private BigDecimal salesFee;
+
+ @ApiModelProperty(value = "售后数量")
+ private Integer salesNum;
@ApiModelProperty(value = "服务费率")
private Double serviceFeeRate;
@@ -60,7 +79,13 @@
private BigDecimal income;
@ApiModelProperty(value = "下单时间")
- @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss" ,timezone="GMT+8")
- @DateTimeFormat
private LocalDateTime orderTime;
+
+ @ApiModelProperty(value = "收货日期")
+ @JsonFormat(pattern="yyyy-MM-dd" ,timezone="GMT+8")
+ @DateTimeFormat
+ private LocalDateTime receiveTime;
+
+ @ApiModelProperty(value = "订单号")
+ private String orderNo;
}
--
Gitblit v1.9.3