Merge remote-tracking branch 'origin/master'

gongzuming

2024-08-26 1f2bf377f0c41e5ba9d3b0094034e5637d81d6f3

Merge remote-tracking branch 'origin/master'

 src/main/java/com/mzl/flower/dto/request/payment/OrderItemSalesQueryDTO.java

@@ -11,6 +11,9 @@
    @ApiModelProperty(value = "订单id")
    private String orderId;

    @ApiModelProperty(value = "订单商品id")
    private String orderItemId;

    @ApiModelProperty(value = "商品名称")
    private String flowerName;


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

@@ -77,6 +77,10 @@
        join t_order o on si.order_id = o.id
        left join t_station s on s.id = oi.station_id
        WHERE oi.deleted = 0
        <if test="condition.orderItemId != null and condition.orderItemId != ''">
            AND si.order_item_id = #{condition.orderItemId}
        </if>

        <if test="condition.orderId != null and condition.orderId != ''">
            AND si.order_id = #{condition.orderId}
        </if>