1

zj

6 days ago 60d1f642052ad8c7bd8a11f02f965b122bebf9a4

 trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiAssetsController.java

@@ -5,18 +5,24 @@
import com.yami.trading.bean.item.domain.Item;
import com.yami.trading.bean.model.MoneyLog;
import com.yami.trading.bean.model.RealNameAuthRecord;
import com.yami.trading.bean.syspara.domain.Syspara;
import com.yami.trading.common.domain.Result;
import com.yami.trading.common.exception.BusinessException;
import com.yami.trading.common.util.Arith;
import com.yami.trading.common.util.StringUtils;
import com.yami.trading.common.util.UTCDateUtils;
import com.yami.trading.common.web.ResultObject;
import com.yami.trading.dao.finance.FinanceMapper;
import com.yami.trading.dao.finance.FinanceOrderMapper;
import com.yami.trading.security.common.util.SecurityUtils;
import com.yami.trading.service.MoneyLogService;
import com.yami.trading.service.RealNameAuthRecordService;
import com.yami.trading.service.WalletService;
import com.yami.trading.service.exchange.ExchangeApplyOrderService;
import com.yami.trading.service.finance.service.FinanceOrderService;
import com.yami.trading.service.finance.service.FinanceService;
import com.yami.trading.service.impl.ContractAndFutureProfit;
import com.yami.trading.service.syspara.SysparaService;
import com.yami.trading.service.user.UserDataService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -51,6 +57,12 @@
    MoneyLogService moneyLogService;
    @Autowired
    ExchangeApplyOrderService exchangeApplyOrderService;

    @Autowired
    FinanceOrderMapper financeOrderMapper;

    @Autowired
    SysparaService sysparaService;

    /**
     * 交易栏 顶部数据统计
@@ -92,6 +104,9 @@
        // 当日盈亏
        data.put("profitToday", String.format("%.2f", profitToday));
        data.put("profitTotal", String.format("%.2f", profitTotal));

        Double xautProfit = financeOrderMapper.sumVolumeByBuyCurrency(partyId, "xaut");
        data.put("xautProfit", String.format("%.2f", xautProfit));
        return Result.ok(data);
    }

@@ -253,9 +268,10 @@
                    data = walletService.getMoneyAll(partyId);
                }
            }

            Syspara fundingFee= sysparaService.find("funding_fee");
            RealNameAuthRecord kyc = realNameAuthRecordService.getByUserId(partyId);
            data.put("status", kyc == null ? 0 : kyc.getStatus());
            data.put("fundingFee", fundingFee.getSvalue());
            resultObject.setData(data);
        } catch (BusinessException e) {
            resultObject.setCode("1");