From 19b5281d009c9bd70f15c6bfabc916942f892103 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 28 May 2021 15:52:32 +0800
Subject: [PATCH] 20210528
---
src/main/resources/mapper/yunding/YdOrderDao.xml | 8 ++++++++
src/main/java/com/xcong/excoin/modules/yunding/dao/YdOrderDao.java | 1 +
src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java | 29 +++++++++++++++++++++++++++--
3 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/yunding/dao/YdOrderDao.java b/src/main/java/com/xcong/excoin/modules/yunding/dao/YdOrderDao.java
index aad5bea..c888616 100644
--- a/src/main/java/com/xcong/excoin/modules/yunding/dao/YdOrderDao.java
+++ b/src/main/java/com/xcong/excoin/modules/yunding/dao/YdOrderDao.java
@@ -41,4 +41,5 @@
List<MemberEntity> selectMemberByInviteId(@Param("inviteId")String inviteId);
+ List<YdOrderEntity> selectListByMemberIdAndElse(@Param("inviteId")String inviteId);
}
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 9c8c051..ed4c0eb 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
@@ -636,7 +636,20 @@
}
teamVo.setMemberNum(memberNum);
//购买总算力
- int allPower = ydOrderDao.selectAllPowerByMemberIdAndElse(inviteId);
+
+ int allPower =0;
+ List<YdOrderEntity> ydOrderEntitys = ydOrderDao.selectListByMemberIdAndElse(inviteId);
+ if(CollUtil.isNotEmpty(ydOrderEntitys)){
+ for(YdOrderEntity ydOrderEntity : ydOrderEntitys){
+ Long productId = ydOrderEntity.getProductId();
+ YdProductEntity ydProductEntity = ydProductDao.selectById(productId);
+ if(ydProductEntity.getCoin() == "XCH"){
+ Integer proNum = ydProductEntity.getProNum();
+ Integer quantity = ydOrderEntity.getQuantity();
+ allPower = allPower + proNum*quantity;
+ }
+ }
+ }
teamVo.setAllPower(allPower);
//详细列表
Page<TeamInfoVo> page = new Page<>(teamInfoDto.getPageNum(), teamInfoDto.getPageSize());
@@ -656,7 +669,19 @@
}
teamInfoVo.setMemberNum(memberNumInvite);
//下属团队总算力
- int powerNum = ydOrderDao.selectAllPowerByMemberIdAndElse(phone);
+ int powerNum =0;
+ List<YdOrderEntity> ydOrderEntityLevel = ydOrderDao.selectListByMemberIdAndElse(inviteId);
+ if(CollUtil.isNotEmpty(ydOrderEntityLevel)){
+ for(YdOrderEntity ydOrderEntity : ydOrderEntityLevel){
+ Long productId = ydOrderEntity.getProductId();
+ YdProductEntity ydProductEntity = ydProductDao.selectById(productId);
+ if(ydProductEntity.getCoin() == "XCH"){
+ Integer proNum = ydProductEntity.getProNum();
+ Integer quantity = ydOrderEntity.getQuantity();
+ powerNum = powerNum + proNum*quantity;
+ }
+ }
+ }
teamInfoVo.setPowerNum(powerNum);
}
}
diff --git a/src/main/resources/mapper/yunding/YdOrderDao.xml b/src/main/resources/mapper/yunding/YdOrderDao.xml
index 5ae37ff..4fed875 100644
--- a/src/main/resources/mapper/yunding/YdOrderDao.xml
+++ b/src/main/resources/mapper/yunding/YdOrderDao.xml
@@ -124,4 +124,12 @@
select * from member
where find_in_set(#{inviteId}, referer_ids) or invite_id=#{inviteId}
</select>
+
+ <select id="selectListByMemberIdAndElse" resultType="com.xcong.excoin.modules.yunding.entity.YdOrderEntity">
+ select * from yd_order where type = 1 and member_id in (
+ select id from member
+ where find_in_set(#{inviteId}, referer_ids) or invite_id=#{inviteId}
+ )
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1