From 1fe9a1c594c40324b64f2822b2381e741fa231fc Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 09 一月 2025 09:00:45 +0800
Subject: [PATCH] 1.花材报表-把下架和强制下架状态分开
---
src/main/java/com/mzl/flower/dto/response/payment/OrderItemListDTO.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 53 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..13b8d5f 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,16 +1,21 @@
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;
import lombok.Data;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
@Data
public class OrderItemListDTO extends AbstractTransDTO {
private String id;
+
+ private String orderId;
private Long stationId;//集货站id
private String stationName;
@@ -58,4 +63,51 @@
@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
+
+ /**
+ * 等级
+ */
+ @ApiModelProperty(value = "等级")
+ private Integer commentGrade;
+
+ /**
+ * 内容
+ */
+ @ApiModelProperty(value = "内容")
+ private String comment;
+
+ /**
+ * 内容图片
+ */
+ @ApiModelProperty(value = "内容图片")
+ private String commentImages;
+
+ /**
+ * 匿名标志 0-非匿名 1-匿名
+ */
+ @ApiModelProperty(value = "匿名标志")
+ private Integer anonymityFalg;
+
+
}
--
Gitblit v1.9.3