3.0.5
This commit is contained in:
+3
@@ -312,6 +312,9 @@ public class BusinessDocumentApplicationService {
|
|||||||
billDetail.setInvoiceItem(billingStatement.getFirstSubjectCode());
|
billDetail.setInvoiceItem(billingStatement.getFirstSubjectCode());
|
||||||
billDetail.setInvoiceItemName(billingStatement.getFirstSubjectName());
|
billDetail.setInvoiceItemName(billingStatement.getFirstSubjectName());
|
||||||
billDetail.setSettlementCurrency(billingStatement.getSettlementCurrency());
|
billDetail.setSettlementCurrency(billingStatement.getSettlementCurrency());
|
||||||
|
billDetail.setTaxAmount(billingStatement.getTaxAmount());
|
||||||
|
billDetail.setTaxFreeFee(billingStatement.getTaxFreeFee());
|
||||||
|
billDetail.setTaxRate(billingStatement.getTaxRate());
|
||||||
billDetailService.save(billDetail);
|
billDetailService.save(billDetail);
|
||||||
BigDecimal billAmount = billManage.getBillAmount();
|
BigDecimal billAmount = billManage.getBillAmount();
|
||||||
BigDecimal amount = billAmount.add(billDetail.getBillingAmount());
|
BigDecimal amount = billAmount.add(billDetail.getBillingAmount());
|
||||||
|
|||||||
+2
-2
@@ -675,8 +675,8 @@ public class BillingStatementDomainService {
|
|||||||
billingStatementDO.setSettlementCustomersCode(billManagePO.getSettlementCustomersCode());
|
billingStatementDO.setSettlementCustomersCode(billManagePO.getSettlementCustomersCode());
|
||||||
billingStatementDO.setBelongModuleCode(billManagePO.getBelongModuleCode());
|
billingStatementDO.setBelongModuleCode(billManagePO.getBelongModuleCode());
|
||||||
billingStatementDO.setAccountExpenseType(billManagePO.getBillType());
|
billingStatementDO.setAccountExpenseType(billManagePO.getBillType());
|
||||||
billingStatementDO.setCycleBeginTime(billManagePO.getCycleBeginTime());
|
// billingStatementDO.setCycleBeginTime(billManagePO.getCycleBeginTime());
|
||||||
billingStatementDO.setCycleEndTime(billManagePO.getCycleEndTime());
|
// billingStatementDO.setCycleEndTime(billManagePO.getCycleEndTime());
|
||||||
billingStatementDO.setBillingState(2);
|
billingStatementDO.setBillingState(2);
|
||||||
startPage();
|
startPage();
|
||||||
return billingStatementService.queryList(billingStatementDO);
|
return billingStatementService.queryList(billingStatementDO);
|
||||||
|
|||||||
Reference in New Issue
Block a user