Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin.git

xiaoyong931011

2020-06-05 95da7870f87ec42dbd572aba040492c881fe0b9c

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

@@ -339,11 +339,11 @@
            if (stopProfitPrice != null) {
                if (newPrice.compareTo(openPrice) > 0) {
                    if (stopProfitPrice.compareTo(openPrice) > 0) {
                        return Result.fail("止损价必须低于开仓价");
                        return Result.fail("止盈价必须低于开仓价");
                    }
                } else {
                    if (stopProfitPrice.compareTo(newPrice) > 0) {
                        return Result.fail("止损价必须低于当前价");
                        return Result.fail("止盈价必须低于当前价");
                    }
                }
            }
@@ -388,7 +388,6 @@
            producer.sendPriceOperate(JSONObject.toJSONString(model));
            return Result.ok("设置成功");
        }

        return Result.fail("设置失败");
    }