From 7ed12c94050ddf108d149bfb9e468c42adfa5926 Mon Sep 17 00:00:00 2001 From: rcx <3084692334@qq.com> Date: Wed, 19 Aug 2026 11:02:52 +0800 Subject: [PATCH] =?UTF-8?q?feat(bms):=E5=BA=94=E6=94=B6=E8=B4=A6=E5=8D=95?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B4=B9=E7=94=A8=E5=B8=81=E7=A7=8D=E7=A9=BA?= =?UTF-8?q?=E5=80=BC=E5=85=9C=E5=BA=95CNY=E3=80=81=E8=B4=B9=E7=94=A8?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=A2=9E=E5=8A=A0=E6=B5=81=E6=B0=B4=E5=A4=87?= =?UTF-8?q?=E6=B3=A8=E4=BF=9D=E5=AD=98=E4=B8=8E=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/billManage/BillManageApplicationService.java | 1 + .../billingStatement/BillingStatementApplicationService.java | 4 ++++ .../mhd/bms/domain/billManage/repository/po/BillDetailPO.java | 2 ++ .../com/mhd/bms/interfaces/dto/billManage/BillDetailDTO.java | 2 ++ mhd_bms/src/main/resources/mapper/BillDetailMapper.xml | 4 +++- 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/mhd_bms/src/main/java/com/mhd/bms/application/server/billManage/BillManageApplicationService.java b/mhd_bms/src/main/java/com/mhd/bms/application/server/billManage/BillManageApplicationService.java index f528cbb8c..c5a4a3bdf 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/application/server/billManage/BillManageApplicationService.java +++ b/mhd_bms/src/main/java/com/mhd/bms/application/server/billManage/BillManageApplicationService.java @@ -815,6 +815,7 @@ public class BillManageApplicationService { billingStatementDO.setUpdateBy(loginUser.getUserid()); billingStatementDO.setUpdateByName(loginUser.getUserPo().getUserName()); billingStatementDO.setUpdateTime(new Date()); + billingStatementDO.setBillingRemark(detailDTO.getBillingRemark()); billingStatementApplicationService.update(billingStatementDO); } Boolean flag = billDetailDomainService.update(billDetailDO); diff --git a/mhd_bms/src/main/java/com/mhd/bms/application/server/billingStatement/BillingStatementApplicationService.java b/mhd_bms/src/main/java/com/mhd/bms/application/server/billingStatement/BillingStatementApplicationService.java index 054b94461..a79c02dc4 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/application/server/billingStatement/BillingStatementApplicationService.java +++ b/mhd_bms/src/main/java/com/mhd/bms/application/server/billingStatement/BillingStatementApplicationService.java @@ -593,6 +593,10 @@ public class BillingStatementApplicationService { BillingStatementPO billingStatementPO = new BillingStatementPO(); //处理数据 handleDate(billingStatementDO); + // 币种为空时兜底CNY（编码与前端默认值一致；NC推送时该值原样作pk_currtype。须在copyProperties之前赋值，PO才能带上） + if (StringUtils.isEmpty(billingStatementDO.getSettlementCurrency())) { + billingStatementDO.setSettlementCurrency("CNY"); + } BeanUtils.copyProperties(billingStatementDO,billingStatementPO); billingStatementPO.setBillingTotalAmount(billingStatementDO.getBillingAmount()); billingStatementPO.setDataSources(2); diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/po/BillDetailPO.java b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/po/BillDetailPO.java index acd96caf2..372a1e9bf 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/po/BillDetailPO.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/po/BillDetailPO.java @@ -140,5 +140,7 @@ public class BillDetailPO extends BaseVOEntity{ private BigDecimal billingNum; @ApiModelProperty(value = "计费单价") private BigDecimal billingUnitPrice; + @ApiModelProperty(value = "流水备注") + private String billingRemark; } \ No newline at end of file diff --git a/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billManage/BillDetailDTO.java b/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billManage/BillDetailDTO.java index acb35ff99..e14a65781 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billManage/BillDetailDTO.java +++ b/mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billManage/BillDetailDTO.java @@ -145,4 +145,6 @@ public class BillDetailDTO extends BaseVOEntity{ private BigDecimal billingNum; @ApiModelProperty(value = "计费单价") private BigDecimal billingUnitPrice; + @ApiModelProperty(value = "流水备注") + private String billingRemark; } \ No newline at end of file diff --git a/mhd_bms/src/main/resources/mapper/BillDetailMapper.xml b/mhd_bms/src/main/resources/mapper/BillDetailMapper.xml index 0fc27b019..e8a730b62 100644 --- a/mhd_bms/src/main/resources/mapper/BillDetailMapper.xml +++ b/mhd_bms/src/main/resources/mapper/BillDetailMapper.xml @@ -18,7 +18,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bs.first_subject_code, bs.first_subject_name, bs.second_subject_code, - bs.second_subject_name + bs.second_subject_name, + bs.billing_remark + FROM bill_detail bd LEFT JOIN billing_statement bs ON bd.billing_statement_id = bs.billing_statement_id