add table member_setting and change some column to member_setting

Helius

2020-08-13 1356cf874d0fac038269d4277afea86d285dd623

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

@@ -13,8 +13,10 @@
import com.xcong.excoin.modules.contract.entity.ContractOrderEntity;
import com.xcong.excoin.modules.contract.mapper.ContractEntrustOrderEntityMapper;
import com.xcong.excoin.modules.contract.parameter.dto.SubmitEntrustDto;
import com.xcong.excoin.modules.contract.parameter.dto.SubmitOrderDto;
import com.xcong.excoin.modules.contract.parameter.vo.ContractEntrustVo;
import com.xcong.excoin.modules.contract.service.ContractEntrustOrderService;
import com.xcong.excoin.modules.contract.service.ContractHoldOrderService;
import com.xcong.excoin.modules.member.dao.MemberWalletContractDao;
import com.xcong.excoin.modules.member.entity.MemberEntity;
import com.xcong.excoin.modules.member.entity.MemberWalletContractEntity;
@@ -60,6 +62,9 @@
    @Resource
    private OrderProducer producer;

    @Resource
    private ContractHoldOrderService contractHoldOrderService;

    @Transactional(rollbackFor = Exception.class)
    @Override
    public Result addContractEntrustOrder(SubmitEntrustDto submitEntrustDto) {
@@ -73,14 +78,24 @@
            // 开多委托价不能大于当前价
            if (submitEntrustDto.getEntrustType() == ContractEntrustOrderEntity.ENTRUST_TYPE_OPEN_MORE) {
                if (submitEntrustDto.getEntrustPrice().compareTo(newPrice) > -1) {
                    return Result.fail(MessageSourceUtils.getString("entrust_price_judge_more"));
                    SubmitOrderDto submitOrderDto = new SubmitOrderDto();
                    submitOrderDto.setOrderType(submitEntrustDto.getEntrustType());
                    submitOrderDto.setSymbol(submitEntrustDto.getSymbol());
                    submitOrderDto.setSymbolCnt(submitEntrustDto.getSymbolCnt());
                    submitOrderDto.setLeverRatio(submitEntrustDto.getLeverRatio());
                    return contractHoldOrderService.submitOrder(submitOrderDto);
                }
            }

            // 开空委托价不能小于当前价
            if (submitEntrustDto.getEntrustType() == ContractEntrustOrderEntity.ENTRUST_TYPE_OPEN_LESS) {
                if (submitEntrustDto.getEntrustPrice().compareTo(newPrice) < 1) {
                    return Result.fail(MessageSourceUtils.getString("entrust_price_judge_less"));
                    SubmitOrderDto submitOrderDto = new SubmitOrderDto();
                    submitOrderDto.setOrderType(submitEntrustDto.getEntrustType());
                    submitOrderDto.setSymbol(submitEntrustDto.getSymbol());
                    submitOrderDto.setSymbolCnt(submitEntrustDto.getSymbolCnt());
                    submitOrderDto.setLeverRatio(submitEntrustDto.getLeverRatio());
                    return contractHoldOrderService.submitOrder(submitOrderDto);
                }
            }

@@ -127,12 +142,12 @@
                    OrderModel model = new OrderModel(entrustOrderEntity.getId(), RabbitPriceTypeEnum.ENTRUST_OPEN_MORE.getValue(), submitEntrustDto.getEntrustPrice().setScale(8, RoundingMode.HALF_UP).toPlainString(), submitEntrustDto.getSymbol());
                    producer.sendPriceOperate(JSONObject.toJSONString(model));

                    LogRecordUtils.insertMemberAccountFlow(memberEntity.getId(), entrustTotalAmount, walletContract.getTotalBalance(), submitEntrustDto.getSymbol(), "买涨持仓", "买涨:" + submitEntrustDto.getSymbol());
                    LogRecordUtils.insertMemberAccountFlow(memberEntity.getId(), entrustTotalAmount, walletContract.getAvailableBalance().subtract(entrustTotalAmount), submitEntrustDto.getSymbol(), "委托买涨", "买涨:" + submitEntrustDto.getSymbol());
                } else {
                    OrderModel model = new OrderModel(entrustOrderEntity.getId(), RabbitPriceTypeEnum.ENTRUST_OPEN_LESS.getValue(), submitEntrustDto.getEntrustPrice().setScale(8, RoundingMode.HALF_UP).toPlainString(), submitEntrustDto.getSymbol());
                    producer.sendPriceOperate(JSONObject.toJSONString(model));

                    LogRecordUtils.insertMemberAccountFlow(memberEntity.getId(), entrustTotalAmount, walletContract.getTotalBalance(), submitEntrustDto.getSymbol(), "买跌持仓", "买跌:" + submitEntrustDto.getSymbol());
                    LogRecordUtils.insertMemberAccountFlow(memberEntity.getId(), entrustTotalAmount, walletContract.getAvailableBalance().subtract(entrustTotalAmount), submitEntrustDto.getSymbol(), "委托买跌", "买跌:" + submitEntrustDto.getSymbol());
                }

                return Result.ok(MessageSourceUtils.getString("result_success_msg"));
@@ -181,7 +196,7 @@
        contractEntrustOrderDao.deleteById(entrustOrderEntity.getId());

        // 插入财务流水
        LogRecordUtils.insertMemberAccountFlow(memberEntity.getId(), total, walletContractEntity.getTotalBalance(), entrustOrderEntity.getSymbol(), "撤销委托单", "撤销委托单");
        LogRecordUtils.insertMemberAccountFlow(memberEntity.getId(), total, walletContractEntity.getAvailableBalance().add(total), entrustOrderEntity.getSymbol(), "撤销委托单", "撤销委托单");
        if (i > 0) {
            return Result.ok(MessageSourceUtils.getString("cancellation_success"));
        }