From 98153e20935ca47cb0e243410b521756a12a35db Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期一, 26 八月 2024 09:14:09 +0800
Subject: [PATCH] 售后列表查询 结算状态
---
src/main/resources/mapper/payment/OrderItemSalesMapper.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/payment/OrderItemSalesMapper.xml b/src/main/resources/mapper/payment/OrderItemSalesMapper.xml
index bf47555..1cabdc5 100644
--- a/src/main/resources/mapper/payment/OrderItemSalesMapper.xml
+++ b/src/main/resources/mapper/payment/OrderItemSalesMapper.xml
@@ -71,7 +71,7 @@
, oi.flower_level, oi.flower_category, o.customer, o.customer_tel, o.customer_province, o.customer_city
, o.customer_region, o.customer_address, oi.num flowerNum, oi.supplier_name, oi.price, oi.total
, o.order_no, si.sales_no, si.title, si.num, si.reason, si.total_fee, si.status, si.create_time
- , si.remarks
+ , si.remarks, oi.supplier_price, oi.markup_partner, si.audit_time
FROM t_order_item_sales si
join t_order_item oi on oi.id = si.order_item_id
join t_order o on si.order_id = o.id
@@ -106,17 +106,17 @@
</if>
<if test="condition.orderStartDate != null">
- AND oi.create_time >= #{condition.createStartDate}
+ AND oi.create_time >= #{condition.orderStartDate}
</if>
<if test="condition.orderEndDate != null">
- AND oi.create_time <= #{condition.createEndDate}
+ AND oi.create_time <= #{condition.orderEndDate}
</if>
<if test="condition.salesStartDate != null">
- AND si.create_time >= #{condition.createStartDate}
+ AND si.create_time >= #{condition.salesStartDate}
</if>
<if test="condition.salesEndDate != null">
- AND si.create_time <= #{condition.createEndDate}
+ AND si.create_time <= #{condition.salesEndDate}
</if>
<if test="condition.status != null and condition.status != ''">
--
Gitblit v1.9.3