From 9bb9952db0b22034b4aea1f486df827d77a03031 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 17 十月 2024 14:41:35 +0800
Subject: [PATCH] add:销售合计统计运费+打包费;售后扣平台款字段，增加增加统计售后“打包运费（散户）”字段
---
src/main/resources/mapper/flower/FlowerMarkupSpMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/flower/FlowerMarkupSpMapper.xml b/src/main/resources/mapper/flower/FlowerMarkupSpMapper.xml
index e16fb0b..50062c8 100644
--- a/src/main/resources/mapper/flower/FlowerMarkupSpMapper.xml
+++ b/src/main/resources/mapper/flower/FlowerMarkupSpMapper.xml
@@ -16,7 +16,7 @@
join t_flower_markup_sp sp on sp.flower_id = f.id and sp.partner_id = #{partnerId}
left join t_supplier_info s on s.id = f.supplier_id
left join t_flower_category c on f.category = c.id
- WHERE f.deleted = 0 AND sp.fee > 0
+ WHERE f.deleted = 0
<if test="condition.name != null and condition.name != ''">
AND f.name LIKE concat('%', #{condition.name},'%')
</if>
@@ -33,6 +33,9 @@
)
)
</if>
+ <if test="condition.supplierName != null and condition.supplierName != ''">
+ AND s.name LIKE concat('%', #{condition.supplierName},'%')
+ </if>
<if test="condition.isFee != null">
<choose>
<when test="condition.isFee == 'markup'">
--
Gitblit v1.9.3