exchange.git - Gitblit

			@@ -325,7 +325,7 @@

			MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
			Long memberId = memberEntity.getId();
			// Long memberId = 442L;
			// Long memberId = 447L;
			OrderAllInfoVo orderAllInfoVo = new OrderAllInfoVo();
			DecimalFormat decimalFormat = new DecimalFormat("0.0000#");
			//历史总收益
			@@ -351,7 +351,12 @@
			if(CollUtil.isNotEmpty(PowerNowQuery)){
			for(YdOrderEntity order : PowerNowQuery){
			int quantity = order.getQuantity();
			powerNow = powerNow + quantity;
			Long productId = order.getProductId();
			YdProductEntity ydProductEntity = ydProductDao.selectById(productId);
			if("XCH".equals(ydProductEntity.getCoin())){
			Integer proNum = ydProductEntity.getProNum();
			powerNow = powerNow + quantity*proNum;
			}
			}
			}
			orderAllInfoVo.setPowerNow(powerNow);
			@@ -365,7 +370,12 @@
			if(CollUtil.isNotEmpty(powerReradyQuerys)){
			for(YdOrderEntity order : powerReradyQuerys){
			int quantity = order.getQuantity();
			powerReady = powerReady + quantity;
			Long productId = order.getProductId();
			YdProductEntity ydProductEntity = ydProductDao.selectById(productId);
			if("XCH".equals(ydProductEntity.getCoin())){
			Integer proNum = ydProductEntity.getProNum();
			powerReady = powerReady + quantity*proNum;
			}
			}
			}
			orderAllInfoVo.setPowerReady(powerReady);
			@@ -636,7 +646,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("XCH".equals(ydProductEntity.getCoin())){
			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 +679,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("XCH".equals(ydProductEntity.getCoin())){
			Integer proNum = ydProductEntity.getProNum();
			Integer quantity = ydOrderEntity.getQuantity();
			powerNum = powerNum + proNum*quantity;
			}
			}
			}
			teamInfoVo.setPowerNum(powerNum);
			}
			}

	src/main/java/com/xcong/excoin/modules/yunding/dao/YdOrderDao.java	1 ●●●●● patch \| view \| raw \| blame \| history
	src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java	45 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/mapper/yunding/YdOrderDao.xml	8 ●●●●● patch \| view \| raw \| blame \| history

			@@ -125,4 +125,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>

			@@ -41,4 +41,5 @@

			List<MemberEntity> selectMemberByInviteId(@Param("inviteId")String inviteId);

			List<YdOrderEntity> selectListByMemberIdAndElse(@Param("inviteId")String inviteId);
			}