计算金额(待补金额)

zyy

2025-09-04 10a06cf876b3dfce68d36ee71cba0cb4fa393b94

计算金额(待补金额)

 trading-order-service/src/main/java/com/yami/trading/service/WalletService.java

@@ -76,6 +76,13 @@

    void update(String userId, double gift_sum);

    /**
     * 修改金额(待补金额)
     * @param type 1 入款  2 扣款
     * @return
     */
    Wallet updateToBeCovered(Wallet wallet, BigDecimal amount, Integer type);

    /*
     * 获取 所有订单 永续合约总资产、总保证金、总未实现盈利
     */

 trading-order-service/src/main/java/com/yami/trading/service/ico/IcoService.java

@@ -95,9 +95,13 @@
            model.setSubscriptionType(1);
        }

        Wallet wallet = walletService.saveWalletByPartyId(partyId);
        if(wallet.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
            throw new YamiShopBindException("请先缴清待补资金");
        }

        //需要先支付
        if (ico.getIsPayDown() !=null && ico.getIsPayDown() == 1) {
            Wallet wallet = walletService.saveWalletByPartyId(partyId);
            if (amount.compareTo(wallet.getMoney()) > 0) {
                throw new YamiShopBindException("余额不足");
            }
@@ -154,6 +158,7 @@
            if (model.getStatus() == 3) { //中签
                //资金账户
                Wallet wallet = walletService.saveWalletByPartyId(userId);
                BigDecimal before = wallet.getMoney();
                //已经预支付
                if(ico.getIsPayDown() !=null && ico.getIsPayDown() == 1) {
                    int applyNumber = userSubscription.getSubscribeNums() - model.getBallotNumber();
@@ -161,14 +166,14 @@
                    if(applyNumber > 0) {
                        //退回资金
                        BigDecimal refundPrice = ico.getUnitAmount().multiply(new BigDecimal(applyNumber));
                        walletService.update(userId, refundPrice.doubleValue());
                        wallet = walletService.updateToBeCovered(wallet, refundPrice, 1);

                        //保存 资金日志
                        MoneyLog moneylog = new MoneyLog();
                        moneylog.setCategory(Constants.MONEYLOG_CONTENT_NEW_COIN);
                        moneylog.setAmountBefore(wallet.getMoney());
                        moneylog.setAmountBefore(before);
                        moneylog.setAmount(amount);
                        moneylog.setAmountAfter(wallet.getMoney().add(refundPrice));
                        moneylog.setAmountAfter(wallet.getMoney());
                        moneylog.setLog("新币购买，退回购买金额[" + refundPrice + "]");
                        moneylog.setUserId(userId);
                        moneylog.setSymbol(ico.getSymbol());
@@ -178,24 +183,14 @@
                    }
                } else {
                    BigDecimal amount = ico.getUnitAmount().multiply(new BigDecimal(model.getBallotNumber()));
                    BigDecimal subtract = amount.subtract(wallet.getMoney());
                    if (subtract.compareTo(BigDecimal.ZERO) > 0) {
                        //放入待补
                        wallet.setMoney(BigDecimal.ZERO);
                        wallet.setAmountToBeCovered(wallet.getAmountToBeCovered().add(subtract));
                        if (!walletService.updateById(wallet)) {
                            throw new YamiShopBindException("操作钱包失败!");
                        }
                    } else {
                        //扣除资金
                        walletService.update(userId, amount.negate().doubleValue());
                    }
                    wallet = walletService.updateToBeCovered(wallet, amount, 2);

                    //保存 资金日志
                    MoneyLog moneylog = new MoneyLog();
                    moneylog.setCategory(Constants.MONEYLOG_CONTENT_NEW_COIN);
                    moneylog.setAmountBefore(wallet.getMoney());
                    moneylog.setAmountBefore(before);
                    moneylog.setAmount(amount);
                    moneylog.setAmountAfter(subtract.compareTo(BigDecimal.ZERO) > 0 ? BigDecimal.ZERO : subtract.negate());
                    moneylog.setAmountAfter(wallet.getMoney());
                    moneylog.setLog("新币购买，申购金额[" + amount + "]");
                    moneylog.setUserId(userId);
                    moneylog.setSymbol(ico.getSymbol());

 trading-order-service/src/main/java/com/yami/trading/service/impl/CapitaltWalletServiceImpl.java

@@ -68,9 +68,10 @@
            if (capitaltWallet != null && capitaltWallet.getMoney().compareTo(moneyRevise) >= 0) {
                // 执行从资金账户到合约账户的划转操作
                capitaltWallet.setMoney(capitaltWallet.getMoney().subtract(moneyRevise));  // 减少资金账户余额
                wallet.setMoney(wallet.getMoney().add(moneyRevise));  // 增加合约账户余额
                //wallet.setMoney(wallet.getMoney().add(moneyRevise));  // 增加合约账户余额
                // 更新账户余额
                walletService.updateById(wallet);  // 保存合约账户的更新
                //walletService.updateById(wallet);  // 保存合约账户的更新
                walletService.updateToBeCovered(wallet, moneyRevise, 1);
                updateById(capitaltWallet);  // 保存资金账户的更新
                return Result.succeed();
            } else {

 trading-order-service/src/main/java/com/yami/trading/service/impl/WalletServiceImpl.java

@@ -756,6 +756,36 @@

    }

    @Override
    public Wallet updateToBeCovered(Wallet wallet, BigDecimal amount, Integer type) {
        amount = amount.abs();
        if (type == 1) {  //入款
            if(wallet.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
                BigDecimal availableBalance = amount.subtract(wallet.getAmountToBeCovered());
                if(availableBalance.compareTo(BigDecimal.ZERO) >= 0){
                    wallet.setMoney(wallet.getMoney().add(availableBalance));
                    wallet.setAmountToBeCovered(BigDecimal.ZERO);
                }else {
                    wallet.setAmountToBeCovered(availableBalance.abs());
                }
            } else {
                wallet.setMoney(wallet.getMoney().add(amount));
            }
        } else if (type == 2) { //扣款
            BigDecimal subtract = amount.subtract(wallet.getMoney());
            if (subtract.compareTo(BigDecimal.ZERO) > 0) { //资金不足 放入待补
                wallet.setMoney(BigDecimal.ZERO);
                wallet.setAmountToBeCovered(wallet.getAmountToBeCovered().add(subtract));
            } else {
                wallet.setMoney(subtract.negate());
            }
        }
        if (!updateById(wallet)) {
            throw new YamiShopBindException("操作钱包失败!");
        }
        return wallet;
    }


    @Override
    public void updateExtendWithLockAndFreeze(String partyId, String walletType, double amount, double lockAmount, double freezeAmount) {