weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

批量出账；

Browse Source
This commit is contained in:
王奎兴
2026-03-09 23:13:56 +08:00
parent 5e28c10342
commit 8483bc3d5e
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/ReconciliationItemDTO.java
+6
View File
@@ -49,4 +49,10 @@ public class ReconciliationItemDTO extends BaseVOEntity {
private Double taxRate; private Double taxRate;
@ApiModelProperty(value = "费用类别") @ApiModelProperty(value = "费用类别")
private String feeType; private String feeType;
private BigDecimal amount;
private Double rate;
private String subjectCode;
private String subjectName;
private String serviceItemsName;
} }
mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java
+8 -2
View File
@@ -327,6 +327,12 @@ public class ReconciliationApplicationService {
ReconciliationItem reconciliationItem = new ReconciliationItem(); ReconciliationItem reconciliationItem = new ReconciliationItem();
BeanUtils.copyProperties(reconciliationItemDTO, reconciliationItem); BeanUtils.copyProperties(reconciliationItemDTO, reconciliationItem);
reconciliationItem.setReconciliationId(reconciliationDO.getReconciliationId()); 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); reconciliationItemMapper.insert(reconciliationItem);
} }
} }
@@ -594,9 +600,9 @@ public class ReconciliationApplicationService {
public void pushAccountSettlement(ReconciliationDO reconciliationDO,Long receiptId) { public void pushAccountSettlement(ReconciliationDO reconciliationDO,Long receiptId) {
ReconciliationPO bean = reconciliationDomainService.getInfo(reconciliationDO.getReconciliationId()); 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()));//已收 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())); bean.setChangeAmount(changeAmountOld.add(reconciliationDO.getChangeAmount()));
BigDecimal uncollectedReceivable = bean.getReceivable().subtract(bean.getCollectionAmount()).subtract(bean.getChangeAmount()); //未收=应收-已收-少收 BigDecimal uncollectedReceivable = bean.getReceivable().subtract(bean.getCollectionAmount()).subtract(bean.getChangeAmount()); //未收=应收-已收-少收
bean.setUncollectedReceivable(uncollectedReceivable); bean.setUncollectedReceivable(uncollectedReceivable);