92fe22d1e6e615750541ef650d815b9576bdf5de..92a4c3c35747bf1a043c2ff85650012d4eac9355
2024-09-10 cloudroam
Merge remote-tracking branch 'origin/master'
92a4c3 对比 | 目录
2024-09-10 cloudroam
add:”地址“模糊搜索查询订单
128f7c 对比 | 目录
已修改2个文件
7 ■■■■■ 文件已修改
src/main/java/com/mzl/flower/dto/request/payment/OrderQueryDTO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/payment/OrderMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mzl/flower/dto/request/payment/OrderQueryDTO.java
@@ -70,4 +70,7 @@
    @ApiModelProperty(hidden = true)
    private List<String> idList;
    @ApiModelProperty(value = "收货地址详细地址(拼接省市区地址)")
    private String address;
}
src/main/resources/mapper/payment/OrderMapper.xml
@@ -90,6 +90,10 @@
        <if test="condition.customerAddress != null and condition.customerAddress != ''">
            AND q.customer_address LIKE concat('%', #{condition.customerAddress},'%')
        </if>
        <if test="condition.address != null and condition.address != ''">
            AND CONCAT(q.customer_province, q.customer_city, q.customer_region, q.customer_address) LIKE concat('%',
            #{condition.address},'%')
        </if>
        <if test="condition.customer != null and condition.customer != ''">
            AND (q.customer LIKE concat('%', #{condition.customer},'%')
                or q.customer_tel LIKE concat('%', #{condition.customer},'%')