出账记录-操作人

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/FortuneAccountServiceImpl.java

@@ -166,6 +166,7 @@ public class FortuneAccountServiceImpl extends ServiceImpl<FortuneAccountMapper,
                     // 处理金额字段
                     updateFortune.setCurrentPaymentHkdAmount(item.getHkdAmount());
                     updateFortune.setCurrentPaymentRatio(BigDecimal.valueOf(100));
+                    updateFortune.setReconciliationOperator(currentLoginUser.getUsername());
                     updateFortuneList.add(updateFortune);
                 }
             }

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/FortuneServiceImpl.java

@@ -215,10 +215,14 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
     }
 
     private void totalFortune(Fortune fortune, ExpectedFortune expectedFortune, String loginUserId, FortuneUpdateRequest fortuneUpdateRequest) {
+
+        AuthUserDto currentLoginUser = SecurityUtil.getCurrentLoginUser();
+
         // 1. 更新fortune记录为全额发放状态
         fortune.setCurrentPaymentHkdAmount(fortune.getHkdAmount());
         fortune.setCurrentPaymentRatio(BigDecimal.valueOf(100));
         fortune.setStatus(FortuneStatusEnum.CHECKED.getItemValue());
+        fortune.setReconciliationOperator(currentLoginUser.getUsername());
         fortune.setUpdaterId(loginUserId);
         fortune.setUpdateTime(new Date());
 
@@ -271,12 +275,16 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
         if (currentPaymentHkdAmount.compareTo(main.getCurrentPaymentHkdAmount()) > 0)
             throw new BusinessException("本次发放金额不能大于可出账金额");
 
+        // 获取当前登录用户的ID
+        AuthUserDto currentLoginUser = SecurityUtil.getCurrentLoginUser();
+
         // 1. 更新主行 = 本次发放金额
         main.setCurrentPaymentAmount(null);
         main.setCurrentPaymentHkdAmount(currentPaymentHkdAmount);
         main.setCurrentPaymentRatio(currentPaymentHkdAmount
                 .divide(expectedFortune.getHkdAmount(), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)));
         main.setStatus(FortuneStatusEnum.CHECKED.getItemValue());
+        main.setReconciliationOperator(currentLoginUser.getUsername());
         main.setUpdaterId(loginUserId);
         main.setUpdateTime(new Date());
         // 其他字段更新
@@ -298,6 +306,7 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
             part.setStatus(FortuneStatusEnum.WAIT.getItemValue());
             part.setIsPart(1);
             part.setPayoutDate(LocalDate.now().plusMonths(1)); // 次月
+            part.setReconciliationOperator(currentLoginUser.getUsername());
             part.setCreatorId(loginUserId);
             part.setCreateTime(new Date());
             this.save(part);