hy/aslan-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

历史数据兼容

Browse Source
This commit is contained in:
tianfeng 2025-10-13 16:54:55 +08:00
parent 8e39bfdd1f
commit 6f7178593b
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/team/team/impl/TeamMemberTargetServiceImpl.java
View File

@ -37,6 +37,8 @@ import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.core.query.Update; import org.springframework.data.mongodb.core.query.Update;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import static com.red.circle.other.infra.database.mongo.service.team.TeamBillCycleUtils.getCalcBillBelong;
/** /**
* 用户账单目标. * 用户账单目标.
* *
@ -256,7 +258,14 @@ public class TeamMemberTargetServiceImpl implements TeamMemberTargetService {
.and("teamId").is(teamId); .and("teamId").is(teamId);
if (billBelong != null) { if (billBelong != null) {
criteria.and("billBelong").is(billBelong); int rangeStart = billBelong * 100; // 例如：202509 * 100 = 20250900
int rangeEnd = billBelong * 100 + 99; // 例如：202509 * 100 + 99 = 20250999
criteria.orOperator(
Criteria.where("billBelong").is(billBelong),
Criteria.where("billBelong").gte(rangeStart).lte(rangeEnd)
);
} }
return mongoTemplate.find(Query.query(criteria) return mongoTemplate.find(Query.query(criteria)
@ -562,7 +571,7 @@ public class TeamMemberTargetServiceImpl implements TeamMemberTargetService {
} }
private Integer nowMonthBillBelong() { private Integer nowMonthBillBelong() {
return ZonedDateTimeAsiaRiyadhUtils.nowYearMonthToInt(); return getCalcBillBelong();
} }
@Override @Override