From fbed0598a846d327fd69260bab7555b7d1eb4628 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Mon, 19 May 2025 09:51:31 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E9=A3=9F=E5=A0=82=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bsd/pjcloud/hard/api/dto/order/HardCarDto.java    | 2 ++
 .../src/main/resources/mapper/order/HardCarMapper.xml          | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardCarDto.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardCarDto.java
index eb65e6775..e246c21de 100644
--- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardCarDto.java
+++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardCarDto.java
@@ -19,4 +19,6 @@ public class HardCarDto extends HardCarEntity {
 
     private String hourType;
 
+    private Long merchantId;
+
 }
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml
index 048463a03..35e52ed68 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml
@@ -138,6 +138,9 @@
             <if test="dto.hourType != null and dto.hourType != '' ">
                 and o.hour_type = #{dto.hourType}
             </if>
+            <if test="dto.merchantId != null">
+                and o.merchant_id = #{dto.merchantId}
+            </if>
         </where>
         group by a.product_id
         order by SUM(a.product_count) desc