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

Helius

2020-06-02 f2039b74a40880816daf475a92073cb51464eff4

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

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

@@ -34,7 +34,7 @@
    /**

     * 手续费

     */

    @ApiModelProperty(value = "手续费")

    @ApiModelProperty(value = "手续费率")

    private BigDecimal feeRatio;

    /**

     * 用户可用金额


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

@@ -169,7 +169,7 @@
                return Result.fail(MessageSourceUtils.getString("order_service_0009"));

            }

            // 手续费用(手续费=建仓价X数量X手续费率)

            BigDecimal closingPrice = price.multiply(amount).multiply(new BigDecimal(MemberWalletCoinEnum.SUBMITSALESWALLETCOINORDER_SERVICERATE.getValue()));

            BigDecimal closingPrice = price.multiply(amount).multiply(tradeSetting.getCoinFeeRatio());

            //总费用 = 成交价*数量+手续费

            BigDecimal totalPayPrice = price.multiply(amount).add(closingPrice);

            


 src/main/java/com/xcong/excoin/modules/platform/entity/PlatformTradeSettingEntity.java

@@ -40,6 +40,10 @@
     */

    private BigDecimal feeRatio;

    /**

     * 币币手续费率

     */

    private BigDecimal coinFeeRatio;

    /**

     * 代理返佣比例

     */

    private BigDecimal agentReturnRatio;