BUGFIX: 编辑referral状态
This commit is contained in:
@@ -21,10 +21,7 @@ import javax.annotation.Resource;
|
|||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.time.YearMonth;
|
import java.time.YearMonth;
|
||||||
import java.util.Arrays;
|
import java.util.*;
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Objects;
|
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@Service
|
@Service
|
||||||
@@ -91,6 +88,7 @@ public class ReferralServiceImpl extends ServiceImpl<ReferralMapper, Referral> i
|
|||||||
BigDecimal unpaid = baseMapper.sumAmount(referral.getAffiliateId(), Collections.singletonList("Unpaid"), null, null);
|
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){
|
if (BigDecimal.valueOf(affiliate.getUnpaidEarnings()).compareTo(unpaid) != 0){
|
||||||
LocalDateTime start = YearMonth.now().atDay(1).atStartOfDay(); // 本月第一天 00:00:00
|
LocalDateTime start = YearMonth.now().atDay(1).atStartOfDay(); // 本月第一天 00:00:00
|
||||||
LocalDateTime end = YearMonth.now().atEndOfMonth().atTime(23, 59, 59);
|
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 monthlyEarning = baseMapper.sumAmount(referral.getAffiliateId(), Arrays.asList("Unpaid", "Paid"), start, end);
|
||||||
// 在平台的总收入
|
// 在平台的总收入
|
||||||
BigDecimal totalEarning = baseMapper.sumAmount(referral.getAffiliateId(), Arrays.asList("Unpaid", "Paid"), null, null);
|
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.setMonthlyEarnings(Objects.nonNull(monthlyEarning) ? monthlyEarning.floatValue() : 0);
|
||||||
affiliate.setTotalEarnings(Objects.nonNull(totalEarning) ? totalEarning.floatValue() : 0);
|
affiliate.setTotalEarnings(Objects.nonNull(totalEarning) ? totalEarning.floatValue() : 0);
|
||||||
affiliate.setUpdateTime(LocalDateTime.now());
|
affiliate.setUpdateTime(LocalDateTime.now());
|
||||||
|
|||||||
Reference in New Issue
Block a user