1

zj

2024-10-11 5f97f550b3fb60ac2142d7ca3c78d6bd04f18b80

1

 src/main/java/com/nq/service/impl/UserServiceImpl.java

@@ -1,5 +1,6 @@
package com.nq.service.impl;

import cn.hutool.core.convert.Convert;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
@@ -34,13 +35,13 @@

import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;

import com.nq.vo.user.UserOut;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -100,7 +101,8 @@
    ISiteIndexSettingService iSiteIndexSettingService;
    @Autowired
    StockPoll stockPoll;

    @Autowired
    IUserService iUserService;

    @Resource
    MoneyLogMapper mapper;
@@ -800,11 +802,33 @@

    public ServerResponse listByAdmin(String realName, String phone, Integer agentId, Integer accountType, int pageNum, int pageSize, HttpServletRequest request) {
        PageHelper.startPage(pageNum, pageSize);

        List<User> users = this.userMapper.listByAdmin(realName, phone, agentId, accountType);

        PageInfo pageInfo = new PageInfo(users);
        List<UserOut> userOuts = new ArrayList<>();

        // 获取用户资产信息并构建返回结果
        Map<Integer, UserOut> userOutMap = new HashMap<>();
        for (User user : users) {
            ServerResponse money = iUserService.getMoney(user.getId());
            List<RUserAssets> rUserAssetsList = (List<RUserAssets>) money.getData();
            RUserAssets rUserAssets = rUserAssetsList.stream()
                    .filter(stock -> "JP".equals(stock.getAccectType()))
                    .findFirst()
                    .orElse(null);

            UserOut userOut = Convert.convert(UserOut.class, user);
            if (rUserAssets != null) {
                userOut.setTotalMoney(rUserAssets.getTotalMoney().equals("0E-8") ? "0" : rUserAssets.getTotalMoney());
                userOut.setFreezeMoney(rUserAssets.getFreezeMoney().equals("0E-8") ? "0" : rUserAssets.getFreezeMoney());
                userOut.setAvailableBalance(rUserAssets.getAvailableBalance().equals("0E-8") ? "0" : rUserAssets.getAvailableBalance());
                userOut.setAmountToBeCovered(new BigDecimal(rUserAssets.getAmountToBeCovered()));
            }
            userOutMap.put(user.getId(), userOut);
            userOuts.add(userOut);
        }

        PageInfo pageInfo = new PageInfo(users);
        pageInfo.setList(userOuts);
        return ServerResponse.createBySuccess(pageInfo);
    }


 src/main/java/com/nq/vo/user/UserOut.java

New file
@@ -0,0 +1,32 @@
package com.nq.vo.user;

import com.nq.pojo.User;
import lombok.Data;

import java.math.BigDecimal;

/**
 * @program: dabaogp
 * @description:
 * @create: 2024-07-05 14:03
 **/
@Data
public class UserOut extends User {
    /**
     *  总资产
     * */
    private String totalMoney;
    /**
     *  总可用余额
     * */
    private String availableBalance;

    /**
     *  总冻结资产
     * */
    private String freezeMoney;

    //待补金额
    private BigDecimal amountToBeCovered;

}