From e12828656f64f05c81ca38bc027d7cc8841cf623 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Thu, 8 May 2025 14:20:59 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E7=A6=BB=E7=BA=BF=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E5=85=81=E8=AE=B8=E6=89=A3=E6=88=90=E8=B4=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hard/service/impl/order/HardOrderServiceImpl.java    | 1 +
 .../wallet/api/dto/WalletBalanceTransactionDto.java      | 3 +++
 .../wallet/controller/WalletTransactionController.java   | 2 +-
 .../bsd/pjcloud/wallet/mapper/WalletManageMapper.java    | 9 ++++++---
 .../pjcloud/wallet/service/WalletTransactionService.java | 2 +-
 .../service/impl/WalletTransactionServiceImpl.java       | 5 +++--
 .../impl/rule/WalletRuleTransactionServiceImpl.java      | 4 ++--
 7 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java
index e7e39b7aa..03d0b8bd6 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java
@@ -548,6 +548,7 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
         reduceBuild.setPrice(order.getPayPrice());
         reduceBuild.setBizId(String.valueOf(order.getId()));
         reduceBuild.setBizType(WalletBizEnum.PAYMENT);
+        reduceBuild.setForce(true);
         R<WalletTransactionEntity> reduceRes = walletTransactionService.reduceWalletBalance(reduceBuild);
         if (reduceRes.getCode() != 0 || ObjectUtil.isEmpty(reduceRes.getData())) {
             throw new RuntimeException("钱包扣款错误");
diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/WalletBalanceTransactionDto.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/WalletBalanceTransactionDto.java
index c3803d2bf..2e7d0e0f8 100644
--- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/WalletBalanceTransactionDto.java
+++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/WalletBalanceTransactionDto.java
@@ -29,4 +29,7 @@ public class WalletBalanceTransactionDto {
     @JsonProperty("bizType")
     private WalletBizEnum bizType;
 
+    @NotNull(message = "是否暴力消费")
+    private Boolean force = false;
+
 }
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTransactionController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTransactionController.java
index c3bed9151..59ba83ba3 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTransactionController.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTransactionController.java
@@ -61,7 +61,7 @@ public class WalletTransactionController {
     @Inner
     @PostMapping("/reduce-balance")
     public R<WalletTransactionEntity> reduceWalletBalance(@Valid @RequestBody WalletBalanceTransactionDto dto) {
-        WalletTransactionEntity walletTransaction = walletTransactionService.reduceWalletBalance(dto.getWalletId(), dto.getPrice(), dto.getBizId(), dto.getBizType());
+        WalletTransactionEntity walletTransaction = walletTransactionService.reduceWalletBalance(dto.getWalletId(), dto.getPrice(), dto.getBizId(), dto.getBizType(), dto.getForce());
         if (ObjectUtil.isEmpty(walletTransaction)) return R.failed("扣减钱包余额");
         return R.ok(walletTransaction);
     }
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletManageMapper.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletManageMapper.java
index 7675c5c2d..062dd060a 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletManageMapper.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletManageMapper.java
@@ -60,12 +60,15 @@ public interface WalletManageMapper extends PjcloudBaseMapper<WalletManageEntity
      *
      * @param id    钱包 id
      * @param price 消费金额
+     * @param force 是否强制消费(会导致扣款扣成负数)
      */
-    default int updateWhenConsumption(Long id, Integer price) {
+    default int updateWhenConsumption(Long id, Integer price, Boolean force) {
         LambdaUpdateWrapper<WalletManageEntity> lambdaUpdateWrapper = new LambdaUpdateWrapper<WalletManageEntity>()
                 .setSql(" balance = balance - " + price + ", total_expense = total_expense + " + price)
-                .eq(WalletManageEntity::getId, id)
-                .ge(WalletManageEntity::getBalance, price);
+                .eq(WalletManageEntity::getId, id);
+        if (ObjectUtil.isEmpty(force) || !force) {
+            lambdaUpdateWrapper.ge(WalletManageEntity::getBalance, price);
+        }
         return update(null, lambdaUpdateWrapper);
     }
 
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletTransactionService.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletTransactionService.java
index 03b90d82b..adb8f0352 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletTransactionService.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletTransactionService.java
@@ -27,7 +27,7 @@ public interface WalletTransactionService extends IService<WalletTransactionEnti
      * @param bizType  业务关联分类
      * @return 钱包流水
      */
-    WalletTransactionEntity reduceWalletBalance(Long walletId, Integer price, String bizId, WalletBizEnum bizType);
+    WalletTransactionEntity reduceWalletBalance(Long walletId, Integer price, String bizId, WalletBizEnum bizType, Boolean force);
 
 
     /**
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletTransactionServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletTransactionServiceImpl.java
index aa3417573..c3094e46d 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletTransactionServiceImpl.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletTransactionServiceImpl.java
@@ -84,13 +84,14 @@ public class WalletTransactionServiceImpl extends ServiceImpl<WalletTransactionM
     @Override
     @Transactional(rollbackFor = Exception.class)
     // @CacheEvict(value = CacheConstants.WALLET_DETAIL, key = "#walletId")
-    public WalletTransactionEntity reduceWalletBalance(Long walletId, Integer price, String bizId, WalletBizEnum bizType) {
+    public WalletTransactionEntity reduceWalletBalance(Long walletId, Integer price, String bizId, WalletBizEnum bizType, Boolean force) {
+        if (ObjectUtil.isEmpty(force)) force = false;
         WalletManageEntity wallet = walletManageService.getById(walletId);
         if (ObjectUtil.isEmpty(wallet)) {
             log.error("|{}|，用户钱包id({})不存在.", TAG, walletId);
             throw new RuntimeException("扣款失败,用户钱包不存在");
         }
-        int updateCounts = walletManageMapper.updateWhenConsumption(wallet.getId(), price);
+        int updateCounts = walletManageMapper.updateWhenConsumption(wallet.getId(), price, force);
         if (updateCounts == 0) {
             log.error("|{}|，用户钱包id({})余额不足.", TAG, walletId);
             throw new RuntimeException("钱包余额不足");
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 e5d4823dc..82f250e76 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
@@ -92,7 +92,7 @@ public class WalletRuleTransactionServiceImpl extends ServiceImpl<WalletRuleTran
         entity.setIsRefund(YesNoEnum.NO.getCode());
         baseMapper.insert(entity);
         // 源头钱包扣减
-        walletTransactionService.reduceWalletBalance(userConfig.getSourceWalletId(), body.getBalance(), String.valueOf(entity.getId()), WalletBizEnum.TRANSFER_ACCOUNTS);
+        walletTransactionService.reduceWalletBalance(userConfig.getSourceWalletId(), body.getBalance(), String.valueOf(entity.getId()), WalletBizEnum.TRANSFER_ACCOUNTS, Boolean.FALSE);
         // 目标钱包增加
         walletTransactionService.addWalletBalance(userConfig.getTargetWalletId(), body.getBalance(), String.valueOf(entity.getId()), WalletBizEnum.TRANSFER_ACCOUNTS);
     }
@@ -118,7 +118,7 @@ public class WalletRuleTransactionServiceImpl extends ServiceImpl<WalletRuleTran
         // 源头钱包增加
         walletTransactionService.addWalletBalance(detail.getSourceWalletId(), detail.getBalance(), String.valueOf(detail.getId()), WalletBizEnum.TRANSFER_ACCOUNTS_REFUND);
         // 目标钱包扣减
-        walletTransactionService.reduceWalletBalance(detail.getTargetWalletId(), detail.getBalance(), String.valueOf(detail.getId()), WalletBizEnum.TRANSFER_ACCOUNTS_REFUND);
+        walletTransactionService.reduceWalletBalance(detail.getTargetWalletId(), detail.getBalance(), String.valueOf(detail.getId()), WalletBizEnum.TRANSFER_ACCOUNTS_REFUND, Boolean.FALSE);
         // 改状态
         WalletRuleTransactionEntity updateObj = new WalletRuleTransactionEntity();
         updateObj.setId(id);