From a7b10c7fb28552e71e980d97a6b23c21cbcb212a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 28 May 2021 14:37:47 +0800
Subject: [PATCH] 20210528
---
src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java | 57 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 41 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java b/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java
index 110354e..9c8c051 100644
--- a/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java
@@ -110,6 +110,14 @@
if(ydProductVo.getSurplusT().compareTo(BigDecimal.ZERO) < 1) {
ydProductVo.setStatus(2);
}
+
+ Integer shelvesDays = ydProductVo.getShelvesDays();
+ String proUnit = ydProductVo.getProUnit();
+ if(shelvesDays == 0){
+ ydProductVo.setShelvesDaysStr("待定");
+ }else{
+ ydProductVo.setShelvesDaysStr(proUnit+"+"+shelvesDays);
+ }
}
}
@@ -135,10 +143,19 @@
/**
*产出规则
*/
- Date date = DateUtil.date();
- ydProductVo.setNowTime(date);
//上架天数
Integer shelvesDays = ydProductVo.getShelvesDays();
+ String proUnit = ydProductVo.getProUnit();
+ if(shelvesDays == 0){
+ ydProductVo.setGetType(2);
+ ydProductVo.setShelvesDaysStr("待定");
+ }else{
+ ydProductVo.setGetType(1);
+ ydProductVo.setShelvesDaysStr(proUnit+"+"+shelvesDays);
+ }
+
+ Date date = DateUtil.date();
+ ydProductVo.setNowTime(date);
Date workTime = DateUtil.offsetDay(date, shelvesDays);
ydProductVo.setWorkTime(workTime);
//服务周期
@@ -451,13 +468,13 @@
MemberWalletCoinEntity xch = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, "XCH");
BigDecimal totalBalance = xch.getTotalBalance();
BigDecimal subtractTotalBalance = totalBalance.subtract(xchNum);
- if(BigDecimal.ZERO.compareTo(subtractTotalBalance) >= 0){
+ if(BigDecimal.ZERO.compareTo(subtractTotalBalance) > 0){
return Result.fail("XCH数量不足");
}
BigDecimal availableBalance = xch.getAvailableBalance();
BigDecimal subtractAvailableBalance = availableBalance.subtract(xchNum);
- if(BigDecimal.ZERO.compareTo(subtractAvailableBalance) >= 0){
+ if(BigDecimal.ZERO.compareTo(subtractAvailableBalance) > 0){
return Result.fail("XCH数量不足");
}
//xch减少
@@ -602,6 +619,8 @@
log.info("获取团队信息");
MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
Long memberId = memberEntity.getId();
+// Long memberId = 444L;
+// MemberEntity memberEntity = memberDao.selectById(memberId);
/**
* 获取团队总人数，总购买数
* 详细列表
@@ -610,29 +629,35 @@
TeamVo teamVo = new TeamVo();
//团队总人数
int memberNum = 0;
- //直接下级
- QueryWrapper<MemberEntity> objectQueryWrapper = new QueryWrapper<>();
- objectQueryWrapper.eq("referer_id",memberEntity.getInviteId());
- List<MemberEntity> memberEntities = memberDao.selectList(objectQueryWrapper);
- if(CollUtil.isNotEmpty(memberEntities)){
- memberNum = memberEntities.size();
+ String inviteId = memberEntity.getInviteId();
+ List<MemberEntity> memberEntityList = ydOrderDao.selectMemberByInviteId(inviteId);
+ if(CollUtil.isNotEmpty(memberEntityList)){
+ memberNum = memberEntityList.size();
}
teamVo.setMemberNum(memberNum);
-
- //总购买数
- int allPower = ydOrderDao.selectAllPowerByMemberIdAndElse(memberEntity.getInviteId());
+ //购买总算力
+ int allPower = ydOrderDao.selectAllPowerByMemberIdAndElse(inviteId);
teamVo.setAllPower(allPower);
-
//详细列表
Page<TeamInfoVo> page = new Page<>(teamInfoDto.getPageNum(), teamInfoDto.getPageSize());
IPage<TeamInfoVo> teamInfoVos = ydOrderDao.getTeamInfoList(page, memberEntity);
List<TeamInfoVo> records = teamInfoVos.getRecords();
if(CollUtil.isNotEmpty(records)){
for(TeamInfoVo teamInfoVo : records){
- String phone = teamInfoVo.getPhone();
+ String phone = teamInfoVo.getInvitephone();
if(StrUtil.isNotEmpty(phone)){
- teamInfoVo.setPhone(StrUtil.subSufByLength(phone,4));
+ teamInfoVo.setInvitephone(StrUtil.subSufByLength(phone,4));
}
+ //下属团队人数
+ int memberNumInvite = 0;
+ List<MemberEntity> memberEntityInviteList = ydOrderDao.selectMemberByInviteId(phone);
+ if(CollUtil.isNotEmpty(memberEntityInviteList)){
+ memberNumInvite = memberEntityInviteList.size();
+ }
+ teamInfoVo.setMemberNum(memberNumInvite);
+ //下属团队总算力
+ int powerNum = ydOrderDao.selectAllPowerByMemberIdAndElse(phone);
+ teamInfoVo.setPowerNum(powerNum);
}
}
teamVo.setTeamInfoVos(records);
--
Gitblit v1.9.1