Merge branch 'otc' of http://120.27.238.55:7000/r/exchange into otc

xiaoyong931011

2021-05-25 b787caa660c2aed5281d1429d5db2ec18ac8fa7c

 src/main/java/com/xcong/excoin/modules/otc/controller/OtcBlackListController.java

@@ -47,6 +47,11 @@
            return Result.fail("订单不存在");
        }

        OtcBlackList isExist = otcBlackListDao.selectByMemberIdAndBlackMemberId(member.getId(), otcOrder.getEntrustMemberId());
        if (isExist != null) {
            return Result.fail("请勿重复拉黑");
        }

        OtcBlackList otcBlackList = new OtcBlackList();
        otcBlackList.setMemberId(member.getId());
        otcBlackList.setBlackMemberId(otcOrder.getEntrustMemberId());