From 70db17490ce8861ed510afda35361fed1c2a59cb Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Wed, 26 Mar 2025 14:47:45 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=AE=A2=E5=8D=95=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/800pjcloudx_wallet.sql                                | 6 ++++--
 .../com/bsd/pjcloud/hard/api/dto/order/HardOrderDto.java | 2 ++
 .../src/main/resources/mapper/order/HardOrderMapper.xml  | 9 ++++++---
 .../wallet/api/constant/WalletRulePriceTypeEnum.java     | 5 ++++-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/db/800pjcloudx_wallet.sql b/db/800pjcloudx_wallet.sql
index 08ceb1c8e..378dc1e2c 100644
--- a/db/800pjcloudx_wallet.sql
+++ b/db/800pjcloudx_wallet.sql
@@ -101,7 +101,8 @@ CREATE TABLE wallet_rule_price_config
     update_by       varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '修改人',
     update_time     datetime                               DEFAULT NULL COMMENT '修改时间',
     del_flag        char(1) COLLATE utf8mb4_general_ci     DEFAULT '0' COMMENT '删除标记',
-    tenant_id       bigint                                 DEFAULT NULL COMMENT '租户ID'
+    tenant_id       bigint                                 DEFAULT NULL COMMENT '租户ID',
+    PRIMARY KEY (id)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
   COLLATE = utf8mb4_general_ci COMMENT = '商家商品价格配置表';
@@ -120,7 +121,8 @@ CREATE TABLE wallet_rule_mch_config
     update_by            varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '修改人',
     update_time          datetime                               DEFAULT NULL COMMENT '修改时间',
     del_flag             char(1) COLLATE utf8mb4_general_ci     DEFAULT '0' COMMENT '删除标记',
-    tenant_id            bigint                                 DEFAULT NULL COMMENT '租户ID'
+    tenant_id            bigint                                 DEFAULT NULL COMMENT '租户ID',
+    PRIMARY KEY (id)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4
   COLLATE = utf8mb4_general_ci COMMENT = '商户规格配置表';
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 7b4d70e54..8d913d157 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
@@ -25,6 +25,8 @@ public class HardOrderDto extends HardOrderEntity implements BaseIsIncludeTreeIn
 
     private List<String> hardTypeCodes;
 
+    private String hardTypeCode;
+
     private List<Long> mchIds;
 
     private List<String> orderStatusCodes;
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 ca962349a..a20d094ff 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
@@ -165,8 +165,11 @@
         left join hard_manager m on m.id = a.hard_id
         <where>
             <include refid="whereA"/>
+            <if test="dto.hardTypeCode != null and dto.hardTypeCode != '' ">
+                and m.type = #{dto.hardTypeCode}
+            </if>
             <if test="dto.hardTypeCodes != null and dto.hardTypeCodes.size() != 0">
-                and m.unique_code in
+                and m.type in
                 <foreach collection="dto.hardTypeCodes" item="v" open="(" close=")" separator=",">
                     #{v}
                 </foreach>
@@ -187,7 +190,7 @@
         <where>
             <include refid="whereA"/>
             <if test="dto.hardTypeCodes != null and dto.hardTypeCodes.size() != 0">
-                and m.unique_code in
+                and m.type in
                 <foreach collection="dto.hardTypeCodes" item="v" open="(" close=")" separator=",">
                     #{v}
                 </foreach>
@@ -206,7 +209,7 @@
         <where>
             <include refid="whereA"/>
             <if test="dto.hardTypeCodes != null and dto.hardTypeCodes.size() != 0">
-                and m.unique_code in
+                and m.type in
                 <foreach collection="dto.hardTypeCodes" item="v" open="(" close=")" separator=",">
                     #{v}
                 </foreach>
diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/WalletRulePriceTypeEnum.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/WalletRulePriceTypeEnum.java
index 71819f330..62551ae1f 100644
--- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/WalletRulePriceTypeEnum.java
+++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/WalletRulePriceTypeEnum.java
@@ -6,11 +6,14 @@ import lombok.Getter;
 
 import java.util.Arrays;
 
+/**
+ * 钱包规则
+ */
 @Getter
 @AllArgsConstructor
 public enum WalletRulePriceTypeEnum {
     STRIDE_LIMIT("10", "跨单位额外支付"),
-    EVERY_LIMIT("20", "每餐额度额外支付"),
+    EVERY_LIMIT("20", "每餐额外支付"),
     ;
 
     private final String code;