modify

Helius

2021-01-26 1a5c7cee38f3db0f3ce3bdb9ffe9bc440fbfa3cb

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

@@ -3,6 +3,7 @@
import cn.hutool.core.collection.CollUtil;
import com.alibaba.fastjson.JSONObject;
import com.xcong.excoin.common.contants.AppContants;
import com.xcong.excoin.common.enumerates.CoinTypeEnum;
import com.xcong.excoin.modules.coin.dao.MemberAccountFlowEntityDao;
import com.xcong.excoin.modules.coin.entity.MemberAccountFlowEntity;
import com.xcong.excoin.modules.contract.dao.ContractEntrustOrderDao;
@@ -185,12 +186,7 @@
                    // 本次需要退回的保证金
                    BigDecimal prePrice = order.getBondAmount();
                    Long memberId = order.getMemberId();
                    MemberWalletContractEntity wallet;
                    if (order.getPositionType() == ContractEntrustOrderEntity.POSITION_TYPE_ADD) {
                        wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, "USDT");
                    } else {
                        wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, CoinTypeConvert.convertContractTypeToCoin(order.getSymbol()));
                    }
                    MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, CoinTypeEnum.USDT.name());

                    if (wallet != null) {
                        // 历史订单
@@ -199,7 +195,7 @@
                        contractOrderEntity.setId(null);

                        // 本次平仓数量
                        int currentFlat = order.getSymbolCnt();
                        int currentFlat = order.getSymbolCntSale();
                        BigDecimal symbolSku = cacheSettingUtils.getSymbolSku(order.getSymbol());
                        // 盈亏额度= (当前的币种的平仓价-下单时的建仓价)*购买的手数/规格*倍率
                        BigDecimal profitLossPrice = (closePrice
@@ -290,12 +286,8 @@
                    // 本次需要退回的预付款
                    BigDecimal prePrice = order.getBondAmount();
                    Long memberId = order.getMemberId();
                    MemberWalletContractEntity wallet;
                    if (order.getPositionType() == ContractEntrustOrderEntity.POSITION_TYPE_ADD) {
                        wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, "USDT");
                    } else {
                        wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, CoinTypeConvert.convertContractTypeToCoin(order.getSymbol()));
                    }
                    MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, CoinTypeEnum.USDT.name());

                    if (wallet != null) {
                        // 历史订单
                        ContractOrderEntity contractOrderEntity = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrder(order);
@@ -303,7 +295,7 @@
                        contractOrderEntity.setId(null);

                        // 本次平仓数量
                        int currentFlat = order.getSymbolCnt();
                        int currentFlat = order.getSymbolCntSale();
                        BigDecimal symbolSku = cacheSettingUtils.getSymbolSku(order.getSymbol());
                        // 盈亏额度= (当前的币种的平仓价-下单时的建仓价)*购买的手数/规格*倍率
                        BigDecimal profitLossPrice = (order.getOpeningPrice()
@@ -395,12 +387,7 @@
                    Long memberId = order.getMemberId();
                    // 本次需要退回的预付款
                    BigDecimal prePrice = order.getBondAmount();
                    MemberWalletContractEntity wallet;
                    if (order.getPositionType() == ContractEntrustOrderEntity.POSITION_TYPE_ADD) {
                        wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, "USDT");
                    } else {
                        wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, CoinTypeConvert.convertContractTypeToCoin(order.getSymbol()));
                    }
                    MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, CoinTypeEnum.USDT.name());

                    if (wallet != null) {
                        // 历史订单
@@ -409,7 +396,7 @@
                        contractOrderEntity.setId(null);

                        // 本次平仓数量
                        int currentFlat = order.getSymbolCnt();
                        int currentFlat = order.getSymbolCntSale();
                        BigDecimal symbolSku = cacheSettingUtils.getSymbolSku(order.getSymbol());
                        // 盈亏额度= (当前的币种的平仓价-下单时的建仓价)*购买的手数/规格*倍率
                        BigDecimal profitLossPrice = (closePrice
@@ -497,12 +484,7 @@
                    Long memberId = order.getMemberId();
                    // 本次需要退回的预付款
                    BigDecimal prePrice = order.getBondAmount();
                    MemberWalletContractEntity wallet;
                    if (order.getPositionType() == ContractEntrustOrderEntity.POSITION_TYPE_ADD) {
                        wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, "USDT");
                    } else {
                        wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, CoinTypeConvert.convertContractTypeToCoin(order.getSymbol()));
                    }
                    MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, CoinTypeEnum.USDT.name());

                    if (wallet != null) {
                        // 历史订单
@@ -511,7 +493,7 @@
                        contractOrderEntity.setId(null);

                        // 本次平仓数量
                        int currentFlat = order.getSymbolCnt();
                        int currentFlat = order.getSymbolCntSale();
                        BigDecimal symbolSku = cacheSettingUtils.getSymbolSku(order.getSymbol());
                        // 盈亏额度= (当前的币种的平仓价-下单时的建仓价)*购买的手数/规格*倍率
                        BigDecimal profitLossPrice = (order.getOpeningPrice()
@@ -686,7 +668,7 @@
            }
            i++;
        }
        MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(entrustOrder.getMemberId(), CoinTypeConvert.convertContractTypeToCoin(entrustOrder.getSymbol()));
        MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(entrustOrder.getMemberId(), CoinTypeEnum.USDT.name());

        PlatformTradeSettingEntity tradeSettingEntity = cacheSettingUtils.getTradeSetting();
        MemberEntity member = memberService.getById(entrustOrder.getMemberId());
@@ -873,7 +855,7 @@
                contractOrderService.save(contractOrderEntity);

                //更新用户钱包数据
                MemberWalletContractEntity usdt = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memId, "USDT");
                MemberWalletContractEntity usdt = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memId, CoinTypeConvert.convertContractTypeToCoin(coinsOrder.getSymbol()));

                // 减去的时候用负数
                BigDecimal totalPrice = coinsOrder.getBondAmount().negate();
@@ -890,7 +872,7 @@
                record.setPrice(coinsOrder.getBondAmount());
                memberAccountFlowEntityDao.insert(record);
            } else {
                MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memId, CoinTypeConvert.convertContractTypeToCoin(coinsOrder.getSymbol()));
                MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memId, "USDT");

//                BigDecimal rewardRatio = BigDecimal.ZERO;
//                // 开多