From d9e918ae32613a04de0b979078eba278556979c5 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期四, 26 九月 2024 17:36:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/dto/response/payment/OrderItemListDTO.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/payment/OrderItemListDTO.java b/src/main/java/com/mzl/flower/dto/response/payment/OrderItemListDTO.java
index 427aa68..cef30f4 100644
--- a/src/main/java/com/mzl/flower/dto/response/payment/OrderItemListDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/payment/OrderItemListDTO.java
@@ -1,6 +1,5 @@
package com.mzl.flower.dto.response.payment;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.mzl.flower.base.AbstractTransDTO;
import com.mzl.flower.base.annotation.DictTrans;
import io.swagger.annotations.ApiModelProperty;
@@ -11,6 +10,8 @@
@Data
public class OrderItemListDTO extends AbstractTransDTO {
private String id;
+
+ private String orderId;
private Long stationId;//集货站id
private String stationName;
@@ -58,4 +59,26 @@
@ApiModelProperty(value = "真实成交价格/每扎")
private BigDecimal realPrice;
+
+ @ApiModelProperty(value = "补货数量")
+ private Integer replaceNum;
+
+ @ApiModelProperty(value = "降级数量")
+ private Integer reduceNum;
+
+ @ApiModelProperty(value = "缺货数量")
+ private Integer lackNum;
+
+ @ApiModelProperty(value = "优惠券总金额")
+ private BigDecimal couponAmountTotal;
+
+ @ApiModelProperty(value = "真实成交总价格")
+ private BigDecimal realTotal;
+
+ @ApiModelProperty(value = "商品ID")
+ private Long flowerId;//商品id
+
+ @ApiModelProperty(value = "供应商ID")
+ private Long supplierId;//商品id
+
}
--
Gitblit v1.9.3