Merge branch 'whole_new' of http://120.27.238.55:7000/r/exchange into whole...

Helius

2021-03-04 b1b8d0987427851aba89ffd7e55849d435f69cf0

Merge branch 'whole_new' of http://120.27.238.55:7000/r/exchange into whole_new

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

@@ -1,6 +1,8 @@
package com.xcong.excoin.modules.contract.service.impl;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;

import com.alibaba.druid.sql.visitor.functions.If;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -1028,8 +1030,27 @@
        List<ContractHoldOrderEntity> list = contractHoldOrderDao.selectHoldOrderListByMemberId(member.getId());
        List<ContractEntrustOrderEntity> entrustList = contractEntrustOrderDao.selectEntrustOrderListByMemberId(member.getId());

        if (CollUtil.isNotEmpty(list) || CollUtil.isNotEmpty(entrustList)) {
            return Result.fail("存在持仓/委托, 无法更改");
//        if (CollUtil.isNotEmpty(list) || CollUtil.isNotEmpty(entrustList)) {
//            return Result.fail("存在持仓/委托, 无法更改");
//        }
        
        if(CollUtil.isNotEmpty(list)) {
            for(ContractHoldOrderEntity contractHoldOrderEntity : list) {
                String symbol = contractHoldOrderEntity.getSymbol();
                if(StrUtil.isEmpty(symbol)) {
                    return Result.fail("存在持仓/委托, 无法更改");
                }
                return Result.fail("币种"+symbol+"存在持仓/委托, 无法更改");
            }
        }
        if(CollUtil.isNotEmpty(entrustList)) {
            for(ContractEntrustOrderEntity contractEntrustOrderEntity : entrustList) {
                String symbol = contractEntrustOrderEntity.getSymbol();
                if(StrUtil.isEmpty(symbol)) {
                    return Result.fail("存在持仓/委托, 无法更改");
                }
                return Result.fail("币种"+symbol+"存在持仓/委托, 无法更改");
            }
        }
        
        /**

 src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java

@@ -1132,6 +1132,7 @@
        }

        MemberSettingEntity memberSettingEntity = memberSettingDao.selectMemberSettingByMemberId(memberId);

        if(ObjectUtil.isNotEmpty(memberSettingEntity)) {

            log.info(memberId + "的消息提醒状态变更");

            memberSettingEntity.setMessageReminder(0);

            memberSettingDao.updateById(memberSettingEntity);

        }