From f249c277d066e151a84b766a6b82c3bbdbe1326b Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期二, 03 九月 2024 13:24:01 +0800
Subject: [PATCH] 1.优惠券-所有修改方法dto自传id 2.优惠券-积分-批量接口改成post方法 3.优惠券-定时任务-会员优惠券每月一号凌晨未使用自动过期 4.优惠券-优惠券下单接口
---
src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemSettlementDTO.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemSettlementDTO.java b/src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemSettlementDTO.java
index 8057870..e878c48 100644
--- a/src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemSettlementDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemSettlementDTO.java
@@ -1,18 +1,17 @@
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.LocalDate;
import java.time.LocalDateTime;
@Data
public class DeliveryOrderItemSettlementDTO extends AbstractTransDTO {
+ @ApiModelProperty(value = "订单商品id")
+ private String orderItemId;
@ApiModelProperty(value = "商品名称")
private String flowerName;
@@ -41,14 +40,32 @@
private String statusBackend;
private String statusBackendStr;
- @ApiModelProperty(value = "质检扣款")
+ @ApiModelProperty(value = "降级数量")
+ private Integer checkNum;
+
+ @ApiModelProperty(value = "降级扣款")
private BigDecimal checkFee;
+
+ @ApiModelProperty(value = "补货数量")
+ private Integer replaceNum;
+
+ @ApiModelProperty(value = "补货扣款")
+ private BigDecimal replaceFee;
+
+ @ApiModelProperty(value = "缺货数量")
+ private Integer lackNum;
+
+ @ApiModelProperty(value = "缺货扣款")
+ private BigDecimal lackFee;
@ApiModelProperty(value = "集货站运费")
private BigDecimal stationFee;
@ApiModelProperty(value = "售后退款")
private BigDecimal salesFee;
+
+ @ApiModelProperty(value = "售后数量")
+ private Integer salesNum;
@ApiModelProperty(value = "服务费率")
private Double serviceFeeRate;
@@ -60,7 +77,5 @@
private BigDecimal income;
@ApiModelProperty(value = "下单时间")
- @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss" ,timezone="GMT+8")
- @DateTimeFormat
private LocalDateTime orderTime;
}
--
Gitblit v1.9.3