From 9615ef3023e1a60d202e86178003a2b864191106 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 07 十一月 2024 20:10:00 +0800
Subject: [PATCH] Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v4
---
src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewListDTO.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewListDTO.java b/src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewListDTO.java
index d722c31..406528e 100644
--- a/src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewListDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewListDTO.java
@@ -53,6 +53,12 @@
@ApiModelProperty(value = "供应商名称")
private String supplierName;
+ @ApiModelProperty(value = "供应商价格")
+ private BigDecimal supplierPrice;
+
+ @ApiModelProperty(value = "合伙人加价")
+ private BigDecimal markupPartner;
+
@ApiModelProperty(value = "商品售价")
private BigDecimal price;
@@ -87,4 +93,18 @@
@ApiModelProperty(value = "平台回复")
private String remarks;
+
+ @ApiModelProperty(value = "审核时间")
+ private LocalDateTime auditTime;
+
+ @ApiModelProperty(value = "售后类型")
+ @DictTrans(target = "salesTypeStr", codeType = "after_sale_type")
+ private String salesType;
+ private String salesTypeStr;
+
+ @ApiModelProperty(value = "真实成交价格/每扎")
+ private BigDecimal realPrice;
+
+ @ApiModelProperty(value = "真实成交总价格")
+ private BigDecimal realTotal;
}
--
Gitblit v1.9.3