modify

Helius

2021-02-04 bf13ce8d93e4e3125ec08b32949ca7ba5f375f6c

 src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java

@@ -1,6 +1,7 @@
package com.xcong.excoin.modules.contract.service.impl;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.xcong.excoin.common.contants.AppContants;
@@ -485,10 +486,12 @@
        MemberEntity memberEntity = memberDao.selectById(wholePriceData.getMemberId());
        List<HoldOrderDataModel> list = wholePriceData.getList();
        if (CollUtil.isNotEmpty(list)) {
            String batchNo = IdUtil.randomUUID();
            for (HoldOrderDataModel holdOrderDataModel : list) {
                ContractHoldOrderEntity holdOrderEntity = contractHoldOrderDao.selectById(holdOrderDataModel.getId());
                if (holdOrderEntity == null) {
                    log.info("持仓不存在:{}", holdOrderDataModel.getId());
                    redisUtils.del(AppContants.WHOLE_BOMB_PREFIX + wholePriceData.getMemberId());
                    continue;
                }

@@ -505,7 +508,7 @@

                BigDecimal rewardRatio = holdOrderDataModel.getRewardAmount().divide(holdOrderEntity.getBondAmount().subtract(holdOrderEntity.getOpeningFeeAmount()), 8, BigDecimal.ROUND_DOWN);
                contractOrderEntity.setRewardRatio(rewardRatio);
                contractOrderEntity.setRewardAmount(holdOrderDataModel.getRewardAmount().add(contractOrderEntity.getBondAmount().subtract(contractOrderEntity.getOpeningFeeAmount()).negate()));
                contractOrderEntity.setRewardAmount(holdOrderDataModel.getRewardAmount().add(contractOrderEntity.getHoldBond().negate()));
                contractOrderEntity.setClosingPrice(holdOrderDataModel.getClosingPrice());

                // 订单状态转换
@@ -515,7 +518,7 @@
                    contractOrderEntity.setOrderType(ContractOrderEntity.ORDER_TYPE_CLOSE_LESS);
                }
                contractOrderEntity.setClosingTime(new Date());

                contractOrderEntity.setBatchNo(batchNo);
                contractOrderDao.insert(contractOrderEntity);
            }

@@ -523,11 +526,13 @@
            BigDecimal totalAmount = BigDecimal.ZERO;
            if (CollUtil.isNotEmpty(entrustOrder)) {
                for (ContractEntrustOrderEntity contractEntrustOrderEntity : entrustOrder) {
                    totalAmount.add(contractEntrustOrderEntity.getEntrustAmount());
                    totalAmount = totalAmount.add(contractEntrustOrderEntity.getEntrustAmount());
                }
            }

            memberWalletContractDao.increaseWalletContractBalanceById(wallet.getAvailableBalance().negate(), wallet.getTotalBalance().subtract(totalAmount).negate(), null, wallet.getId());

            redisUtils.del(AppContants.WHOLE_BOMB_PREFIX + wholePriceData.getMemberId());
        } else {
            log.info("参数有误:{}", memberEntity.getId());
        }