From ad5db85e540947e82c7a4d5612879b3b3ecdf459 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 21 八月 2026 10:38:07 +0800
Subject: [PATCH] update
---
backend/src/main/java/com/tourguide/modules/finance/service/AdminFinanceService.java | 22 +++++++---------------
1 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/backend/src/main/java/com/tourguide/modules/finance/service/AdminFinanceService.java b/backend/src/main/java/com/tourguide/modules/finance/service/AdminFinanceService.java
index 7f8b108..d4081b0 100644
--- a/backend/src/main/java/com/tourguide/modules/finance/service/AdminFinanceService.java
+++ b/backend/src/main/java/com/tourguide/modules/finance/service/AdminFinanceService.java
@@ -39,15 +39,18 @@
private final GuideUserMapper guideUserMapper;
private final GuideTeamMapper guideTeamMapper;
private final PlatformSettingsService settingsService;
+ private final GuideWithdrawalService guideWithdrawalService;
public AdminFinanceService(TourOrderMapper orderMapper, GuideWithdrawalMapper withdrawalMapper,
GuideUserMapper guideUserMapper, GuideTeamMapper guideTeamMapper,
- PlatformSettingsService settingsService) {
+ PlatformSettingsService settingsService,
+ GuideWithdrawalService guideWithdrawalService) {
this.orderMapper = orderMapper;
this.withdrawalMapper = withdrawalMapper;
this.guideUserMapper = guideUserMapper;
this.guideTeamMapper = guideTeamMapper;
this.settingsService = settingsService;
+ this.guideWithdrawalService = guideWithdrawalService;
}
public FinanceLedgerPageResponse ledger(long page, long size, String direction, String keyword,
@@ -92,18 +95,7 @@
@Transactional
public WithdrawalResponse processWithdrawal(Long id, WithdrawalProcessRequest request, String processor) {
- GuideWithdrawal withdrawal = withdrawalMapper.selectById(id);
- if (withdrawal == null) throw new BusinessException(404, "提现申请不存在");
- if (!"PENDING".equals(withdrawal.getStatus())) throw new BusinessException(409, "提现申请已处理");
- if ("REJECTED".equals(request.getStatus()) && !StringUtils.hasText(request.getAuditRemark())) {
- throw new BusinessException(400, "驳回提现时请填写处理备注");
- }
- withdrawal.setStatus(request.getStatus());
- withdrawal.setAuditRemark(StringUtils.hasText(request.getAuditRemark()) ? request.getAuditRemark().trim() : null);
- withdrawal.setProcessor(processor);
- withdrawal.setProcessedAt(LocalDateTime.now());
- withdrawalMapper.updateById(withdrawal);
- return new WithdrawalResponse(withdrawal);
+ return guideWithdrawalService.process(id, request.getStatus(), request.getAuditRemark(), processor);
}
private LambdaQueryWrapper<TourOrder> ledgerQuery(boolean refund, String keyword, String paymentMethod,
@@ -149,8 +141,8 @@
guideIncome = guideIncome.negate();
amount = amount.negate();
}
- LocalDateTime settledAt = order.getCompletedAt() == null ? null
- : order.getCompletedAt().plusDays(settings.getSettlementDays());
+ LocalDateTime settledAt = order.getSettledAt() == null
+ ? order.getSettlementDueAt() : order.getSettledAt();
Long teamId = order.getCommissionTeamId() != null
? order.getCommissionTeamId()
: guide == null ? null : guide.getTeamId();
--
Gitblit v1.7.1