aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev/dev_xp' into dev/dev

Browse Source
This commit is contained in:
xupei
2025-08-26 11:54:24 +08:00
parent 54b09b4940 f9ec733f07
commit e258166a16
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/ai/da/service/impl/ReferralServiceImpl.java
View File

@@ -21,10 +21,7 @@ import javax.annotation.Resource;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.YearMonth;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.*;
@Slf4j
@Service
@@ -91,6 +88,7 @@ public class ReferralServiceImpl extends ServiceImpl<ReferralMapper, Referral> i
BigDecimal unpaid = baseMapper.sumAmount(referral.getAffiliateId(), Collections.singletonList("Unpaid"), null, null);
// 已支付和未支付的值肯定是同时发生变化
unpaid = Objects.isNull(unpaid) ? BigDecimal.ZERO : unpaid;
if (BigDecimal.valueOf(affiliate.getUnpaidEarnings()).compareTo(unpaid) != 0){
LocalDateTime start = YearMonth.now().atDay(1).atStartOfDay(); // 本月第一天 00:00:00
LocalDateTime end = YearMonth.now().atEndOfMonth().atTime(23, 59, 59);
@@ -98,7 +96,7 @@ public class ReferralServiceImpl extends ServiceImpl<ReferralMapper, Referral> i
BigDecimal monthlyEarning = baseMapper.sumAmount(referral.getAffiliateId(), Arrays.asList("Unpaid", "Paid"), start, end);
// 在平台的总收入
BigDecimal totalEarning = baseMapper.sumAmount(referral.getAffiliateId(), Arrays.asList("Unpaid", "Paid"), null, null);
affiliate.setUnpaidEarnings(Objects.nonNull(unpaid) ? unpaid.floatValue() : 0);
affiliate.setUnpaidEarnings(unpaid.floatValue());
affiliate.setMonthlyEarnings(Objects.nonNull(monthlyEarning) ? monthlyEarning.floatValue() : 0);
affiliate.setTotalEarnings(Objects.nonNull(totalEarning) ? totalEarning.floatValue() : 0);
affiliate.setUpdateTime(LocalDateTime.now());