Merge remote-tracking branch 'origin/master-v2' into master-v2

陶杰

2024-09-19 263a13a155ec759b1cb26cc00edd640f4d2e747c

Merge remote-tracking branch 'origin/master-v2' into master-v2

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

@@ -55,4 +55,6 @@

    @ApiModelProperty(value = "订单号")
    private String orderNo;

    private String orderId;
}

 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, o.order_no
        SELECT s.*, oi.flower_name, oi.flower_level, o.receive_time, oi.check_time, o.order_no, s.order_id
        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