Merge branch 'master' into whole

Helius

2020-09-01 1eac25bee9fa9b09ee25fc6a945ef1a47b3b4299

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

@@ -672,9 +672,9 @@
    private void wholeEntrustOrder(ContractEntrustOrderEntity entrustOrder) {
        log.info("全仓委托逻辑处理:{}", entrustOrder.getOrderNo());

        List<Object> types = redisUtils.lGet(AppContants.MEMBER_TYPE + entrustOrder.getMemberId(), 0, -1);
        int i = 1;
        while (true) {
            List<Object> types = redisUtils.lGet(AppContants.MEMBER_TYPE + entrustOrder.getMemberId(), 0, -1);
            if (CollUtil.isEmpty(types)) {
                break;
            }