From d1272c57721c81b528ec77ebc26a33ffe7982ec0 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Tue, 4 Mar 2025 17:24:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2=E5=93=81=E7=89=8C=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/logpm/statistics/dto/MerchantStatisticsDTO.java    | 5 +++++
 .../logpm/statistics/mapper/StatisticsOrderInfoMapper.xml  | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/dto/MerchantStatisticsDTO.java b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/dto/MerchantStatisticsDTO.java
index 45b7001ef..9a323772e 100644
--- a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/dto/MerchantStatisticsDTO.java
+++ b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/dto/MerchantStatisticsDTO.java
@@ -167,5 +167,10 @@ public class MerchantStatisticsDTO implements Serializable {
 	 */
 	private List<Long> warehouseIds;
 
+	/**
+	 * 品牌
+	 */
+	private String brand;
+
 
 }
diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml
index b35b1c2a5..b58978d1e 100644
--- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml
+++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml
@@ -129,6 +129,10 @@
         <if test="param.payWay != null and param.payWay != '' ">
             and lww.pay_way = #{param.payWay}
         </if>
+        <if test="param.brand != null and param.brand != ''">
+            and lsoi.brand = #{param.brand}
+        </if>
+
         and lsoi.destination_warehouse_id in
         <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
             #{item}
@@ -686,6 +690,9 @@
         <if test="param.listType == 1">
             and lsoi.type_service != '2'
         </if>
+        <if test="param.brand != null and param.brand != '' ">
+            and lsoi.brand = #{param.brand}
+        </if>
         <if test="param.listType == 2">
             and lsoi.type_service = '2'
         </if>