From 6ed309c5a80c36e752bfd799cbaba7665cf7364b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 14 May 2021 17:31:02 +0800
Subject: [PATCH] 20210514 云顶
---
src/main/java/com/xcong/excoin/modules/yunding/service/impl/BasicSettingServiceImpl.java | 62 ++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/yunding/service/impl/BasicSettingServiceImpl.java b/src/main/java/com/xcong/excoin/modules/yunding/service/impl/BasicSettingServiceImpl.java
index e27ce29..e25f885 100644
--- a/src/main/java/com/xcong/excoin/modules/yunding/service/impl/BasicSettingServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/yunding/service/impl/BasicSettingServiceImpl.java
@@ -1,10 +1,13 @@
package com.xcong.excoin.modules.yunding.service.impl;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xcong.excoin.common.entity.QueryRequest;
+import com.xcong.excoin.modules.member.entity.MemberAccountMoneyChangeEntity;
+import com.xcong.excoin.modules.member.entity.MemberEntity;
import com.xcong.excoin.modules.member.entity.MemberWalletCoinEntity;
import com.xcong.excoin.modules.member.mapper.MemberWalletCoinMapper;
import com.xcong.excoin.modules.yunding.entity.BasicSettingEntity;
@@ -12,6 +15,7 @@
import com.xcong.excoin.modules.yunding.entity.YdProductEntity;
import com.xcong.excoin.modules.yunding.mapper.BasicSettingMapper;
import com.xcong.excoin.modules.yunding.service.IBasicSettingService;
+import com.xcong.excoin.modules.yunding.vo.YdAgentOrderVo;
import com.xcong.excoin.modules.yunding.vo.YdMemberVo;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -33,7 +37,7 @@
@Override
public IPage<YdOrderEntity> getOrderList(YdOrderEntity ydOrderEntity, QueryRequest request) {
- log.info("订单列表");
+ log.info("产品订单列表");
Page<YdOrderEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
IPage<YdOrderEntity> ydOrderEntitys = basicSettingMapper.getOrderList(page, ydOrderEntity);
return ydOrderEntitys;
@@ -62,16 +66,62 @@
ydMemberVo.setQuantityWork(quantityWork);
int quantityEnd = basicSettingMapper.selectPowerByMemberIdAndState(memberId,YdOrderEntity.ORDER_STATE_END);
ydMemberVo.setQuantityEnd(quantityEnd);
- BigDecimal totalUsed = basicSettingMapper.selectAmountByMemberId(memberId);
- ydMemberVo.setTotalUsed(totalUsed);
+ BigDecimal totalUsed = basicSettingMapper.selectAmountByMemberId(memberId,1);
+ ydMemberVo.setTotalUsed(totalUsed == null ? BigDecimal.ZERO : totalUsed);
+
+ BigDecimal agentUsed = basicSettingMapper.selectAmountByMemberId(memberId,2);
+ ydMemberVo.setAgentUsed(agentUsed == null ? BigDecimal.ZERO : agentUsed);
MemberWalletCoinEntity memberWalletCoinEntity = memberWalletCoinMapper.findWalletCoinByMemberIdAndWalletCode(memberId, "USDT");
- ydMemberVo.setAvailableBalance(memberWalletCoinEntity.getAvailableBalance());
+ if(ObjectUtil.isNotEmpty(memberWalletCoinEntity)){
+ ydMemberVo.setAvailableBalance(memberWalletCoinEntity.getAvailableBalance() == null ? BigDecimal.ZERO : memberWalletCoinEntity.getAvailableBalance());
+ }else{
+ ydMemberVo.setAvailableBalance(BigDecimal.ZERO);
+ }
BigDecimal inBalance = basicSettingMapper.selectChargeAmountByMemberIdAndStatus(memberId,1);
- ydMemberVo.setInBalance(inBalance);
+ ydMemberVo.setInBalance(inBalance == null ? BigDecimal.ZERO : inBalance);
BigDecimal outBalance = basicSettingMapper.selectWithdrawAmountByMemberIdAndStatusAndIsInside(memberId,2,"N");
- ydMemberVo.setOutBalance(outBalance);
+ ydMemberVo.setOutBalance(outBalance == null ? BigDecimal.ZERO : outBalance);
+ BigDecimal returnAgent = basicSettingMapper.selectAgentReturnByMemberId(memberId);
+ ydMemberVo.setReturnAgent(returnAgent == null ? BigDecimal.ZERO : returnAgent);
+
+ BigDecimal totalProfit = basicSettingMapper.selectTotalProfitByMemberIdAndType(memberId,1);
+ ydMemberVo.setTotalProfit(totalProfit);
+
}
}
return ydMemberVos;
}
+
+ @Override
+ public IPage<YdAgentOrderVo> getAgentOrderList(YdOrderEntity ydOrderEntity, QueryRequest request) {
+ log.info("代理订单列表");
+ Page<YdOrderEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<YdAgentOrderVo> ydOrderEntitys = basicSettingMapper.getAgentOrderList(page, ydOrderEntity);
+ return ydOrderEntitys;
+ }
+
+ @Override
+ public IPage<MemberAccountMoneyChangeEntity> seeAgentReturn(QueryRequest request, MemberEntity memberEntity) {
+ log.info("会员算力查询---返利详情");
+ Page<MemberAccountMoneyChangeEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<MemberAccountMoneyChangeEntity> memberAccountMoneyChangeEntitys = basicSettingMapper.seeAgentReturn(page, memberEntity);
+ return memberAccountMoneyChangeEntitys;
+ }
+
+ @Override
+ public IPage<MemberAccountMoneyChangeEntity> seeReturn(QueryRequest request, MemberEntity memberEntity) {
+ log.info("会员算力查询---挖矿详情");
+ Page<MemberAccountMoneyChangeEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<MemberAccountMoneyChangeEntity> memberAccountMoneyChangeEntitys = basicSettingMapper.seeReturn(page, memberEntity);
+ return memberAccountMoneyChangeEntitys;
+ }
+
+ @Override
+ public IPage<YdOrderEntity> seeOrder(QueryRequest request, MemberEntity memberEntity) {
+ log.info("会员算力查询---订单详情");
+ Page<YdOrderEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<YdOrderEntity> ydOrderEntitys = basicSettingMapper.seeOrder(page, memberEntity);
+ return ydOrderEntitys;
+ }
+
}
--
Gitblit v1.9.1