Skip to content

Y
yd-csf
Commit 421940dc by jianan
Options

出账检核-增加币种69

parent 62efbe4b
Showing with 5 additions and 5 deletions
yd-csf-service/src/main/java/com/yd/csf/service/service/impl/FortuneAccountServiceImpl.java
...@@ -189,7 +189,7 @@ public class FortuneAccountServiceImpl extends ServiceImpl<FortuneAccountMapper, ...@@ -189,7 +189,7 @@ public class FortuneAccountServiceImpl extends ServiceImpl<FortuneAccountMapper,
updateFortune.setCurrentPaymentRatio(item.getCurrentPaymentHkdAmount() updateFortune.setCurrentPaymentRatio(item.getCurrentPaymentHkdAmount()
.divide(item.getHkdAmount(), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100))); .divide(item.getHkdAmount(), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)));
} }
updateFortune.setReconciliationOperator(currentLoginUser.getUsername()); updateFortune.setReconciliationOperator(currentLoginUser.getRealName());
updateFortuneList.add(updateFortune); updateFortuneList.add(updateFortune);
// 处理关联预计发佣记录 // 处理关联预计发佣记录
expectedFortuneBizIdList.add(item.getExpectedFortuneBizId()); 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> ...@@ -233,7 +233,7 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
String loginUserId = currentLoginUser.getId().toString(); String loginUserId = currentLoginUser.getId().toString();
// 检核人 // 检核人
fortune.setReconciliationOperator(currentLoginUser.getUsername()); fortune.setReconciliationOperator(currentLoginUser.getRealName());
// 如果传入了金额 // 如果传入了金额
if (currentPaymentHkdAmount != null && currentPaymentHkdAmount.compareTo(BigDecimal.ZERO) != 0) { if (currentPaymentHkdAmount != null && currentPaymentHkdAmount.compareTo(BigDecimal.ZERO) != 0) {
...@@ -260,7 +260,7 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune> ...@@ -260,7 +260,7 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
fortune.setCurrentPaymentHkdAmount(fortune.getHkdAmount()); fortune.setCurrentPaymentHkdAmount(fortune.getHkdAmount());
fortune.setCurrentPaymentRatio(BigDecimal.valueOf(100)); fortune.setCurrentPaymentRatio(BigDecimal.valueOf(100));
fortune.setStatus(FortuneStatusEnum.CHECKED.getItemValue()); fortune.setStatus(FortuneStatusEnum.CHECKED.getItemValue());
fortune.setReconciliationOperator(currentLoginUser.getUsername()); fortune.setReconciliationOperator(currentLoginUser.getRealName());
fortune.setUpdaterId(loginUserId); fortune.setUpdaterId(loginUserId);
fortune.setUpdateTime(new Date()); fortune.setUpdateTime(new Date());
...@@ -308,7 +308,7 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune> ...@@ -308,7 +308,7 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
main.setCurrentPaymentRatio(currentPaymentHkdAmount main.setCurrentPaymentRatio(currentPaymentHkdAmount
.divide(expectedFortune.getHkdAmount(), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100))); .divide(expectedFortune.getHkdAmount(), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)));
main.setStatus(FortuneStatusEnum.CHECKED.getItemValue()); main.setStatus(FortuneStatusEnum.CHECKED.getItemValue());
main.setReconciliationOperator(currentLoginUser.getUsername()); main.setReconciliationOperator(currentLoginUser.getRealName());
main.setUpdaterId(loginUserId); main.setUpdaterId(loginUserId);
main.setUpdateTime(new Date()); main.setUpdateTime(new Date());
...@@ -327,7 +327,7 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune> ...@@ -327,7 +327,7 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
part.setStatus(FortuneStatusEnum.RESERVED.getItemValue()); part.setStatus(FortuneStatusEnum.RESERVED.getItemValue());
part.setIsPart(1); part.setIsPart(1);
part.setPayoutDate(LocalDate.now().plusMonths(1)); // 次月 part.setPayoutDate(LocalDate.now().plusMonths(1)); // 次月
part.setReconciliationOperator(currentLoginUser.getUsername()); part.setReconciliationOperator(currentLoginUser.getRealName());
part.setCreatorId(loginUserId); part.setCreatorId(loginUserId);
part.setCreateTime(new Date()); part.setCreateTime(new Date());
this.save(part); this.save(part);
......
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