新增应付3

yd-csf-service/src/main/java/com/yd/csf/service/dto/FortuneAccountExportDTO.java

@@ -6,6 +6,7 @@ import lombok.Data;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
@@ -32,6 +33,8 @@ public class FortuneAccountExportDTO implements Serializable {
 
 
     private List<Fortune> fortuneList;
     private List<Fortune> fortuneList;
 
 
+    private LocalDate actualPayoutDate;
+
     // 动态字段，用于存储不同的fortune项目
     // 动态字段，用于存储不同的fortune项目
     private Map<String, BigDecimal> fortuneAmounts = new HashMap<>();
     private Map<String, BigDecimal> fortuneAmounts = new HashMap<>();
 
 

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

@@ -2,6 +2,7 @@ package com.yd.csf.service.service.impl;
 import java.math.RoundingMode;
 import java.math.RoundingMode;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.Date;
 import java.util.Date;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -125,7 +126,7 @@ public class FortuneAccountServiceImpl extends ServiceImpl<FortuneAccountMapper,
             fortuneAccount.setTeamBizId(accountExportDTO.getTeamBizId());
             fortuneAccount.setTeamBizId(accountExportDTO.getTeamBizId());
             fortuneAccount.setCurrency(accountExportDTO.getCurrency());
             fortuneAccount.setCurrency(accountExportDTO.getCurrency());
             fortuneAccount.setHkdAmount(accountExportDTO.getAmount());
             fortuneAccount.setHkdAmount(accountExportDTO.getAmount());
-            fortuneAccount.setFortuneAccountDate(currentDate);
+            fortuneAccount.setFortuneAccountDate(this.getActualPayoutDate(accountExportDTO));
             // 出账状态默认待出账
             // 出账状态默认待出账
             fortuneAccount.setStatus(FortuneStatusEnum.CHECKED.getItemValue());
             fortuneAccount.setStatus(FortuneStatusEnum.CHECKED.getItemValue());
 
 
@@ -188,6 +189,14 @@ public class FortuneAccountServiceImpl extends ServiceImpl<FortuneAccountMapper,
 
 
     }
     }
 
 
+    private Date getActualPayoutDate(FortuneAccountExportDTO accountExportDTO) {
+        LocalDate actualPayoutDate = accountExportDTO.getActualPayoutDate();
+        if (actualPayoutDate == null) {
+            return null;
+        }
+        return Date.from(actualPayoutDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
+    }
+
     @Override
     @Override
     public FortuneAccount getByFortuneAccountBizId(String fortuneAccountBizId) {
     public FortuneAccount getByFortuneAccountBizId(String fortuneAccountBizId) {
         return this.getOne(new QueryWrapper<FortuneAccount>().eq("fortune_account_biz_id", fortuneAccountBizId));
         return this.getOne(new QueryWrapper<FortuneAccount>().eq("fortune_account_biz_id", fortuneAccountBizId));

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

@@ -388,6 +388,7 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
                         accountDTO.setTeam(brokerFortunes.get(0).getTeam());
                         accountDTO.setTeam(brokerFortunes.get(0).getTeam());
                         accountDTO.setTeamBizId(brokerFortunes.get(0).getTeamBizId());
                         accountDTO.setTeamBizId(brokerFortunes.get(0).getTeamBizId());
                         accountDTO.setCurrency(currency);
                         accountDTO.setCurrency(currency);
+                        accountDTO.setActualPayoutDate(brokerFortunes.get(0).getActualPayoutDate());
                     }
                     }
 
 
                     // 计算出账总额
                     // 计算出账总额