From f93b1617d28c9d353fae628bfb86e0c15fa07579 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 31 十月 2024 11:59:21 +0800
Subject: [PATCH] 1.提现-增加明细记录 2.报表-财务报表-增加总销售扎数统计，将原销售扎数改成实际销售扎数
---
src/main/java/com/mzl/flower/service/payment/OrderSettlementService.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/payment/OrderSettlementService.java b/src/main/java/com/mzl/flower/service/payment/OrderSettlementService.java
index 9bad835..1bab152 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderSettlementService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderSettlementService.java
@@ -732,7 +732,7 @@
serviceFee = serviceFee.add(ois.getServiceFee());
serviceFeeRate = ois.getServiceFeeRate();
settlementAmount = settlementAmount.add(ois.getIncomeSupplier());
- WalletDO walletDO = walletService.getBySupplierId(supplierId);
+ WalletDO walletDO = walletService.getOrCreateBySupplierId(supplierId);
RLock lock = redissonClient.getLock(String.format(LockConstants.WALLET_ID_KEY, walletDO.getId()));
try {
if (lock.tryLock(10, 30, TimeUnit.SECONDS)) {
@@ -766,6 +766,7 @@
//已结算金额
walletDOInfo.setSettledAmount(walletDOInfo.getSettledAmount().add(ois.getIncomeSupplier()));
walletMapper.updateById(walletDOInfo);
+ walletBillRecord.create();
walletBillRecordMapper.insert(walletBillRecord);
} finally {
lock.unlock();
--
Gitblit v1.9.3