modify

wzy

2020-10-15 f812dd42487c1ee47cb9bcbeed1f40779bbae6aa

modify

 src/main/java/com/xcong/excoin/common/system/controller/LoginController.java

@@ -111,11 +111,7 @@
        return rsa.encryptBase64(token + "_" + System.currentTimeMillis(), KeyType.PublicKey);
    }

<<<<<<< HEAD
//    @SubmitRepeat
=======
    //@SubmitRepeat
>>>>>>> feature/撮合交易
    @ApiOperation(value = "app注册接口", notes = "app注册接口，验证码必须输入可默认为123456")
    @PostMapping(value = "/register")
    public Result register(@RequestBody @Validated RegisterDto registerDto) {

 src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java

@@ -383,15 +383,12 @@
        BigDecimal nowPriceinBigDecimal = price;

        //查询当前价

        BigDecimal nowPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(symbol + "/USDT")));

<<<<<<< HEAD

        BigDecimal subPrice = nowPrice.multiply(BigDecimal.valueOf(0.2));

        BigDecimal minPrice = nowPrice.subtract(subPrice);

        BigDecimal maxPrice = nowPrice.add(subPrice);

        if (nowPriceinBigDecimal.compareTo(minPrice) < 0 || nowPriceinBigDecimal.compareTo(maxPrice) > 0) {

            return Result.fail("请输入合适的价格");

        }

=======

>>>>>>> feature/撮合交易



        // 获取交易管理的杠杠倍率，手续费率等信息，由平台进行设置

        symbol = symbol.toUpperCase();