From 6c4ca033bf15f7bb6fa01f15e06212ad5ba0868d Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sat, 15 May 2021 17:59:26 +0800
Subject: [PATCH] Merge branch 'yunding' of http://120.27.238.55:7000/r/exchange into yunding
---
src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java | 91 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 79 insertions(+), 12 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 fd185ed..074e5a6 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
@@ -1,7 +1,6 @@
package com.xcong.excoin.modules.yunding.service.Impl;
import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@@ -42,7 +41,6 @@
import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.util.Date;
-import java.util.HashMap;
import java.util.List;
@Slf4j
@@ -109,7 +107,7 @@
for(YdProductVo ydProductVo : records){
ydProductVo.setProfitT(prifitT);
- if(ydProductVo.getTotalT().compareTo(BigDecimal.ZERO) < 1) {
+ if(ydProductVo.getSurplusT().compareTo(BigDecimal.ZERO) < 1) {
ydProductVo.setStatus(2);
}
}
@@ -148,10 +146,8 @@
Date endTime = DateUtil.offsetDay(workTime, proCycle);
ydProductVo.setEndTime(endTime);
- if (ydProductVo.getTotalT().compareTo(BigDecimal.ZERO) < 1) {
+ if (ydProductVo.getSurplusT().compareTo(BigDecimal.ZERO) < 1) {
ydProductVo.setStatus(2);
- } else {
- ydProductVo.setStatus(1);
}
return Result.ok(ydProductVo);
}
@@ -231,12 +227,14 @@
quantityOwn = quantityOwn + ydOrderEntity.getQuantity();
}
}
- if(quantityOwn >= limitedNum){
+ int quantityInt = quantity.intValue();
+ if(quantityOwn + quantityInt > limitedNum){
return Result.fail("产品限购"+limitedNum);
}
- if (quantity.compareTo(BigDecimal.valueOf(ydProductEntity.getLimitedNum())) < 1) {
- return Result.fail("产品限购" + ydProductEntity.getLimitedNum());
- }
+
+// if (quantity.compareTo(BigDecimal.valueOf(ydProductEntity.getLimitedNum())) < 1) {
+// return Result.fail("产品限购" + ydProductEntity.getLimitedNum());
+// }
BigDecimal salePrice = ydProductEntity.getSalePrice();
//剩余产品数量
BigDecimal surplusT = ydProductEntity.getSurplusT();
@@ -280,7 +278,6 @@
"USDT", 1, 3, ydOrderEntity.getId());
yunDingProducter.sendYunDingUsdtProfit(ydOrderEntity.getId());
- yunDingProducter.sendYunDingAutoAgent(ydOrderEntity.getMemberId());
return Result.ok("支付成功");
}
@@ -585,7 +582,6 @@
memberEntity.setAgentLevel(id.intValue());
LoginUserUtils.resetAppLoginUser(memberEntity);
- yunDingProducter.sendYunDingAutoAgent(memberId);
yunDingProducter.sendYunDingUsdtProfit(orderEntity.getId());
return Result.ok("购买成功");
}
@@ -601,6 +597,77 @@
return Result.ok(xchNewPrices);
}
+ @Override
+ public Result getTeamList(TeamInfoDto teamInfoDto) {
+ log.info("获取团队信息");
+ MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
+ Long memberId = memberEntity.getId();
+// Long memberId = 444L;
+// MemberEntity memberEntity = memberDao.selectById(memberId);
+ /**
+ * 获取团队总人数，总购买数
+ * 详细列表
+ *
+ */
+ 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();
+// }
+// teamVo.setMemberNum(memberNum);
+//
+// //总购买数
+// int allPower = ydOrderDao.selectAllPowerByMemberIdAndElse(memberEntity.getInviteId());
+// 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();
+// if(StrUtil.isNotEmpty(phone)){
+// teamInfoVo.setPhone(StrUtil.subSufByLength(phone,4));
+// }
+// }
+// }
+// teamVo.setTeamInfoVos(records);
+ //团队总人数
+ int memberNum = 0;
+ String inviteId = memberEntity.getInviteId();
+ List<MemberEntity> memberEntityList = ydOrderDao.selectMemberByInviteId(inviteId);
+ if(CollUtil.isNotEmpty(memberEntityList)){
+ memberNum = memberEntityList.size();
+ }
+ teamVo.setMemberNum(memberNum);
+ //购买总算力
+ int allPower = ydOrderDao.selectAllPowerByMemberIdAndElse(inviteId);
+ teamVo.setAllPower(allPower);
+ //直接下级
+ QueryWrapper<MemberEntity> objectQueryWrapper = new QueryWrapper<>();
+ objectQueryWrapper.eq("referer_id",memberEntity.getInviteId());
+ List<MemberEntity> memberEntities = memberDao.selectList(objectQueryWrapper);
+ //详细列表
+ 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();
+ if(StrUtil.isNotEmpty(phone)){
+ teamInfoVo.setPhone(StrUtil.subSufByLength(phone,4));
+ }
+ }
+ }
+ return Result.ok(teamVo);
+ }
+
/**
* 去加减币币账户余额,减少产品的剩余数目
--
Gitblit v1.9.1