From 2b7ec842c2b0fff4b872084e828edd5c3f5dbaf5 Mon Sep 17 00:00:00 2001 From: 陶杰 <1378534974@qq.com> Date: 星期六, 21 九月 2024 22:51:21 +0800 Subject: [PATCH] 1.优惠券-活动优惠券-定时任务-领取时间小于当前时间,自动下架 2.优惠券-优惠券使用记录-定时任务-使用时间小于当前时间,自动过期 3.优惠券-积分优惠券-增加已领取数和未领取数 --- src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemSettlementDTO.java | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 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 3e21102..b6abfbb 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,9 +1,11 @@ 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.LocalDateTime; @@ -64,6 +66,9 @@ @ApiModelProperty(value = "售后退款") private BigDecimal salesFee; + @ApiModelProperty(value = "售后数量") + private Integer salesNum; + @ApiModelProperty(value = "服务费率") private Double serviceFeeRate; @@ -75,4 +80,12 @@ @ApiModelProperty(value = "下单时间") private LocalDateTime orderTime; + + @ApiModelProperty(value = "收货日期") + @JsonFormat(pattern="yyyy-MM-dd" ,timezone="GMT+8") + @DateTimeFormat + private LocalDateTime receiveTime; + + @ApiModelProperty(value = "订单号") + private String orderNo; } -- Gitblit v1.9.3