cloudroam
2024-09-10 41319c683724d4bfb92e91df75e9444f468c54b1
平台加价,合伙人加价增加供应商筛选
已修改4个文件
25 ■■■■■ 文件已修改
src/main/java/com/mzl/flower/dto/request/flower/FlowerMarkupPsSpQueryDTO.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mzl/flower/dto/request/flower/FlowerMarkupSpQueryDTO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/flower/FlowerMarkupPsSpMapper.xml 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/flower/FlowerMarkupSpMapper.xml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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;
}
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;
}
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>
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'">