Commit 1a8e49da by wutong

更新资产负债表测试用例; 修改README

parent 1d8a624c
## 数据中心 ## 数据中心
### 操作wiki
#### data-finance
[finance-balance-sheet货币资金统计项去除不要的公司主体数据步骤](http://code.bailuntec.com/bltdc/dc-java/wikis/data-finance%E4%B9%8Bfinance-balance-sheet)
### 解释说明 ### 解释说明
抛弃臃肿的框架, 轻量级的数据处理中心. 抛弃臃肿的框架, 轻量级的数据处理中心.
因为不同的任务, 执行频率,资源占用情况不一样, 需要能够对任务进行灵活的分配, 任务之间最好不要互相影响, 保持独立性. 因为不同的任务, 执行频率,资源占用情况不一样, 需要能够对任务进行灵活的分配, 任务之间最好不要互相影响, 保持独立性.
......
...@@ -2,7 +2,6 @@ package com.bailuntec.balancesheet.service; ...@@ -2,7 +2,6 @@ package com.bailuntec.balancesheet.service;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.bailuntec.balancesheet.dto.CompanyMainBodyDTO;
import com.bailuntec.balancesheet.dto.CwSystemApiResultDTO; import com.bailuntec.balancesheet.dto.CwSystemApiResultDTO;
import com.bailuntec.balancesheet.dto.PlatformAndSiteDTO; import com.bailuntec.balancesheet.dto.PlatformAndSiteDTO;
import com.bailuntec.balancesheet.entity.DcBalanceSheet; import com.bailuntec.balancesheet.entity.DcBalanceSheet;
...@@ -134,17 +133,17 @@ public class BalanceSheetServiceTest { ...@@ -134,17 +133,17 @@ public class BalanceSheetServiceTest {
@Test @Test
public void getSupplierTransaction(){ public void getSupplierTransaction(){
Date date = DateTimeUtil.stringToDate("2019-02-21", DateTimeUtil.DATE_FORMAT); Date date = DateTimeUtil.stringToDate("2019-04-24", DateTimeUtil.DATE_FORMAT);
balanceSheetService.getSupplierTransaction(date); balanceSheetService.getSupplierTransaction(date);
balanceSheetService.updateSuppliserTransactionOfBalanceSheet(date); balanceSheetService.updateSuppliserTransactionOfBalanceSheet(date);
} }
@Test @Test
public void getSupplierTransactionBatch(){ public void getSupplierTransactionBatch(){
Date startDate = DateTimeUtil.stringToDate("2019-03-28", DateTimeUtil.DATE_FORMAT); Date startDate = DateTimeUtil.stringToDate("2019-04-25", DateTimeUtil.DATE_FORMAT);
Date endDate = DateTimeUtil.stringToDate("2019-04-01", DateTimeUtil.DATE_FORMAT); Date endDate = DateTimeUtil.stringToDate("2019-05-08", DateTimeUtil.DATE_FORMAT);
while(startDate.compareTo(endDate) == -1){ while(startDate.compareTo(endDate) == -1){
// balanceSheetService.getSupplierTransaction(startDate); balanceSheetService.getSupplierTransaction(startDate);
// balanceSheetService.getLogisticsSupplierTransaction(startDate); // balanceSheetService.getLogisticsSupplierTransaction(startDate);
balanceSheetService.updateSuppliserTransactionOfBalanceSheet(startDate); balanceSheetService.updateSuppliserTransactionOfBalanceSheet(startDate);
startDate = DateTimeUtil.addDays(startDate, 1); // 日期增加一天 startDate = DateTimeUtil.addDays(startDate, 1); // 日期增加一天
...@@ -169,8 +168,8 @@ public class BalanceSheetServiceTest { ...@@ -169,8 +168,8 @@ public class BalanceSheetServiceTest {
@Test @Test
public void getInventoryBalance(){ public void getInventoryBalance(){
Date startDate = DateTimeUtil.stringToDate("2019-02-18", DateTimeUtil.DATE_FORMAT); Date startDate = DateTimeUtil.stringToDate("2019-04-25", DateTimeUtil.DATE_FORMAT);
Date endDate = DateTimeUtil.stringToDate("2019-04-26", DateTimeUtil.DATE_FORMAT); Date endDate = DateTimeUtil.stringToDate("2019-05-22", DateTimeUtil.DATE_FORMAT);
while(startDate.compareTo(endDate) == -1){ while(startDate.compareTo(endDate) == -1){
// balanceSheetService.getInventoryBalance(startDate); // balanceSheetService.getInventoryBalance(startDate);
balanceSheetService.updateInventoryBalance(startDate); balanceSheetService.updateInventoryBalance(startDate);
...@@ -180,8 +179,11 @@ public class BalanceSheetServiceTest { ...@@ -180,8 +179,11 @@ public class BalanceSheetServiceTest {
@Test @Test
public void getSemiInventoryBalance(){ public void getSemiInventoryBalance(){
Date startDate = DateTimeUtil.stringToDate("2019-04-25", DateTimeUtil.DATE_FORMAT); /*Date startDate = DateTimeUtil.stringToDate("2014-04-25", DateTimeUtil.DATE_FORMAT);
Date endDate = DateTimeUtil.stringToDate("2019-04-26", DateTimeUtil.DATE_FORMAT); Date endDate = DateTimeUtil.stringToDate("2018-08-06", DateTimeUtil.DATE_FORMAT);
balanceSheetService.getSemiInventoryBalance(startDate,endDate);*/
Date startDate = DateTimeUtil.stringToDate("2019-04-26", DateTimeUtil.DATE_FORMAT);
Date endDate = DateTimeUtil.stringToDate("2019-05-22", DateTimeUtil.DATE_FORMAT);
while(startDate.compareTo(endDate) == -1){ while(startDate.compareTo(endDate) == -1){
balanceSheetService.getSemiInventoryBalance(startDate, DateTimeUtil.addDays(startDate, 1)); balanceSheetService.getSemiInventoryBalance(startDate, DateTimeUtil.addDays(startDate, 1));
startDate = DateTimeUtil.addDays(startDate, 1); // 日期增加一天 startDate = DateTimeUtil.addDays(startDate, 1); // 日期增加一天
...@@ -264,5 +266,34 @@ public class BalanceSheetServiceTest { ...@@ -264,5 +266,34 @@ public class BalanceSheetServiceTest {
balanceSheetService.getSellerAccount(); balanceSheetService.getSellerAccount();
} }
@Test
public void updateFund(){
Date startDate = DateTimeUtil.stringToDate("2019-05-01", DateTimeUtil.DATE_FORMAT);
Date endDate = DateTimeUtil.stringToDate("2019-06-11", DateTimeUtil.DATE_FORMAT);
while(startDate.compareTo(endDate) == -1){
DcBalanceSheet dcBalanceSheet = new DcBalanceSheet();
// 银行账户余额汇总
BigDecimal bankAccountBalanceSum = dcBankAccountBalanceMapper.getBalanceSum(startDate);
if(bankAccountBalanceSum == null) bankAccountBalanceSum = BigDecimal.ZERO;
dcBalanceSheet.setBankAccountBalance(bankAccountBalanceSum);
// 提现在途金额汇总
BigDecimal withdrawOnWaySum = dcWithdrawOnWayMapper.getWithdrawOnWaySum(startDate);
if(withdrawOnWaySum == null) withdrawOnWaySum = BigDecimal.ZERO;
dcBalanceSheet.setWithdrawAmount(withdrawOnWaySum);
// 第三方平台余额
BigDecimal platformBalanceSum = dcPlatformBalanceMapper.getPlatformBalanceSum(startDate);
if(platformBalanceSum == null) platformBalanceSum = BigDecimal.ZERO;
dcBalanceSheet.setPlatformBalance(platformBalanceSum);
// 货币资金
dcBalanceSheet.setMonetaryFund(bankAccountBalanceSum.add(withdrawOnWaySum).add(platformBalanceSum)); // 货币资金 = 银行余额 + 提现在途 + 第三方平台余额
dcBalanceSheet.setCompanyValue(0);
dcBalanceSheet.setStatisticalTime(startDate);
// 更新资产负债表统计字段
dcBalanceSheetMapper.updateByCompanyAndDaySelective(dcBalanceSheet);
startDate = DateTimeUtil.addDays(startDate, 1); // 日期增加一天
}
}
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment