From 41319c683724d4bfb92e91df75e9444f468c54b1 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 10 九月 2024 15:03:23 +0800
Subject: [PATCH] 平台加价，合伙人加价增加供应商筛选
---
src/main/resources/mapper/flower/FlowerMarkupPsSpMapper.xml | 13 +++++++++++++
src/main/java/com/mzl/flower/dto/request/flower/FlowerMarkupSpQueryDTO.java | 3 +++
src/main/java/com/mzl/flower/dto/request/flower/FlowerMarkupPsSpQueryDTO.java | 6 ++++++
src/main/resources/mapper/flower/FlowerMarkupSpMapper.xml | 3 +++
4 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/request/flower/FlowerMarkupPsSpQueryDTO.java b/src/main/java/com/mzl/flower/dto/request/flower/FlowerMarkupPsSpQueryDTO.java
index 9dc2b2d..0c77b88 100644
--- a/src/main/java/com/mzl/flower/dto/request/flower/FlowerMarkupPsSpQueryDTO.java
+++ b/src/main/java/com/mzl/flower/dto/request/flower/FlowerMarkupPsSpQueryDTO.java
@@ -20,4 +20,10 @@
@ApiModelProperty(value = "标签")
private String tags;
+ @ApiModelProperty(value = "是否加价")
+ private String isFee;
+
+ @ApiModelProperty(value = "供应商")
+ private String supplierName;
+
}
diff --git a/src/main/java/com/mzl/flower/dto/request/flower/FlowerMarkupSpQueryDTO.java b/src/main/java/com/mzl/flower/dto/request/flower/FlowerMarkupSpQueryDTO.java
index dab0c25..725af56 100644
--- a/src/main/java/com/mzl/flower/dto/request/flower/FlowerMarkupSpQueryDTO.java
+++ b/src/main/java/com/mzl/flower/dto/request/flower/FlowerMarkupSpQueryDTO.java
@@ -23,4 +23,7 @@
@ApiModelProperty(value = "是否加价")
private String isFee;
+ @ApiModelProperty(value = "供应商")
+ private String supplierName;
+
}
diff --git a/src/main/resources/mapper/flower/FlowerMarkupPsSpMapper.xml b/src/main/resources/mapper/flower/FlowerMarkupPsSpMapper.xml
index 5690dfd..af658e6 100644
--- a/src/main/resources/mapper/flower/FlowerMarkupPsSpMapper.xml
+++ b/src/main/resources/mapper/flower/FlowerMarkupPsSpMapper.xml
@@ -33,6 +33,19 @@
)
)
</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'">
+ AND sp.fee > 0
+ </when>
+ <otherwise>
+ AND (sp.fee is null or sp.fee = 0)
+ </otherwise>
+ </choose>
+ </if>
ORDER BY f.id
</select>
diff --git a/src/main/resources/mapper/flower/FlowerMarkupSpMapper.xml b/src/main/resources/mapper/flower/FlowerMarkupSpMapper.xml
index e16fb0b..cf640fa 100644
--- a/src/main/resources/mapper/flower/FlowerMarkupSpMapper.xml
+++ b/src/main/resources/mapper/flower/FlowerMarkupSpMapper.xml
@@ -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