Skip to content

Y
yd-csf
Commit d0523a47 by zhangxingmin
Options

Merge remote-tracking branch 'origin/test' into test

parents 74424736 421940dc
Showing with 22 additions and 11 deletions
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiExpectedFortuneServiceImpl.java
......@@ -1433,7 +1433,9 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
if (!CollectionUtils.isEmpty(fortuneList)) {
// 计算已出账金额
for (Fortune fortune : fortuneList) {
paidAmount = paidAmount.add(fortune.getCurrentPaymentHkdAmount());
if (FortuneStatusEnum.SENT.getItemValue().equals(fortune.getStatus())) {
paidAmount = paidAmount.add(fortune.getCurrentPaymentHkdAmount());
}
}
// 计算待出账金额
unpaidAmount = request.getHkdAmount().subtract(paidAmount);
......
yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionServiceImpl.java
......@@ -751,6 +751,10 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
(oldValue, newValue) -> newValue // 遇到重复时使用新值
));
// 当前登录用户
AuthUserDto currentLoginUser = SecurityUtil.getCurrentLoginUser();
String loginUserId = currentLoginUser.getId().toString();
Date now = new Date();
// 创建新的发佣记录
......@@ -815,6 +819,9 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
fortune.setCreateTime(now);
fortune.setUpdateTime(now);
fortune.setReconciliationOperator("系统生成");
fortune.setCreatorId(loginUserId);
fortune.setUpdaterId(loginUserId);
newFortuneList.add(fortune);
}
......
yd-csf-service/src/main/java/com/yd/csf/service/service/impl/ExpectedFortuneServiceImpl.java
......@@ -147,6 +147,7 @@ public class ExpectedFortuneServiceImpl extends ServiceImpl<ExpectedFortuneMappe
// 3. 将 actualList 转换为 Map
Map<String, List<ApiExpectedFortunePageResponse>> actualMap = actualList.stream()
.filter(item -> "R".equals(item.getFortuneBizType()))
.collect(Collectors.groupingBy(ApiExpectedFortunePageResponse::getExpectedFortuneBizId));
// 4. 调整数据顺序
......@@ -158,11 +159,12 @@ public class ExpectedFortuneServiceImpl extends ServiceImpl<ExpectedFortuneMappe
// 查找对应的实际发佣
List<ApiExpectedFortunePageResponse> matchedList = actualMap.get(expected.getExpectedFortuneBizId());
if (CollUtil.isNotEmpty(matchedList)) {
// 设置实际出账记录的字段：待出账金额(估)、已出账比例、未出账比例
// 设置实际出账记录的字段：待出账金额(估)、已出账比例、未出账比例、已出账金额
matchedList.forEach(actual -> {
actual.setUnpaidAmount(expected.getHkdAmount());
actual.setPaidRatio(expected.getPaidRatio());
actual.setUnpaidRatio(expected.getUnpaidRatio());
actual.setPaidAmount(expected.getPaidAmount());
});
sortedList.addAll(matchedList);
......
yd-csf-service/src/main/java/com/yd/csf/service/service/impl/FortuneAccountServiceImpl.java
......@@ -189,7 +189,7 @@ public class FortuneAccountServiceImpl extends ServiceImpl<FortuneAccountMapper,
updateFortune.setCurrentPaymentRatio(item.getCurrentPaymentHkdAmount()
.divide(item.getHkdAmount(), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)));
}
updateFortune.setReconciliationOperator(currentLoginUser.getUsername());
updateFortune.setReconciliationOperator(currentLoginUser.getRealName());
updateFortuneList.add(updateFortune);
// 处理关联预计发佣记录
expectedFortuneBizIdList.add(item.getExpectedFortuneBizId());
......
yd-csf-service/src/main/java/com/yd/csf/service/service/impl/FortuneServiceImpl.java
......@@ -233,7 +233,7 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
String loginUserId = currentLoginUser.getId().toString();
// 检核人
fortune.setReconciliationOperator(currentLoginUser.getUsername());
fortune.setReconciliationOperator(currentLoginUser.getRealName());
// 如果传入了金额
if (currentPaymentHkdAmount != null && currentPaymentHkdAmount.compareTo(BigDecimal.ZERO) != 0) {
......@@ -260,7 +260,7 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
fortune.setCurrentPaymentHkdAmount(fortune.getHkdAmount());
fortune.setCurrentPaymentRatio(BigDecimal.valueOf(100));
fortune.setStatus(FortuneStatusEnum.CHECKED.getItemValue());
fortune.setReconciliationOperator(currentLoginUser.getUsername());
fortune.setReconciliationOperator(currentLoginUser.getRealName());
fortune.setUpdaterId(loginUserId);
fortune.setUpdateTime(new Date());
......@@ -308,7 +308,7 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
main.setCurrentPaymentRatio(currentPaymentHkdAmount
.divide(expectedFortune.getHkdAmount(), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)));
main.setStatus(FortuneStatusEnum.CHECKED.getItemValue());
main.setReconciliationOperator(currentLoginUser.getUsername());
main.setReconciliationOperator(currentLoginUser.getRealName());
main.setUpdaterId(loginUserId);
main.setUpdateTime(new Date());
......@@ -327,7 +327,7 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
part.setStatus(FortuneStatusEnum.RESERVED.getItemValue());
part.setIsPart(1);
part.setPayoutDate(LocalDate.now().plusMonths(1)); // 次月
part.setReconciliationOperator(currentLoginUser.getUsername());
part.setReconciliationOperator(currentLoginUser.getRealName());
part.setCreatorId(loginUserId);
part.setCreateTime(new Date());
this.save(part);
......@@ -1017,7 +1017,7 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
newExpectedFortune.setPaidRatio(BigDecimal.ZERO);
newExpectedFortune.setUnpaidRatio(BigDecimal.valueOf(100));
newExpectedFortune.setStatus("0");
newExpectedFortune.setStatus(FortuneStatusEnum.CAN_SEND.getItemValue());
newExpectedFortune.setPayoutDate(LocalDate.parse(splitDto.getPayoutYearMonth() + "-01"));
......
yd-csf-service/src/main/resources/mappers/ExpectedFortuneMapper.xml
......@@ -239,10 +239,10 @@
f.payout_amount,
f.hkd_to_payout_rate,
f.hkd_amount,
f.current_payment_hkd_amount,
NULL as current_payment_hkd_amount,
f.exchange_rate,
IF(f.status = 2, f.hkd_amount, 0) as paid_amount,
IF(f.status != 2 and f.status != 5, f.hkd_amount, 0) as unpaid_amount,
NULL as paid_amount,
NULL as unpaid_amount,
NULL as paid_ratio,
NULL as unpaid_ratio,
f.is_tax,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment