批量出账;
This commit is contained in:
+6
@@ -49,4 +49,10 @@ public class ReconciliationItemDTO extends BaseVOEntity {
|
||||
private Double taxRate;
|
||||
@ApiModelProperty(value = "费用类别")
|
||||
private String feeType;
|
||||
|
||||
private BigDecimal amount;
|
||||
private Double rate;
|
||||
private String subjectCode;
|
||||
private String subjectName;
|
||||
private String serviceItemsName;
|
||||
}
|
||||
+8
-2
@@ -327,6 +327,12 @@ public class ReconciliationApplicationService {
|
||||
ReconciliationItem reconciliationItem = new ReconciliationItem();
|
||||
BeanUtils.copyProperties(reconciliationItemDTO, reconciliationItem);
|
||||
reconciliationItem.setReconciliationId(reconciliationDO.getReconciliationId());
|
||||
reconciliationItem.setInvoiceValue(reconciliationItemDTO.getAmount());
|
||||
reconciliationItem.setFeeType(reconciliationItemDTO.getServiceItemsName());
|
||||
reconciliationItem.setInvoiceItem(reconciliationItemDTO.getSubjectCode());
|
||||
reconciliationItem.setInvoiceItemName(reconciliationItemDTO.getSubjectName());
|
||||
reconciliationItem.setRemark(reconciliationItemDTO.getRemark());
|
||||
reconciliationItem.setTaxRate(reconciliationItemDTO.getRate());
|
||||
reconciliationItemMapper.insert(reconciliationItem);
|
||||
}
|
||||
}
|
||||
@@ -594,9 +600,9 @@ public class ReconciliationApplicationService {
|
||||
public void pushAccountSettlement(ReconciliationDO reconciliationDO,Long receiptId) {
|
||||
ReconciliationPO bean = reconciliationDomainService.getInfo(reconciliationDO.getReconciliationId());
|
||||
//应收账单:更新已收,少收,未收和结算状态
|
||||
BigDecimal collectionAmountOld = bean.getCollectionAmount();
|
||||
BigDecimal collectionAmountOld = bean.getCollectionAmount() == null ? BigDecimal.ZERO : bean.getCollectionAmount();
|
||||
bean.setCollectionAmount(collectionAmountOld.add(reconciliationDO.getCollectionAmount()));//已收
|
||||
BigDecimal changeAmountOld = bean.getChangeAmount();
|
||||
BigDecimal changeAmountOld = bean.getChangeAmount() == null ? BigDecimal.ZERO : bean.getChangeAmount();
|
||||
bean.setChangeAmount(changeAmountOld.add(reconciliationDO.getChangeAmount()));
|
||||
BigDecimal uncollectedReceivable = bean.getReceivable().subtract(bean.getCollectionAmount()).subtract(bean.getChangeAmount()); //未收=应收-已收-少收
|
||||
bean.setUncollectedReceivable(uncollectedReceivable);
|
||||
|
||||
Reference in New Issue
Block a user