From caf5adfc3e7ebe0396f77f91167f80686844b20f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Wed, 18 Mar 2026 21:11:49 +0800 Subject: [PATCH] =?UTF-8?q?bms2=E7=9B=B8=E5=85=B3=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/basic/lease/LeaseMapper.xml | 3 +++ .../service/UserApplicationService.java | 2 +- .../PaymentWalletApplicationService.java | 14 ++++++------- .../persistence/BillManageImpl.java | 18 +++++++++++++++-- .../entity/BusinessDocument.java | 2 +- .../repository/po/BusinessDocumentPO.java | 2 +- .../repository/todo/BusinessDocumentDO.java | 2 +- .../businessDocument/BusinessDocumentDTO.java | 2 +- .../resources/mapper/BillManageMapper.xml | 2 +- .../resources/mapper/BmsInvoiceListMapper.xml | 2 +- .../persistence/ReconciliationImpl.java | 20 ++++++++++++++++++- 11 files changed, 52 insertions(+), 17 deletions(-) diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/lease/LeaseMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/lease/LeaseMapper.xml index d74661b96..765b2306e 100644 --- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/lease/LeaseMapper.xml +++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/lease/LeaseMapper.xml @@ -75,6 +75,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + and a.id = #{id} + and a.organization_id = #{organizationId} diff --git a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java index 69de86695..a454e2160 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java +++ b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java @@ -790,7 +790,7 @@ public class UserApplicationService { userDO.setUserAuthStatus(1); //删除标记：0-无状态，1-正常，2-已删除 userDO.setDelFlag(1); - userDO.setBusinessType(1); + userDO.setBusinessType(4); if (ObjectUtil.isNull(userDO.getUserAccount()) && ObjectUtil.isNotNull(userDO.getUserPhone())) { userDO.setUserAccount(userDO.getUserPhone()); } diff --git a/mhd_bms/src/main/java/com/mhd/bms/application/server/paymentWallet/PaymentWalletApplicationService.java b/mhd_bms/src/main/java/com/mhd/bms/application/server/paymentWallet/PaymentWalletApplicationService.java index 94651d5c6..3f4014da3 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/application/server/paymentWallet/PaymentWalletApplicationService.java +++ b/mhd_bms/src/main/java/com/mhd/bms/application/server/paymentWallet/PaymentWalletApplicationService.java @@ -62,15 +62,15 @@ public class PaymentWalletApplicationService { throw new DigitalLogisticsException(UserError.TIMEOUT); } //根据支付方式编码查询支付方式 - if(!StringUtils.isNotEmpty(paymentWalletDO.getPaymentMethodCode())){ + /*if(!StringUtils.isNotEmpty(paymentWalletDO.getPaymentMethodCode())){ throw new ServiceException("支付方式编码不能为空"); - } - PaymentManage paymentManage = paymentManageDomainService.selectByPaymentCode(paymentWalletDO.getPaymentMethodCode()); + }*/ + /*PaymentManage paymentManage = paymentManageDomainService.selectByPaymentCode(paymentWalletDO.getPaymentMethodCode()); if(null == paymentManage){ throw new ServiceException("支付方式信息未找到"); - } - paymentWalletDO.setPaymentMethod(paymentManage.getPaymentMethod()); - paymentWalletDO.setPaymentManageId(paymentManage.getPaymentManageId()); + }*/ + //paymentWalletDO.setPaymentMethod(paymentManage.getPaymentMethod()); + //paymentWalletDO.setPaymentManageId(paymentManage.getPaymentManageId()); paymentWalletDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId()); paymentWalletDO.setOrganizationId(loginUser.getUserPo().getOrganizationId()); paymentWalletDO.setOrganizationId(loginUser.getUserPo().getOrganizationId()); @@ -133,4 +133,4 @@ public class PaymentWalletApplicationService { } return paymentWalletDomainService.getInfo(paymentWalletDTO.getPaymentWalletId()); } -} +} \ No newline at end of file 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 b3d98f174..7a21f6566 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 @@ -468,6 +468,12 @@ public class BillManageImpl extends ServiceImpl im .map(BmsMakeOutInvoiceItem::getInvoiceValue) .filter(java.util.Objects::nonNull) .reduce(BigDecimal.ZERO, BigDecimal::add); + + // 将 feeType 用、拼接起来 + String feeTypes = bmsMakeOutInvoiceItems.stream() + .map(BmsMakeOutInvoiceItem::getFeeType) + .filter(java.util.Objects::nonNull) + .collect(java.util.stream.Collectors.joining("、")); String salesmanId = reconciliation.getSalesmanId(); String customerUserDept = billManageMapper.getCustomerUserDept(salesmanId); String deptValue = billManageMapper.getDeptValue(customerUserDept); @@ -499,9 +505,17 @@ public class BillManageImpl extends ServiceImpl im item.setObjtype("0"); item.setDirection("1"); if (deptName != null && !deptName.isEmpty()) { - item.setScomment(deptName+"："+appointShipper+"物流费"); + if (feeTypes != null && !feeTypes.isEmpty()) { + item.setScomment(deptName+"："+appointShipper+feeTypes); + } else { + item.setScomment(deptName+"："+appointShipper+feeTypes); + } } else { - item.setScomment("业务部："+appointShipper+"物流费"); + if (feeTypes != null && !feeTypes.isEmpty()) { + item.setScomment("业务部："+appointShipper+feeTypes); + } else { + item.setScomment("业务部："+appointShipper+feeTypes); + } } item.setPk_currtype(settlementCurrencyNcCode); item.setMoney_cr(String.valueOf(totalInvoiceValue)); diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/businessDocument/entity/BusinessDocument.java b/mhd_bms/src/main/java/com/mhd/bms/domain/businessDocument/entity/BusinessDocument.java index b767c2440..5eb6a0dbf 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/businessDocument/entity/BusinessDocument.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/businessDocument/entity/BusinessDocument.java @@ -177,7 +177,7 @@ public class BusinessDocument extends BaseVOEntity{ @ApiModelProperty("业务员名称") private String salesmanName; @ApiModelProperty("税率") - private String taxRate; + private Double taxRate; @ApiModelProperty("收款帐户") private String paymentAccountId; @ApiModelProperty("收款帐户名称") diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/businessDocument/repository/po/BusinessDocumentPO.java b/mhd_bms/src/main/java/com/mhd/bms/domain/businessDocument/repository/po/BusinessDocumentPO.java index 3e2389f4f..6b27d16ee 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/businessDocument/repository/po/BusinessDocumentPO.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/businessDocument/repository/po/BusinessDocumentPO.java @@ -182,7 +182,7 @@ public class BusinessDocumentPO extends BaseVOEntity{ @ApiModelProperty("业务员名称") private String salesmanName; @ApiModelProperty("税率") - private String taxRate; + private Double taxRate; @ApiModelProperty("收款帐户") private String paymentAccountId; @ApiModelProperty("收款帐户名称") diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/businessDocument/repository/todo/BusinessDocumentDO.java b/mhd_bms/src/main/java/com/mhd/bms/domain/businessDocument/repository/todo/BusinessDocumentDO.java index 93dbe29f4..a8cffd45b 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/businessDocument/repository/todo/BusinessDocumentDO.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/businessDocument/repository/todo/BusinessDocumentDO.java @@ -202,7 +202,7 @@ public class BusinessDocumentDO extends BaseVOEntity{ @ApiModelProperty("业务员名称") private String salesmanName; @ApiModelProperty("税率") - private String taxRate; + private Double taxRate; @ApiModelProperty("收款帐户") private String paymentAccountId; @ApiModelProperty("收款帐户名称") diff --git a/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/businessDocument/BusinessDocumentDTO.java b/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/businessDocument/BusinessDocumentDTO.java index 16d62d006..36a188b5c 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/businessDocument/BusinessDocumentDTO.java +++ b/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/businessDocument/BusinessDocumentDTO.java @@ -208,7 +208,7 @@ public class BusinessDocumentDTO extends BaseVOEntity{ @ApiModelProperty("业务员名称") private String salesmanName; @ApiModelProperty("税率") - private String taxRate; + private Double taxRate; @ApiModelProperty("收款帐户") private String paymentAccountId; @ApiModelProperty("收款帐户名称") diff --git a/mhd_bms/src/main/resources/mapper/BillManageMapper.xml b/mhd_bms/src/main/resources/mapper/BillManageMapper.xml index 6e58ffd42..3431aa3d1 100644 --- a/mhd_bms/src/main/resources/mapper/BillManageMapper.xml +++ b/mhd_bms/src/main/resources/mapper/BillManageMapper.xml @@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND a.reconciliation_status = #{billManageDO.reconciliationStatus} - AND a.apply_number = #{billManageDO.applyNumber} + AND a.apply_number like concat('%', #{billManageDO.applyNumber}, '%') AND a.settlement_currency = #{billManageDO.settlementCurrency} diff --git a/mhd_bms/src/main/resources/mapper/BmsInvoiceListMapper.xml b/mhd_bms/src/main/resources/mapper/BmsInvoiceListMapper.xml index 178bbda02..9707ed13c 100644 --- a/mhd_bms/src/main/resources/mapper/BmsInvoiceListMapper.xml +++ b/mhd_bms/src/main/resources/mapper/BmsInvoiceListMapper.xml @@ -35,7 +35,7 @@ and a.id = #{bmsInvoiceListQueryDTO.id} - and b.bill_number = #{bmsInvoiceListQueryDTO.billNumber} + and b.bill_number like concat('%', #{bmsInvoiceListQueryDTO.billNumber}, '%') and instr(a.id ,#{bmsInvoiceListQueryDTO.id}) > 0 and instr(a.invoice_state ,#{bmsInvoiceListQueryDTO.invoiceState}) > 0 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 7cac4240d..ee37fc9e6 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 @@ -1151,6 +1151,12 @@ public class ReconciliationImpl extends ServiceImpl