Cui Zhi Feng
2024-09-18 3a6c70ccfece562accad0a3e3ae67745815d73a7
结算订单号
已修改4个文件
10 ■■■■ 文件已修改
src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemSettlementDTO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementDetailDTO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/payment/OrderSettlementDetailMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemSettlementDTO.java
@@ -85,4 +85,7 @@
    @JsonFormat(pattern="yyyy-MM-dd" ,timezone="GMT+8")
    @DateTimeFormat
    private LocalDateTime receiveTime;
    @ApiModelProperty(value = "订单号")
    private String orderNo;
}
src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementDetailDTO.java
@@ -52,4 +52,7 @@
    @JsonFormat(pattern="yyyy-MM-dd" ,timezone="GMT+8")
    @DateTimeFormat
    private LocalDateTime checkTime;
    @ApiModelProperty(value = "订单号")
    private String orderNo;
}
src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml
@@ -45,7 +45,7 @@
        SELECT ois.order_item_id, oi.flower_name, oi.flower_level, oi.num, oi.supplier_price price , s.`status`
        , ois.check_num, ois.check_fee, ois.replace_num, ois.replace_fee, ois.lack_num, ois.lack_fee_supplier lackFee
        , ois.station_fee, ois.sales_fee_supplier salesFee, ois.service_fee_rate, ois.service_fee
        , ois.income_supplier income, o.status_backend, o.create_time orderTime, o.receive_time
        , ois.income_supplier income, o.status_backend, o.create_time orderTime, o.receive_time, o.order_no
        , (select count(1) from t_order_item_sales sa where sa.order_item_id = oi.id) salesNum
        FROM t_delivery_order_item doi
        join t_delivery_order q on q.id = doi.delivery_id
src/main/resources/mapper/payment/OrderSettlementDetailMapper.xml
@@ -3,7 +3,7 @@
<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, o.receive_time, oi.check_time
        SELECT s.*, oi.flower_name, oi.flower_level, o.receive_time, oi.check_time, o.order_no
        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