push

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiSalarySplitServiceImpl.java

@@ -147,7 +147,7 @@ public class ApiSalarySplitServiceImpl implements ApiSalarySplitService {
                     .filter(Objects::nonNull)
                     .filter(Objects::nonNull)
                     .reduce(BigDecimal.ZERO, BigDecimal::add);
                     .reduce(BigDecimal.ZERO, BigDecimal::add);
 
 
-            BigDecimal fortuneAmount = fortuneAccount.getHkdAmount() != null ? fortuneAccount.getHkdAmount() : BigDecimal.ZERO;
+            BigDecimal fortuneAmount = fortuneAccount.getPayoutAmount() != null ? fortuneAccount.getPayoutAmount() : BigDecimal.ZERO;
             beSplitAmount = fortuneAmount.subtract(splitTotal);
             beSplitAmount = fortuneAmount.subtract(splitTotal);
             if (beSplitAmount.compareTo(BigDecimal.ZERO) < 0) {
             if (beSplitAmount.compareTo(BigDecimal.ZERO) < 0) {
                 beSplitAmount = BigDecimal.ZERO; // 防止负数
                 beSplitAmount = BigDecimal.ZERO; // 防止负数
@@ -231,7 +231,7 @@ public class ApiSalarySplitServiceImpl implements ApiSalarySplitService {
         }
         }
 
 
         // 3. 计算剩余可拆金额（账户总额 - 本次拟拆分总额）
         // 3. 计算剩余可拆金额（账户总额 - 本次拟拆分总额）
-        BigDecimal fortuneAmount = fortuneAccount.getHkdAmount() != null ? fortuneAccount.getHkdAmount() : BigDecimal.ZERO;
+        BigDecimal fortuneAmount = fortuneAccount.getPayoutAmount() != null ? fortuneAccount.getPayoutAmount() : BigDecimal.ZERO;
         BigDecimal beSplitAmount = fortuneAmount.subtract(splitTotal);
         BigDecimal beSplitAmount = fortuneAmount.subtract(splitTotal);
         if (beSplitAmount.compareTo(BigDecimal.ZERO) < 0) {
         if (beSplitAmount.compareTo(BigDecimal.ZERO) < 0) {
             beSplitAmount = BigDecimal.ZERO; // 防止负数
             beSplitAmount = BigDecimal.ZERO; // 防止负数

yd-csf-feign/src/main/java/com/yd/csf/feign/dto/salarysplit/ApiSalarySplitSummaryPageDto.java

@@ -94,7 +94,7 @@ public class ApiSalarySplitSummaryPageDto {
     private String status;
     private String status;
 
 
     /**
     /**
-     * 出账总额
+     * 出账总额（发放币种金额总额）
      */
      */
     private BigDecimal amount;
     private BigDecimal amount;
 
 
@@ -104,7 +104,7 @@ public class ApiSalarySplitSummaryPageDto {
     private BigDecimal hkdAmount;
     private BigDecimal hkdAmount;
 
 
     /**
     /**
-     * 出账币种（原币种）
+     * 出账币种（发放币种）
      */
      */
     private String currency;
     private String currency;
 
 

yd-csf-service/src/main/resources/mappers/SalarySplitMapper.xml

@@ -26,9 +26,9 @@
         fa.fortune_account_date,
         fa.fortune_account_date,
         ss.bill_org,
         ss.bill_org,
         fa.status,
         fa.status,
-        fa.amount,
+        fa.payout_amount as amount,
         fa.hkd_amount,
         fa.hkd_amount,
-        fa.currency,
+        fa.payout_currency as currency,
         DATE_FORMAT(fa.fortune_account_date, '%Y%m') as fortune_account_month,
         DATE_FORMAT(fa.fortune_account_date, '%Y%m') as fortune_account_month,
         fa.business_no
         fa.business_no
         from salary_split ss
         from salary_split ss
@@ -109,9 +109,9 @@
         fa.fortune_account_date,
         fa.fortune_account_date,
         ss.bill_org,
         ss.bill_org,
         fa.status,
         fa.status,
-        fa.amount,
+        fa.payout_amount as amount,
         fa.hkd_amount,
         fa.hkd_amount,
-        fa.currency,
+        fa.payout_currency as currency,
         DATE_FORMAT(fa.fortune_account_date, '%Y%m') as fortune_account_month,
         DATE_FORMAT(fa.fortune_account_date, '%Y%m') as fortune_account_month,
         fa.business_no
         fa.business_no
         from salary_split ss
         from salary_split ss