From 1f2bf377f0c41e5ba9d3b0094034e5637d81d6f3 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期一, 26 八月 2024 15:52:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mzl/flower/dto/request/payment/OrderItemSalesQueryDTO.java | 3 +++
src/main/resources/mapper/payment/OrderItemSalesMapper.xml | 4 ++++
2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/request/payment/OrderItemSalesQueryDTO.java b/src/main/java/com/mzl/flower/dto/request/payment/OrderItemSalesQueryDTO.java
index 0296019..4d23a14 100644
--- a/src/main/java/com/mzl/flower/dto/request/payment/OrderItemSalesQueryDTO.java
+++ b/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;
diff --git a/src/main/resources/mapper/payment/OrderItemSalesMapper.xml b/src/main/resources/mapper/payment/OrderItemSalesMapper.xml
index 1cabdc5..5a29bcd 100644
--- a/src/main/resources/mapper/payment/OrderItemSalesMapper.xml
+++ b/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>
--
Gitblit v1.9.3