feat(bms):应收账单添加费用币种空值兜底CNY、费用明细增加流水备注保存与显示

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);

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);

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;
 
 }

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;
 }

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