Merge remote-tracking branch 'origin/master' into master-v2

gongzuming

2024-09-10 6d6f3ecc111080094e91fd002e1990dcfa9783e6

Merge remote-tracking branch 'origin/master' into master-v2

 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},'%')