xiaoyong931011
2021-07-05 cf200a1f92c01ba22c326c49391f748ffb006910
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
@@ -16,6 +16,7 @@
import com.xcong.excoin.common.exception.GlobalException;
import com.xcong.excoin.modules.Sms106Send;
import com.xcong.excoin.modules.member.dto.MemberDetailConfirmDto;
import com.xcong.excoin.modules.member.entity.ActivityReceiveRecord;
import com.xcong.excoin.modules.member.entity.AgentFriendRelationEntity;
import com.xcong.excoin.modules.member.entity.MemberAccountMoneyChangeEntity;
import com.xcong.excoin.modules.member.entity.MemberAuthenticationEntity;
@@ -35,6 +36,7 @@
import com.xcong.excoin.modules.member.mapper.MemberQuickBuySaleMapper;
import com.xcong.excoin.modules.member.mapper.MemberWalletCoinMapper;
import com.xcong.excoin.modules.member.service.IMemberService;
import com.xcong.excoin.modules.member.vo.MemberActivityReceiveVo;
import com.xcong.excoin.modules.member.vo.MemberAuthenticationVo;
import com.xcong.excoin.modules.member.vo.MemberCoinChargeVo;
import com.xcong.excoin.modules.member.vo.MemberCoinWithdrawVo;
@@ -2233,14 +2235,14 @@
   @Override
   public IPage<MemberDataInfoVo> findAllDataInfoListInPage(MemberEntity memberEntity, QueryRequest request) {
      String account = memberEntity.getAccount();
      String isTest = memberEntity.getIsTest();
//      String isTest = memberEntity.getIsTest();
      //如果account为空,查询全部,account不为空查询对应的memberEntity
      if(StrUtil.isNotEmpty(account)) {
         memberEntity = memberMapper.selectMemberByAccount(account);
      }else {
         memberEntity = memberMapper.selectMemberByAccount(MemberEntity.SYSTEM_REFERER);
      }
      memberEntity.setIsTest(isTest);
//      memberEntity.setIsTest("");
      Page<MemberEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
      IPage<MemberDataInfoVo> selectMemberListInPage = memberMapper.findMemberDataInfoOneAllRealInPage(page, memberEntity);
      //USDT充币总额+USDT提币总额
@@ -2258,7 +2260,7 @@
      String rewardratioByMid = memberMapper.selectRewardratioForAllDataInfo(memberEntity);
      
      //持仓人数
      String notNullNumber = memberMapper.selectSFCCForAllDataInfo(memberEntity);
//      String notNullNumber = memberMapper.selectSFCCForAllDataInfo(memberEntity);
      //币币账户不为空的人数
      String walletNumber = memberMapper.selectBBZHForAllDataInfo(memberEntity);
      //合约账户不为空的人数
@@ -2292,7 +2294,7 @@
         memberDataInfoVo.setSellClosingPrice(sellClosingpriceByMid == "0" ? "0" : df.format(Double.parseDouble(sellClosingpriceByMid)));
         memberDataInfoVo.setFee(returnMoneyByMid == "0" ? "0" : df.format(Double.parseDouble(returnMoneyByMid)));
         memberDataInfoVo.setYingkui(rewardratioByMid == null ? "0" : df.format(Double.parseDouble(rewardratioByMid)));
         memberDataInfoVo.setNotNullNumber(notNullNumber == null ? "0" : notNullNumber);
//         memberDataInfoVo.setNotNullNumber(notNullNumber == null ? "0" : notNullNumber);
         memberDataInfoVo.setWalletNumber(walletNumber == null ? "0" : walletNumber);
         memberDataInfoVo.setWalletCoinNumber(walletCoinNumber == null ? "0" : walletCoinNumber);
         memberDataInfoVo.setPlatformProfitAndLoss(platformProfitAndLoss == 0.00 ? "0" : df.format(platformProfitAndLoss));
@@ -2306,4 +2308,21 @@
      return selectMemberListInPage;
   }
   @Override
   public IPage<MemberActivityReceiveVo> memberActivityReceive(ActivityReceiveRecord activityReceiveRecord,
         QueryRequest request) {
      Page<ActivityReceiveRecord> page = new Page<>(request.getPageNum(), request.getPageSize());
      return memberMapper.memberActivityReceive(page, activityReceiveRecord);
   }
   @Override
   public IPage<ActivityReceiveRecord> seeReceiveInfo(QueryRequest request,
         ActivityReceiveRecord activityReceiveRecord) {
      Page<ActivityReceiveRecord> page = new Page<>(request.getPageNum(), request.getPageSize());
      return memberMapper.seeReceiveInfo(page, activityReceiveRecord);
   }
}