From 8acc98732aba58ad5c710f92d72e6fa5bf888d11 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期一, 24 二月 2025 01:08:06 +0800
Subject: [PATCH] 修改物流信息导入模板
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WalletServiceImpl.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WalletServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WalletServiceImpl.java
index 65f5425..ca9e4de 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WalletServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/WalletServiceImpl.java
@@ -1,6 +1,10 @@
package com.ruoyi.account.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.order.feignClient.OrderClient;
+import com.ruoyi.order.feignClient.RemoteOrderGoodsClient;
+import com.ruoyi.order.model.Order;
+import com.ruoyi.order.model.OrderGood;
import com.ruoyi.other.api.enums.WithdrawalAuditStatus;
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.account.api.model.WithdrawalRequests;
@@ -25,6 +29,8 @@
private RemoteVipSettingClient remoteVipSettingClient;
@Resource
private WithdrawalRequestsService withdrawalRequestsService;
+ @Resource
+ private RemoteOrderGoodsClient remoteOrderGoodsClient;
@Override
public WalletVO getWalletByUserId(Long userId) {
@@ -42,18 +48,25 @@
// 获取提现审核中的金额
List<WithdrawalRequests> waitAuditList = withdrawalRequestsService.list(new LambdaQueryWrapper<WithdrawalRequests>()
.eq(WithdrawalRequests::getAppUserId, userId)
- .eq(WithdrawalRequests::getAuditStatus, WithdrawalAuditStatus.WAIT_AUDIT));
-
+ .eq(WithdrawalRequests::getAuditStatus, WithdrawalAuditStatus.WAIT_AUDIT.getCode()));
+ BigDecimal reduce = waitAuditList.stream().map(WithdrawalRequests::getWithdrawalAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
WalletVO walletVO = new WalletVO();
+
+
+ R<List<OrderGood>> unDistributedOrder = remoteOrderGoodsClient.getUnDistributedOrder(userId);
+ List<OrderGood> unDistributedOrderList = unDistributedOrder.getData();
+ BigDecimal commissionAmount = unDistributedOrderList.stream()
+ .map(OrderGood::getSuperiorSubcommission)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+ walletVO.setCommissionAmount(appUser.getTotalDistributionAmount().add(commissionAmount));
walletVO.setWithdrawalAmount(appUser.getWithdrawableAmount());
- walletVO.setWithdrawnAmount(appUser.getWithdrawnAmount());
+ walletVO.setWithdrawnAmount(appUser.getWithdrawnAmount().subtract(reduce));
walletVO.setVipWithdrawalMinAmount(data.getVipWithdrawalMinAmount());
walletVO.setTotalRechargeAmount(appUser.getTotalRechargeAmount());
walletVO.setTotalRedPacketAmount(appUser.getTotalRedPacketAmount());
walletVO.setTotalDistributionAmount(appUser.getTotalDistributionAmount());
- walletVO.setAuditAmount(waitAuditList.stream()
- .map(WithdrawalRequests::getWithdrawalAmount)
- .reduce(BigDecimal.ZERO, BigDecimal::add));
+ walletVO.setAuditAmount(reduce);
walletVO.setBalance(appUser.getBalance());
return walletVO;
}
--
Gitblit v1.7.1