资产负债表数据回调接口调整、第三方平台余额取数

data-finance/finance-balance-sheet/src/main/java/com/bailuntec/balancesheet/controller/BalanceSheetController.java

@@ -85,10 +85,10 @@ public class BalanceSheetController {
     }
 
     @GetMapping("/updateSheetLogisticsSupplier")
-    public String updateSheetLogisticsSupplier(@RequestParam(value = "date", required = true) String date, BigDecimal logisticsPayableSum, BigDecimal accountsReceivableImport, BigDecimal otherAccountsReceivableImport, BigDecimal otherAccountsPayableImport, BigDecimal fixedAssetsImport, BigDecimal ncaDeferredTaxAssetsImport) {
+    public String updateSheetLogisticsSupplier(@RequestParam(value = "date", required = true) String date, BigDecimal logisticsPayableSum, BigDecimal accountsReceivableUpdate, BigDecimal accountsReceivableImport, BigDecimal otherAccountsReceivableImport, BigDecimal otherAccountsPayableImport, BigDecimal fixedAssetsImport, BigDecimal ncaDeferredTaxAssetsImport) {
         JSONObject result = new JSONObject();
         try{
-            balanceSheetService.updateSheetSuppliserTransaction(date, logisticsPayableSum, accountsReceivableImport, otherAccountsReceivableImport, otherAccountsPayableImport, fixedAssetsImport, ncaDeferredTaxAssetsImport);
+            balanceSheetService.updateSheetSuppliserTransaction(date, logisticsPayableSum, accountsReceivableUpdate, accountsReceivableImport, otherAccountsReceivableImport, otherAccountsPayableImport, fixedAssetsImport, ncaDeferredTaxAssetsImport);
             result.put("success", true);
             result.put("message", "success");
         } catch (Exception e){

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

@@ -143,6 +143,15 @@ public interface DcBalanceSheetMapper {
     @Select("select sum((amount - ifnull(had_pay, 0) + ifnull(compensate, 0)) * to_rmb_rate) from dc_daily_fee where recoed_time = #{lastDay} and company_value in (53,3,5,60,66,59,50,8,1,61,2,70)")
     BigDecimal getAmountBorrowed(@Param("lastDay") Date lastDay);
 
+    @Select("select accounts_receivable_import from dc_balance_sheet where statistical_time = #{lastDay} ")
+    BigDecimal getAccountsReceivableImport(@Param("lastDay") Date lastDay);
+
+    @Select("select accounts_receivable_update from dc_balance_sheet where statistical_time = #{lastDay} ")
+    BigDecimal getAccountsReceivableUpdate(@Param("lastDay") Date lastDay);
+
+    @Select("select platform_balance from dc_balance_sheet where statistical_time <= #{lastDay} and platform_balance > 0 order by statistical_time desc limit 1")
+    BigDecimal getPlatformBalanceSum(@Param("lastDay") Date lastDay);
+
     int updateByPrimaryKeySelective(DcBalanceSheet record);
 
     @Update({

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

@@ -124,7 +124,7 @@ public class BalanceSheetService {
         getShortBorrowBalance(lastDay);
 
         // 获取PayPal账户余额
-        getPayPalBalance(lastDay);
+    //    getPayPalBalance(lastDay);
 
         // 其他应收款、其他应付款
         getOtherCost(twoDaysAgo, lastDay, today);
@@ -604,7 +604,7 @@ public class BalanceSheetService {
         dcBalanceSheetMapper.updateByCompanyAndDaySelective(dcBalanceSheet);
     }
 
-    public void updateSheetSuppliserTransaction(String dateStr, BigDecimal logisticsPayableSum, BigDecimal accountsReceivableImport, BigDecimal otherAccountsReceivableImport, BigDecimal otherAccountsPayableImport, BigDecimal fixedAssetsImport, BigDecimal ncaDeferredTaxAssetsImport) throws ParseException {
+    public void updateSheetSuppliserTransaction(String dateStr, BigDecimal logisticsPayableSum, BigDecimal accountsReceivableUpdate,BigDecimal accountsReceivableImport, BigDecimal otherAccountsReceivableImport, BigDecimal otherAccountsPayableImport, BigDecimal fixedAssetsImport, BigDecimal ncaDeferredTaxAssetsImport) throws ParseException {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         Date date = simpleDateFormat.parse(dateStr);
         DcBalanceSheet dcBalanceSheet = new DcBalanceSheet();//物流供应商、成品供应商、半成品供应商
@@ -624,11 +624,21 @@ public class BalanceSheetService {
             dcBalanceSheet.setAccountsPayable(accountsPayableSum);
         }
 
+        if(accountsReceivableUpdate != null) {
+            // 应收款项--计算更改
+            BigDecimal accountsReceivableImportSum = dcBalanceSheetMapper.getAccountsReceivableImport(date);
+            if(accountsReceivableImportSum == null) accountsReceivableImportSum = BigDecimal.ZERO;
+            dcBalanceSheet.setAccountsReceivable(accountsReceivableUpdate.add(accountsReceivableImportSum));
+        }
+
         if(accountsReceivableImport != null) {
             // 应收款项
-            BigDecimal accountsReceivableSum = dcSupplierTransactionMapper.getAccountsReceivable(date);
-            if(accountsReceivableSum == null) accountsReceivableSum = BigDecimal.ZERO;
-            dcBalanceSheet.setAccountsReceivable(accountsReceivableSum.add(accountsReceivableImport));
+            BigDecimal accountsReceivableUpdateSum = dcBalanceSheetMapper.getAccountsReceivableUpdate(date);
+            if(accountsReceivableUpdateSum == null) {
+                accountsReceivableUpdateSum = dcSupplierTransactionMapper.getAccountsReceivable(date);
+                if(accountsReceivableUpdateSum == null) accountsReceivableUpdateSum = BigDecimal.ZERO;
+            }
+            dcBalanceSheet.setAccountsReceivable(accountsReceivableUpdateSum.add(accountsReceivableImport));
         }
 
         if(otherAccountsReceivableImport != null) {
@@ -768,7 +778,9 @@ public class BalanceSheetService {
         dcBalanceSheet.setWithdrawAmount(withdrawOnWaySum);
         // 第三方平台余额
         BigDecimal platformBalanceSum = dcPlatformBalanceMapper.getPlatformBalanceSum(date);
-        if(platformBalanceSum == null) platformBalanceSum = BigDecimal.ZERO;
+        if(platformBalanceSum == null) {
+            platformBalanceSum = dcBalanceSheetMapper.getPlatformBalanceSum(date);
+        }
         dcBalanceSheet.setPlatformBalance(platformBalanceSum);
         // 货币资金
         dcBalanceSheet.setMonetaryFund(bankAccountBalanceSum.add(withdrawOnWaySum).add(platformBalanceSum)); // 货币资金 = 银行余额 + 提现在途 + 第三方平台余额