From 6d6f3ecc111080094e91fd002e1990dcfa9783e6 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期二, 10 九月 2024 14:06:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-v2
---
src/main/java/com/mzl/flower/dto/request/payment/OrderQueryDTO.java | 3 +++
src/main/resources/mapper/payment/OrderMapper.xml | 4 ++++
2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/request/payment/OrderQueryDTO.java b/src/main/java/com/mzl/flower/dto/request/payment/OrderQueryDTO.java
index d271a9a..ca40541 100644
--- a/src/main/java/com/mzl/flower/dto/request/payment/OrderQueryDTO.java
+++ b/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;
}
diff --git a/src/main/resources/mapper/payment/OrderMapper.xml b/src/main/resources/mapper/payment/OrderMapper.xml
index 880740c..8bcdc82 100644
--- a/src/main/resources/mapper/payment/OrderMapper.xml
+++ b/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},'%')
--
Gitblit v1.9.3