From 2bbf273c57be42deafbf12e4327d815c201b3e7f Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期二, 17 十二月 2024 16:40:48 +0800
Subject: [PATCH] 1.小程序菜单
---
src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementDetailDTO.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementDetailDTO.java b/src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementDetailDTO.java
index b526e43..8a25482 100644
--- a/src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementDetailDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementDetailDTO.java
@@ -1,11 +1,14 @@
package com.mzl.flower.dto.response.payment;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.mzl.flower.base.AbstractTransDTO;
import com.mzl.flower.base.annotation.DictTrans;
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 OrderSettlementDetailDTO extends AbstractTransDTO {
@@ -25,8 +28,14 @@
@ApiModelProperty(value = "结算合计")
private BigDecimal totalAmount;
- @ApiModelProperty(value = "质检扣款")
+ @ApiModelProperty(value = "降级扣款")
private BigDecimal checkFee;
+
+ @ApiModelProperty(value = "缺货扣款")
+ private BigDecimal lackFee;
+
+ @ApiModelProperty(value = "补货扣款")
+ private BigDecimal replaceFee;
@ApiModelProperty(value = "集货站运费")
private BigDecimal stationFee;
@@ -34,4 +43,25 @@
@ApiModelProperty(value = "售后理赔")
private BigDecimal salesFee;
+ @ApiModelProperty(value = "收货日期")
+ @JsonFormat(pattern="yyyy-MM-dd" ,timezone="GMT+8")
+ @DateTimeFormat
+ private LocalDateTime receiveTime;
+
+ @ApiModelProperty(value = "质检日期")
+ @JsonFormat(pattern="yyyy-MM-dd" ,timezone="GMT+8")
+ @DateTimeFormat
+ private LocalDateTime checkTime;
+
+ @ApiModelProperty(value = "订单号")
+ private String orderNo;
+
+ private String orderId;
+
+ private Long supplierId;//供应商id
+
+ private String settlementId;
+
+ private String orderItemId;
+
}
--
Gitblit v1.9.3