20200602 代码提交

xiaoyong931011

2020-06-02 1e2725d0ab46e73cf21279f816f2320b626fbd3e

20200602  代码提交

 src/main/java/com/xcong/excoin/modules/coin/controller/OrderCoinController.java

@@ -48,12 +48,11 @@
    @ApiOperation(value = "进入交易页面", notes = "进入交易页面")

    @ApiResponses({@ApiResponse( code = 200, message = "success", response = TransactionPageOfWalletCoinVo.class)})

    @ApiImplicitParams({

        @ApiImplicitParam(name = "symbol", value = "币种", required = true, dataType = "String", paramType="query"),

        @ApiImplicitParam(name = "type", value = "买入卖出类型1：买入，2：卖出", required = true, dataType = "String", paramType="query")

        @ApiImplicitParam(name = "symbol", value = "币种", required = true, dataType = "String", paramType="query")

    })

    @GetMapping(value = "/enterTransactionPageOfWalletCoin")

    public Result enterTransactionPageOfWalletCoin(String symbol,String type) {

        return orderCoinService.enterTransactionPageOfWalletCoin(symbol,type);

    public Result enterTransactionPageOfWalletCoin(String symbol) {

        return orderCoinService.enterTransactionPageOfWalletCoin(symbol);

    }

    

    /**


 src/main/java/com/xcong/excoin/modules/coin/parameter/vo/TransactionPageOfWalletCoinVo.java

@@ -39,8 +39,14 @@
    /**

     * 用户可用金额

     */

    @ApiModelProperty(value = "用户可用金额")

    private BigDecimal availableBalance;

    @ApiModelProperty(value = "买入用户可用金额")

    private BigDecimal availableBalanceBuy;

	
    /**

     * 用户可用金额

     */

    @ApiModelProperty(value = "卖出用户可用金额")

    private BigDecimal availableBalanceSell;

    /**

     * 当前价

     */


 src/main/java/com/xcong/excoin/modules/coin/service/OrderCoinService.java

@@ -10,7 +10,7 @@
    

    public String generateSimpleSerialno(String userId);



    Result enterTransactionPageOfWalletCoin(String symbol, String type);

    Result enterTransactionPageOfWalletCoin(String symbol);



    Result submitSalesWalletCoinOrder(String symbol, Integer type, Integer tradeType, BigDecimal price,

            BigDecimal amount);


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

@@ -98,7 +98,7 @@
    }



    @Override

    public Result enterTransactionPageOfWalletCoin(String symbol, String type) {

    public Result enterTransactionPageOfWalletCoin(String symbol) {

        if (StrUtil.isBlank(symbol)) {

            return Result.fail(MessageSourceUtils.getString("order_service_0001"));

        }

@@ -135,11 +135,8 @@
        // 手续费用率

        transactionPageOfWalletCoinVo.setFeeRatio(tradeSetting.getFeeRatio().setScale(4, BigDecimal.ROUND_DOWN));

        // 用户可用金额

        if(MemberWalletCoinEnum.ENTERTRANSACTIONPAGEOFWALLETCOIN_BUY.getValue().equals(type)) {//买入

            transactionPageOfWalletCoinVo.setAvailableBalance(walletCoinUsdt.getAvailableBalance().setScale(4, BigDecimal.ROUND_DOWN));

        }else {

            transactionPageOfWalletCoinVo.setAvailableBalance(walletCoin.getAvailableBalance().setScale(4, BigDecimal.ROUND_DOWN));

        }

        transactionPageOfWalletCoinVo.setAvailableBalanceBuy(walletCoinUsdt.getAvailableBalance().setScale(4, BigDecimal.ROUND_DOWN));

        transactionPageOfWalletCoinVo.setAvailableBalanceSell(walletCoin.getAvailableBalance().setScale(4, BigDecimal.ROUND_DOWN));

        //当前价

        transactionPageOfWalletCoinVo.setCurrentPrice(closePrice.setScale(4, BigDecimal.ROUND_DOWN));

        //比例

@@ -148,7 +145,6 @@
        transactionPageOfWalletCoinVo.setCurrentPriceCny(cnyUsdt.multiply(closePrice).setScale(4, BigDecimal.ROUND_DOWN));

        

        transactionPageOfWalletCoinVo.setSymbol(symbol);

        transactionPageOfWalletCoinVo.setType(type);

        return Result.ok(transactionPageOfWalletCoinVo);

    }