修改物流信息导入模板

luofl

2025-02-24 8acc98732aba58ad5c710f92d72e6fa5bf888d11

 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) {
@@ -45,6 +51,15 @@
                .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().subtract(reduce));
        walletVO.setVipWithdrawalMinAmount(data.getVipWithdrawalMinAmount());