结算列表明细 收货日期

Cui Zhi Feng

2024-09-18 0bdbf7baf1b225571cd2910f273ce5cfdb4cf2c7

结算列表明细 收货日期

 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;
@@ -79,6 +81,8 @@
    @ApiModelProperty(value = "下单时间")
    private LocalDateTime orderTime;

    @ApiModelProperty(value = "收货时间")
    @ApiModelProperty(value = "收货日期")
    @JsonFormat(pattern="yyyy-MM-dd" ,timezone="GMT+8")
    @DateTimeFormat
    private LocalDateTime receiveTime;
}

 src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementDetailDTO.java

@@ -1,11 +1,14 @@
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;

@Data
public class OrderSettlementDetailDTO extends AbstractTransDTO {
@@ -40,4 +43,13 @@
    @ApiModelProperty(value = "售后理赔")
    private BigDecimal salesFee;

    @ApiModelProperty(value = "收货日期")
    @JsonFormat(pattern="yyyy-MM-dd" ,timezone="GMT+8")
    @DateTimeFormat
    private LocalDateTime receiveTime;

    @ApiModelProperty(value = "质检日期")
    @JsonFormat(pattern="yyyy-MM-dd" ,timezone="GMT+8")
    @DateTimeFormat
    private LocalDateTime checkTime;
}

 src/main/resources/mapper/payment/OrderSettlementDetailMapper.xml

@@ -3,12 +3,13 @@
<mapper namespace="com.mzl.flower.mapper.payment.OrderSettlementDetailMapper">

    <select id="selectSettlementDetailList" resultType="com.mzl.flower.dto.response.payment.OrderSettlementDetailDTO">
        SELECT s.*, oi.flower_name, oi.flower_level
        SELECT s.*, oi.flower_name, oi.flower_level, o.receive_time, oi.check_time
        FROM t_order_settlement_detail s
        join t_order_item oi on oi.id = s.order_item_id
        join t_order o on o.id = s.order_id
        WHERE s.deleted = 0
        AND s.settlement_id = #{settlementId}
        ORDER BY s.create_time desc
        ORDER BY o.receive_time desc, o.id, oi.flower_name
    </select>

</mapper>