From 2b7ec842c2b0fff4b872084e828edd5c3f5dbaf5 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期六, 21 九月 2024 22:51:21 +0800
Subject: [PATCH] 1.优惠券-活动优惠券-定时任务-领取时间小于当前时间，自动下架 2.优惠券-优惠券使用记录-定时任务-使用时间小于当前时间，自动过期 3.优惠券-积分优惠券-增加已领取数和未领取数
---
src/main/resources/mapper/payment/OrderItemSalesMapper.xml | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/payment/OrderItemSalesMapper.xml b/src/main/resources/mapper/payment/OrderItemSalesMapper.xml
index 5a29bcd..6abf279 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, oi.supplier_price, oi.markup_partner, si.audit_time
+ , si.remarks, oi.supplier_price, oi.markup_partner, si.audit_time,si.sales_type, oi.real_price, oi.real_total
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
@@ -136,6 +136,12 @@
<if test="condition.supplierId != null">
AND oi.supplier_id = #{condition.supplierId}
</if>
+ <if test="condition.supplierId != null">
+ AND oi.supplier_id = #{condition.supplierId}
+ </if>
+ <if test="condition.salesType != null">
+ AND si.sales_type = #{condition.salesType}
+ </if>
ORDER BY si.create_time desc
</select>
--
Gitblit v1.9.3