From bf6d095671e27f2bb616b9e29b079e852ceac1a7 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Wed, 26 Mar 2025 19:38:04 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=AE=A2=E5=8D=95=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bsd/pjcloud/hard/api/dto/order/HardOrderDto.java  | 2 ++
 .../src/main/resources/mapper/order/HardOrderMapper.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/HardOrderDto.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderDto.java
index b9cd8c701..1bed8bcd9 100644
--- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderDto.java
+++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderDto.java
@@ -39,6 +39,8 @@ public class HardOrderDto extends HardOrderEntity implements BaseIsIncludeTreeIn
 
     private List<String> orderPayTypeCodes;
 
+    private List<String> hardTypeCodes;
+
     /**
      * 是否查询购物车列表
      */
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml
index f75f31d0e..fb908f633 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml
@@ -83,6 +83,9 @@
         <if test="dto.merchantType != null and dto.merchantType != '' ">
             and a.merchant_type = #{dto.merchantType}
         </if>
+        <if test="dto.orderType != null and dto.orderType != '' ">
+            and a.order_type = #{dto.orderType}
+        </if>
         <if test="dto.hourType != null and dto.hourType != '' ">
             and a.hour_type = #{dto.hourType}
         </if>