Helius
2022-04-27 deaf2b0b4ada3689e235754b61c9c34133c00157
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -14,6 +14,7 @@
import cc.mrbird.febs.mall.service.ICommonService;
import cc.mrbird.febs.mall.vo.MallMemberVo;
import cc.mrbird.febs.mall.vo.MoneyFlowVo;
import cc.mrbird.febs.mall.vo.RankListVo;
import cc.mrbird.febs.mall.vo.TeamListVo;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
@@ -33,6 +34,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -229,6 +231,9 @@
        }
        MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(mallMemberVo.getId());
        mallMemberVo.setBalance(wallet.getBalance());
        mallMemberVo.setScore(wallet.getScore());
        mallMemberVo.setPrizeScore(wallet.getPrizeScore());
        mallMemberVo.setTotalCost(mallOrderInfoMapper.selectTotalAmount(id));
        return new FebsResponse().success().data(mallMemberVo);
    }
@@ -383,10 +388,10 @@
            throw new FebsException("最小提现金额为100");
        }
        MallMemberPayment payment = mallMemberPaymentMapper.selectByMemberId(memberId);
        if (payment == null) {
            throw new FebsException("未设置收款方式");
        }
//        MallMemberPayment payment = mallMemberPaymentMapper.selectByMemberId(memberId);
//        if (payment == null) {
//            throw new FebsException("未设置收款方式");
//        }
        BigDecimal profit = mallMoneyFlowMapper.selectProfitByDateAndMemberId(memberId);
        MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
@@ -452,4 +457,36 @@
        }
        return canMoney;
    }
    @Override
    public List<MallMember> findRankList(RankListDto rankListDto) {
        IPage<MallMember> page = new Page<>(rankListDto.getPageNum(), rankListDto.getPageSize());
        MallMember member = new MallMember();
        member.setQuery("2");
        member.setCreatedTime(new Date());
        IPage<MallMember> list = this.baseMapper.selectRankListInPage(page, member);
        List<MallMember> records = list.getRecords();
        if (CollUtil.isNotEmpty(records)) {
            BigDecimal amount = records.get(records.size() - 1).getAmount();
            page.setSize(999);
            member.setAmount(amount);
            IPage<MallMember> amountList = this.baseMapper.selectRankListInPage(page, member);
            if (CollUtil.isNotEmpty(amountList.getRecords())) {
                Map<Long, Object> map = new HashMap<>();
                for (MallMember record : records) {
                    map.put(record.getId(), record);
                }
                for (MallMember record : amountList.getRecords()) {
                    if (map.get(record.getId()) == null) {
                        records.add(record);
                    }
                }
            }
        }
        return records;
    }
}