From 0d61ae880bc60be3343f6e775805c1055dbe710f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Sat, 14 Mar 2026 18:57:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E8=B4=A6=E5=8D=95=E8=B4=B9?= =?UTF-8?q?=E7=94=A8=E5=90=88=E5=B9=B6;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mhd/common/core/domain/dto/nc/Ysitem.java | 4 ++-- .../persistence/BillManageImpl.java | 2 +- .../service/BillManageDomainService.java | 22 ++++++++++++++----- .../repository/po/BillingStatementADDVO.java | 2 +- .../repository/po/BillingStatementPO.java | 1 + .../persistence/ReconciliationImpl.java | 2 +- 6 files changed, 23 insertions(+), 10 deletions(-) diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/Ysitem.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/Ysitem.java index 206e03081..fe7ef23b3 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/Ysitem.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/nc/Ysitem.java @@ -83,8 +83,8 @@ public class Ysitem { @ApiModelProperty( "") private String def75; - @ApiModelProperty( "") - private String def29; +// @ApiModelProperty( "") +// private String def29; //税率id private String taxcodeid; diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/persistence/BillManageImpl.java b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/persistence/BillManageImpl.java index bc6f6ff75..2200f251d 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/persistence/BillManageImpl.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/persistence/BillManageImpl.java @@ -235,7 +235,7 @@ public class BillManageImpl extends ServiceImpl im } } String invoiceItemName = String.join(",", names); - item.setDef29(invoiceItemName); + //item.setDef29(invoiceItemName); item.setScomment("业务部：应收"+appointShipper+invoiceItemName+invoiceNumber); // item.setPk_currtype("CNY"); item.setPk_currtype(settlementCurrencyNcCode); diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/service/BillManageDomainService.java b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/service/BillManageDomainService.java index 486f0f415..c9d5f5356 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/service/BillManageDomainService.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/service/BillManageDomainService.java @@ -212,14 +212,14 @@ public class BillManageDomainService { billOperationLogDO.setOperationType(1); boolean three = billOperationLogDomainService.saveBillOperationLog(billOperationLogDO); //修改流水记录 - billingStatementDTO.getBillingStatementList().forEach(billingStatementADDVO -> { + /*billingStatementDTO.getBillingStatementList().forEach(billingStatementADDVO -> { billingStatementMapper.update(null, new LambdaUpdateWrapper().set(BillingStatement::getTaxAmount,billingStatementADDVO.getTaxAmount()) .set(BillingStatement::getTaxRate,billingStatementADDVO.getTaxRate()) .set(BillingStatement::getTaxFreeFee,billingStatementADDVO.getTaxFreeFee()) .set(BillingStatement::getSettlementCurrency,billingStatementADDVO.getSettlementCurrency()) .eq(BillingStatement::getBillingStatementId,billingStatementADDVO.getBillingStatementId())); - }); + });*/ return flag && flagTwo && three; } @@ -240,8 +240,8 @@ public class BillManageDomainService { List billingStatementPOS = billingStatementDomainService.queryList(billingStatementDO); List billingStatementList = billingStatementDTO.getBillingStatementList(); for (BillingStatementPO billingStatementPO : billingStatementPOS) { - Long billingStatementId = billingStatementPO.getBillingStatementId(); - BillingStatementADDVO billingStatementADDVO = billingStatementList.stream().filter(billingStatementADDVO1 -> billingStatementADDVO1.getBillingStatementId().equals(billingStatementId)).findFirst().orElse(null); + String billingStatementId = billingStatementPO.getBillingStatementId() == null ? "" : String.valueOf(billingStatementPO.getBillingStatementId()); + BillingStatementADDVO billingStatementADDVO = billingStatementList.stream().filter(billingStatementADDVO1 -> billingStatementADDVO1.getBillingStatementId().contains(billingStatementId)).findFirst().orElse(null); billingStatementPO.setTaxAmount(billingStatementADDVO.getTaxAmount()); // 设置税额 billingStatementPO.setTaxRate(billingStatementADDVO.getTaxRate()); // 设置税率 billingStatementPO.setTaxFreeFee(billingStatementADDVO.getTaxFreeFee()); // 设置税免金额 @@ -249,11 +249,23 @@ public class BillManageDomainService { billingStatementPO.setFeeType(billingStatementADDVO.getFeeType()); billingStatementPO.setInvoiceItem(billingStatementADDVO.getInvoiceItem()); billingStatementPO.setInvoiceItemName(billingStatementADDVO.getInvoiceItemName()); + billingStatementPO.setBillingAmount(billingStatementADDVO.getBillingAmount()); + billingStatementPO.setBillingStatementIdStr(billingStatementADDVO.getBillingStatementId()); } + List distinctList = billingStatementPOS.stream() + .filter(Objects::nonNull) + .collect(Collectors.toMap( + BillingStatementPO::getBillingStatementIdStr, // key：去重字段 + po -> po, // value：对象本身 + (existing, replacement) -> existing // 重复时保留第一个 + )) + .values() + .stream().collect(Collectors.toList()); + if(billingStatementPOS==null || billingStatementPOS.size()==0){ throw new ServiceException("所选流水信息未找到"); } - return saveBill(billingStatementPOS,billingStatementDTO.getBillingRemark(),billingStatementDTO.getBillCreateTime(),billingStatementDTO); + return saveBill(distinctList,billingStatementDTO.getBillingRemark(),billingStatementDTO.getBillCreateTime(),billingStatementDTO); } diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/repository/po/BillingStatementADDVO.java b/mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/repository/po/BillingStatementADDVO.java index 786ed0c80..5dc48fe1d 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/repository/po/BillingStatementADDVO.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/repository/po/BillingStatementADDVO.java @@ -23,7 +23,7 @@ public class BillingStatementADDVO extends BaseVOEntity { private static final long serialVersionUID = 1L; @ApiModelProperty("计费流水id") - private Long billingStatementId; + private String billingStatementId; @ApiModelProperty("结算对象") @Excel(name = "结算对象") diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/repository/po/BillingStatementPO.java b/mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/repository/po/BillingStatementPO.java index d14881c82..49b774eb3 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/repository/po/BillingStatementPO.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/repository/po/BillingStatementPO.java @@ -214,5 +214,6 @@ public class BillingStatementPO extends BaseVOEntity{ private String invoiceItemName; @ApiModelProperty(value = "费用类别") private String feeType; + private String billingStatementIdStr; } \ No newline at end of file diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java index cd680ab89..dd45c7304 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java @@ -721,7 +721,7 @@ public class ReconciliationImpl extends ServiceImpl