exchange-back.git

			@@ -297,7 +297,7 @@

			BigDecimal total = walletCoin.getTotalBalance().subtract(selectById.getAmount()).subtract(selectById.getFeeAmount());
			walletCoin.setTotalBalance(total);
			BigDecimal frozen = walletCoin.getFrozenBalance().subtract(selectById.getAmount()).subtract(selectById.getFeeAmount());
			BigDecimal frozen = walletCoin.getFrozenBalance().subtract(selectById.getAmount());
			walletCoin.setFrozenBalance(frozen);

			memberWalletCoinMapper.updateById(walletCoin);
			@@ -378,7 +378,7 @@

			BigDecimal available = walletCoin.getAvailableBalance().add(selectById.getAmount()).add(selectById.getFeeAmount());
			walletCoin.setAvailableBalance(available);
			BigDecimal frozen = walletCoin.getFrozenBalance().subtract(selectById.getAmount()).subtract(selectById.getFeeAmount());
			BigDecimal frozen = walletCoin.getFrozenBalance().subtract(selectById.getAmount());
			walletCoin.setFrozenBalance(frozen);

			memberWalletCoinMapper.updateById(walletCoin);

			@@ -75,8 +75,7 @@
			cols: [[
			{field: 'phone', title: '手机号', minWidth: 100,align:'left',totalRowText: '合计'},
			{field: 'email', title: '邮箱', minWidth: 200,align:'left'},
			{field: 'inviteId', title: '邀请码UID', minWidth: 120,align:'center'},
			{field: 'orderNo', title: '订单编号', minWidth: 200,align:'center'},
			{field: 'forceClosingPrice', title: '预估强平价', minWidth: 120,align:'center'},
			{field: 'openingType', title: '开仓类型',
			templet: function (d) {
			if (d.openingType === 1) {
			@@ -107,11 +106,12 @@
			{field: 'openingPrice', title: '开仓价', minWidth: 100,align:'center'},
			{field: 'openingFeeAmount', title: '开仓手续费', minWidth: 120,align:'center',totalRow: true},
			{field: 'bondAmount', title: '保证金', minWidth: 120,align:'center'},
			{field: 'prePaymentAmount', title: '预付款金额', minWidth: 120,align:'center'},
			{field: 'leverRatio', title: '杠杆倍率', minWidth: 120,align:'center'},
			{field: 'stopLossPrice', title: '止损价', minWidth: 120,align:'center'},
			{field: 'stopProfitPrice', title: '止盈价', minWidth: 120,align:'center'},
			{field: 'prePaymentAmount', title: '预付款金额', minWidth: 120,align:'center'},
			{field: 'forceClosingPrice', title: '预估强平价', minWidth: 120,align:'center'}
			{field: 'inviteId', title: '邀请码UID', minWidth: 120,align:'center'},
			{field: 'orderNo', title: '订单编号', minWidth: 200,align:'center'},
			]]
			});
			}

	src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java	4 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrder.html	8 ●●●●● patch \| view \| raw \| blame \| history