modify

Helius

2020-09-04 f5708bc8452444408cf3f94b9ed528ca4d58d628

 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) {
                        // 历史订单
@@ -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);
@@ -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) {
                        // 历史订单
@@ -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) {
                        // 历史订单
@@ -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());