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

Fix daily salary duplicate scope

Browse Source
This commit is contained in:
hy001 2026-05-20 00:50:21 +08:00
parent a9320d58ec
commit ad73326eae
1 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/team/TeamSalaryPaymentListener.java
View File

@ -522,7 +522,7 @@ public class TeamSalaryPaymentListener implements MessageListener {
// 是否已经发送过代理部份工资
if (Boolean.FALSE.equals(
checkRepeatPayment(teamProfile, payment, policy, memberTargetId, Boolean.FALSE))) {
checkRepeatPayment(teamProfile, payment, policy, Boolean.FALSE))) {
String detailsId = IdWorkerUtils.getIdStr();
@ -570,7 +570,7 @@ public class TeamSalaryPaymentListener implements MessageListener {
// 是否已经发送过该成员工资
if (Boolean.FALSE.equals(
checkRepeatPayment(teamProfile, payment, policy, memberTargetId, Boolean.TRUE))) {
checkRepeatPayment(teamProfile, payment, policy, Boolean.TRUE))) {
String detailsId = IdWorkerUtils.getIdStr();
@ -627,7 +627,7 @@ public class TeamSalaryPaymentListener implements MessageListener {
// 是否已经发送过该成员工资
if (Boolean.TRUE.equals(
checkRepeatPayment(teamProfile, payment, policy, memberTargetId, Boolean.TRUE))) {
checkRepeatPayment(teamProfile, payment, policy, Boolean.TRUE))) {
return;
}
@ -725,26 +725,16 @@ public class TeamSalaryPaymentListener implements MessageListener {
* @param teamProfile 团队
* @param payment 支付信息
* @param policy 政策
* @param memberTargetId 成员工作id
* @param isPayMember 支付工资成员验证
* @return true 重复发送, false 允许发送
*/
private Boolean checkRepeatPayment(TeamProfile teamProfile, TeamSalaryPayment payment,
TeamPolicy policy, String memberTargetId, Boolean isPayMember) {
// if (Objects.equals(payment.getUserId(), 1681823277871214593L) ||
// Objects.equals(payment.getUserId(), 1684848110911922177L) ||
// Objects.equals(payment.getUserId(), 1630240619660009473L)) {
return teamSalaryPaymentService
.checkRepeatPayment(payment.getId(), payment.getUserId(), teamProfile.getRegion(),
policy.getLevel(), memberTargetId, isPayMember);
//}
// return teamSalaryPaymentService
// .checkRepeatPayment(payment.getId(), payment.getUserId(), teamProfile.getRegion(),
// policy.getLevel(), isPayMember);
}
* @param isPayMember 支付工资成员验证
* @return true 重复发送, false 允许发送
*/
private Boolean checkRepeatPayment(TeamProfile teamProfile, TeamSalaryPayment payment,
TeamPolicy policy, Boolean isPayMember) {
return teamSalaryPaymentService
.checkRepeatPayment(payment.getId(), payment.getUserId(), teamProfile.getRegion(),
policy.getLevel(), isPayMember);
}
/**
* 基于当前等级获得上一个等级政策.