From 83fb08a153d1cbd1400ae7c293c6329aee5d1865 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 31 May 2024 12:45:34 +0800
Subject: [PATCH] 查询条件
---
src/main/resources/mapper/dapp/DappMemberDao.xml | 2
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 76 ++++++++++++++++++++++++++++++++++++--
src/main/resources/application-dev.yml | 2
src/main/resources/mapper/dapp/DappAchieveMapper.xml | 2
src/main/resources/application.yml | 2
src/main/java/cc/mrbird/febs/dapp/vo/TeamListVo.java | 7 ++-
6 files changed, 80 insertions(+), 11 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
index 7f05ec5..469cee2 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -33,10 +33,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -356,6 +353,53 @@
return member;
}
+ public static void main(String[] args) {
+ String inputString =
+// "36707681,36605256,36506391,36402334," +
+// "36303396,36103193,35801871,34603197," +
+// "33502855,26309863,99073916,98024982," +
+// "97059583,95058331,92037722,91048635," +
+ "89019478,88021442,84073227,20441682";
+ String target = "91048635";
+
+ // 调用函数进行匹配并输出结果
+ if (shouldOutputString(inputString, target)) {
+ System.out.println(inputString);
+ } else {
+ System.out.println("No match found within the last 8 substrings.");
+ }
+ }
+
+ /**
+ * 检查输入字符串从后往前匹配目标字符串的位置是否小于8（基于逗号分隔的子串数量）
+ *
+ * @param inputString 输入的字符串
+ * @param target 目标字符串
+ * @return 如果匹配的位置小于8，则返回true；否则返回false
+ */
+ public static boolean shouldOutputString(String inputString, String target) {
+ // 按逗号分隔字符串
+ String[] substrings = inputString.split(",");
+
+ // 从后往前遍历子串数组
+ for (int i = substrings.length - 1; i >= 0; i--) {
+ // 去掉子串两侧的空白字符（如果有的话）
+ String trimmedSubstring = substrings[i].trim();
+ System.out.println(trimmedSubstring);
+
+ // 检查子串是否与目标字符串匹配
+ if (trimmedSubstring.equals(target)) {
+ // 如果匹配且位置小于8（基于0索引，所以实际上是倒数第9个或更前的位置）
+ if (substrings.length - i < 8) {
+ return true; // 输出整个原始字符串
+ }
+ break; // 匹配但位置不在要求范围内，退出循环
+ }
+ }
+
+ return false; // 没有找到匹配项或匹配项位置不符合要求
+ }
+
@Override
public TeamListVo findTeamList() {
TeamListVo teamListVo = new TeamListVo();
@@ -380,6 +424,30 @@
teamListVo.setAvaAmount(BigDecimal.ZERO);
}
+ ArrayList<DappMemberEntity> objects = new ArrayList<>();
+ //八层团队业绩
+ if(CollUtil.isNotEmpty(dappMemberEntities)){
+ for(DappMemberEntity memberEntity : dappMemberEntities){
+ String refererIds = memberEntity.getRefererIds();
+ if (shouldOutputString(refererIds, member.getInviteId())) {
+ objects.add(memberEntity);
+ }
+ }
+ List<Long> collect = objects.stream().map(DappMemberEntity::getId).collect(Collectors.toList());
+ QueryWrapper<DappAchieve> queryWrapper = new QueryWrapper<>();
+ queryWrapper.in("member_id",collect);
+ List<DappAchieve> dappAchieveSumList = dappAchieveMapper.selectList(queryWrapper);
+
+ List<DappAchieve> filteredList = dappAchieveSumList.stream()
+ .filter(obj -> obj.getState() == 1)
+ .collect(Collectors.toList());
+ BigDecimal perkAmount = filteredList.stream().map(DappAchieve::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+ teamListVo.setPerkAmount(perkAmount);
+
+ }else{
+ teamListVo.setPerkAmount(BigDecimal.ZERO);
+ }
+
List<DappMemberEntity> dappMemberEntitiesAva = dappMemberDao.selectChildMemberDirectOrNot(member.getInviteId(), 1);
if(CollUtil.isNotEmpty(dappMemberEntitiesAva)){
diff --git a/src/main/java/cc/mrbird/febs/dapp/vo/TeamListVo.java b/src/main/java/cc/mrbird/febs/dapp/vo/TeamListVo.java
index 5cc1631..fb40a5a 100644
--- a/src/main/java/cc/mrbird/febs/dapp/vo/TeamListVo.java
+++ b/src/main/java/cc/mrbird/febs/dapp/vo/TeamListVo.java
@@ -5,8 +5,6 @@
import lombok.Data;
import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.List;
/**
* @author wzy
@@ -31,7 +29,10 @@
@ApiModelProperty(value = "团队业绩")
private BigDecimal teamAmount;
- @ApiModelProperty(value = "有效业绩")
+ @ApiModelProperty(value = "团队总业绩")
private BigDecimal avaAmount;
+ @ApiModelProperty(value = "团队奖励业绩")
+ private BigDecimal perkAmount;
+
}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 388135d..5a0235a 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -49,7 +49,7 @@
publisher-confirm-type: correlated
system:
- huadian-transfer: true
+ huadian-transfer: false
chain-listener: false
trade-job: false
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b945466..73259ff 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -5,7 +5,7 @@
spring:
profiles:
- active: dev-chain
+ active: dev
thymeleaf:
cache: false
diff --git a/src/main/resources/mapper/dapp/DappAchieveMapper.xml b/src/main/resources/mapper/dapp/DappAchieveMapper.xml
index e143064..27a94fe 100644
--- a/src/main/resources/mapper/dapp/DappAchieveMapper.xml
+++ b/src/main/resources/mapper/dapp/DappAchieveMapper.xml
@@ -18,7 +18,7 @@
<if test="record.teamAddress != null and record.teamAddress != ''">
and a.member_id in(
select id from dapp_member where FIND_IN_SET(
- (select invite_id from dapp_member where address = #{record.teamAddress}),fee_profit_ids)
+ (select invite_id from dapp_member where address = #{record.teamAddress}),referer_ids)
)
</if>
</where>
diff --git a/src/main/resources/mapper/dapp/DappMemberDao.xml b/src/main/resources/mapper/dapp/DappMemberDao.xml
index 3e4cd57..8595517 100644
--- a/src/main/resources/mapper/dapp/DappMemberDao.xml
+++ b/src/main/resources/mapper/dapp/DappMemberDao.xml
@@ -91,7 +91,7 @@
and referer_id=#{inviteId}
</if>
<if test="type==2">
- and find_in_set(#{inviteId}, fee_profit_ids)
+ and find_in_set(#{inviteId}, referer_ids)
</if>
</where>
</select>
--
Gitblit v1.9.1