From d7b9c4293e120d3d116bf59800d8da016ba0d70c Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 30 Sep 2025 09:35:54 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=98=AF=E5=90=A6=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?=E7=94=A8=E4=BA=8E100=E5=85=83=E8=B7=A8=E5=8D=95=E4=BD=8D?=
 =?UTF-8?q?=E5=90=83=E9=A5=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wallet/api/entity/rule/WalletRuleJoinEntity.java       | 6 ++++++
 .../wallet/api/vo/rule/WalletRuleJoinUserConfigVo.java     | 5 +++++
 .../service/impl/rule/WalletRuleJoinServiceImpl.java       | 1 +
 .../impl/rule/WalletRuleTransactionServiceImpl.java        | 5 ++++-
 .../main/resources/mapper/rule/WalletRuleJoinMapper.xml    | 7 +++++++
 5 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/rule/WalletRuleJoinEntity.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/rule/WalletRuleJoinEntity.java
index 672287860..0c907f52b 100644
--- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/rule/WalletRuleJoinEntity.java
+++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/rule/WalletRuleJoinEntity.java
@@ -57,6 +57,12 @@ public class WalletRuleJoinEntity extends Model<WalletRuleJoinEntity> {
     @Schema(description = "是否启用")
     private String status;
 
+    /**
+     * 是否保留100元(用户跨单位支付)
+     */
+    @Schema(description = "是否保留100元(用户跨单位支付)")
+    private String isReservePrice;
+
     /**
      * 创建人
      */
diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/rule/WalletRuleJoinUserConfigVo.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/rule/WalletRuleJoinUserConfigVo.java
index cecfe5aed..ae172ad45 100644
--- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/rule/WalletRuleJoinUserConfigVo.java
+++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/rule/WalletRuleJoinUserConfigVo.java
@@ -67,4 +67,9 @@ public class WalletRuleJoinUserConfigVo {
      */
     private Integer balanceMultiple;
 
+    /**
+     * 是否保留100元用于钱包支付
+     */
+    private String isReservePrice;
+
 }
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/rule/WalletRuleJoinServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/rule/WalletRuleJoinServiceImpl.java
index c54fc67e8..c962f45b3 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/rule/WalletRuleJoinServiceImpl.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/rule/WalletRuleJoinServiceImpl.java
@@ -184,6 +184,7 @@ public class WalletRuleJoinServiceImpl extends ServiceImpl<WalletRuleJoinMapper,
             throw new RuntimeException("该用户所属的部门<" + sysDept.getName() + ">未配置未打开");
         }
         configVo.setBalanceMultiple(walletRuleJoin.getBalanceMultiple());
+        configVo.setIsReservePrice(walletRuleJoin.getIsReservePrice());
         // 计算最大可以转过去的金额
         Long maxTransferBalance = BigDecimal.valueOf(sourceWallet.getTotalRecharge()).multiply(BigDecimal.valueOf(walletRuleJoin.getBalanceMultiple())).divide(BigDecimal.valueOf(100)).setScale(0, RoundingMode.HALF_UP).longValue();
         configVo.setMaxTransferBalance(maxTransferBalance);
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/rule/WalletRuleTransactionServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/rule/WalletRuleTransactionServiceImpl.java
index 4f11eeea3..98722d373 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/rule/WalletRuleTransactionServiceImpl.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/rule/WalletRuleTransactionServiceImpl.java
@@ -130,7 +130,10 @@ public class WalletRuleTransactionServiceImpl extends ServiceImpl<WalletRuleTran
         // 查询源饭卡
         if (ObjectUtil.equals(userConfig.getSourceWalletUniqueCode(), WalletTypeEnum.EAT.getCode())) {
             if (price < 10000) {
-                throw new RuntimeException(WalletTypeEnum.EAT.getDesc() + "余额必须留100元用于公务餐");
+                // 是否开启用于100元跨单位吃饭
+                if (ObjectUtil.equals(userConfig.getIsReservePrice(), YesNoEnum.YES.getCode())) {
+                    throw new RuntimeException(WalletTypeEnum.EAT.getDesc() + "余额必须留100元用于公务餐");
+                }
             }
         }
         // 是否已经超过最大限制
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/rule/WalletRuleJoinMapper.xml b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/rule/WalletRuleJoinMapper.xml
index c8615e689..954e58d70 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/rule/WalletRuleJoinMapper.xml
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/rule/WalletRuleJoinMapper.xml
@@ -24,6 +24,7 @@
                a.target_dept_id,
                a.balance_multiple,
                a.status,
+               a.is_reserve_price,
                a.create_by,
                a.create_time,
                a.update_by,
@@ -34,6 +35,12 @@
 
     <sql id="whereA">
         a.del_flag = 0
+        <if test="dto.targetDeptId != null">
+            and a.target_dept_id = #{dto.targetDeptId}
+        </if>
+        <if test="dto.status != null and dto.status != '' ">
+            and a.status = #{dto.status}
+        </if>
         <if test="dto.sourceWalletTypeId != null">
             and a.source_wallet_type_id = #{dto.sourceWalletTypeId}
         </if>