zainali5120
2020-10-30 5fe125b2b4dff77fbfe6a377d4730cc005fc668a
src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java
@@ -357,6 +357,8 @@
        String phone = memberEntity.getPhone();
        if (!"13632989240".equals(phone) && !"15158130575".equals(phone)) {
            if (OrderCoinsEntity.ORDERTYPE_BUY.equals(type)) {
                // 禁止挂卖
                // 不能超过800个
//                if (amount != null && amount.compareTo(new BigDecimal("800")) > 0) {
@@ -382,8 +384,9 @@
//                }
            } else {
                // 判断redis开关
                String string = redisUtils.getString("SELL_LIMIT_KEY");
                if (StringUtils.isNotBlank(string)) {
                //String string = redisUtils.getString("SELL_LIMIT_KEY");
                String string = redisUtils.getString("SELL_LIMIT_KEY_PHONE");
                if (StringUtils.isNotBlank(string) && string.contains(memberEntity.getPhone())) {
                    return Result.fail("卖出受限");
                }
            }
@@ -658,6 +661,12 @@
        OrderCoinsEntity coinsEntityCancel = trader.cancelOrder(orderCoinsEntity);
        if (coinsEntityCancel == null) {
            // 此时说明撮合系统已经没这个单了 不需要继续处理
            // 直接更新状态先
            OrderCoinsEntity update = new OrderCoinsEntity();
            update.setId(Long.valueOf(orderId));
            update.setOrderStatus(OrderCoinsEntity.ORDERSTATUS_CANCEL);
            //orderCoinsEntity.setOrderStatus(OrderCoinsEntity.ORDERSTATUS_CANCEL);
            orderCoinsDao.updateById(update);
            return null;
        }