数据中心--资产负债表应收账款增加一个子项借支款项

data-base/base-sync-finance-fee/src/main/java/com/bailuntec/job/DailyFeeJob.java

@@ -13,6 +13,6 @@ public class DailyFeeJob extends PointJob {
     @Override
     public void executeJob(ShardingContext shardingContext, JobPointLog jobPointLog) {
         DcBaseFinanceFeeMapper dcBaseFinanceFeeMapper = SessionUtil.getSession().getMapper(DcBaseFinanceFeeMapper.class);
-        dcBaseFinanceFeeMapper.insertDailyFee(LocalDate.now());
+        dcBaseFinanceFeeMapper.insertDailyFee(LocalDate.now().minusDays(1L));
     }
 }

data-finance/finance-balance-sheet/src/main/java/com/bailuntec/balancesheet/entity/DcBalanceSheet.java

@@ -22,6 +22,8 @@ public class DcBalanceSheet {
 
     private BigDecimal accountsReceivable;
 
+    private BigDecimal amountBorrowed;
+
     private BigDecimal prepayment;
 
     private BigDecimal logisticsPrepayment;

data-finance/finance-balance-sheet/src/main/java/com/bailuntec/balancesheet/mapper/DcBalanceSheetMapper.java

@@ -140,6 +140,9 @@ public interface DcBalanceSheetMapper {
     @Select({"select finished_accounts_payable from dc_balance_sheet where statistical_time = #{date}"})
     BigDecimal getLogisticsAccountsPayableSum(@Param("date") Date date);
 
+    @Select("select sum((amount - had_pay + ifnull(compensate, 0)) * to_rmb_rate) from dc_daily_fee where recoed_time = #{lastDay}")
+    BigDecimal getAmountBorrowed(@Param("lastDay") Date lastDay);
+
     int updateByPrimaryKeySelective(DcBalanceSheet record);
 
     @Update({

data-finance/finance-balance-sheet/src/main/java/com/bailuntec/balancesheet/service/BalanceSheetService.java

@@ -577,9 +577,14 @@ public class BalanceSheetService {
         // 应付款项
         BigDecimal accountsPayableSum = finishedAccountsPayableSum.add(semiAccountsPayableSum).add(logisticsAccountsPayableSum);
         dcBalanceSheet.setAccountsPayable(accountsPayableSum);
-        // 应收款项
+        // 借支单未还金额
+        BigDecimal amountBorrowedSum = dcBalanceSheetMapper.getAmountBorrowed(date);
+        if(amountBorrowedSum == null) amountBorrowedSum = BigDecimal.ZERO;
+        dcBalanceSheet.setAmountBorrowed(amountBorrowedSum);
+        // 应收款项(加借支单未还金额)
         BigDecimal accountsReceivableSum = dcSupplierTransactionMapper.getAccountsReceivable(date);
-        dcBalanceSheet.setAccountsReceivable(accountsReceivableSum);
+        if(accountsReceivableSum == null) accountsReceivableSum = BigDecimal.ZERO;
+        dcBalanceSheet.setAccountsReceivable(accountsReceivableSum.add(amountBorrowedSum));
         // 成品供应商预付款项
         BigDecimal finishedPrepaymentSum = dcSupplierTransactionMapper.getFinishedPrepaymentSum(date);
         if(finishedPrepaymentSum == null) finishedPrepaymentSum = BigDecimal.ZERO;

data-finance/finance-balance-sheet/src/main/resources/mapper/DcBalanceSheetMapper.xml

@@ -278,6 +278,9 @@
       <if test="accountsReceivable != null">
         accounts_receivable = #{accountsReceivable,jdbcType=DECIMAL},
       </if>
+      <if test="amountBorrowed != null">
+        amount_borrowed = #{amountBorrowed,jdbcType=DECIMAL},
+      </if>
       <if test="prepayment != null">
         prepayment = #{prepayment,jdbcType=DECIMAL},
       </if>