From 96abc87da07408ef817d9086ea71ba4c287aa474 Mon Sep 17 00:00:00 2001 From: cloudroam <cloudroam> Date: 星期一, 09 十二月 2024 11:52:07 +0800 Subject: [PATCH] Merge branch 'master-v5' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v5 --- src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewDTO.java | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewDTO.java b/src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewDTO.java index f55e432..8662ab6 100644 --- a/src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewDTO.java +++ b/src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewDTO.java @@ -34,7 +34,28 @@ @ApiModelProperty(value = "物流扣款") private BigDecimal feePlatformTransport; + @ApiModelProperty(value = "打包运费") + private BigDecimal feePackingTransport; + @ApiModelProperty(value = "下单时间") private LocalDateTime orderTime; + @ApiModelProperty(value = "降级数量") + private Integer reduceNum; + + @ApiModelProperty(value = "降级金额") + private BigDecimal reduceAmount; + + @ApiModelProperty(value = "补货数量") + private Integer replaceNum; + + @ApiModelProperty(value = "缺货数量") + private Integer lackNum; + + @ApiModelProperty(value = "质检总扣款") + private BigDecimal checkTotalAmount; + + @ApiModelProperty(value = "已退总金额") + private BigDecimal refundTotalAmount; + } -- Gitblit v1.9.3