From 633371fbb297e6bbec7b9598d1e8f14eaf92d3b9 Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期五, 07 三月 2025 12:08:29 +0800
Subject: [PATCH] feat: 更新银行查单，账单名称改为支付类型
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/BankOutController.java | 11 ++++++-----
ruoyi-common/src/main/java/com/ruoyi/common/enums/BillTypeEnum.java | 32 ++++++++++++++++++++++++++++++++
2 files changed, 38 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/BankOutController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/BankOutController.java
index fd0274e..56ef4cd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/BankOutController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/BankOutController.java
@@ -1,9 +1,11 @@
package com.ruoyi.web.controller.api;
+import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.TypeReference;
import com.ruoyi.common.constant.AmountConstant;
+import com.ruoyi.common.enums.BillTypeEnum;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.dto.TBillDto;
import com.ruoyi.system.model.TOrderBill;
@@ -133,10 +135,11 @@
List<TOrderBill> orderBills = orderBillService.getByOrderNo(orderid);
List<TBillDto> bills = orderBills.stream().map(ob
-> tBillService.getDetailByBillId(ob.getBillId())).collect(Collectors.toList());
-
+ respBill.setBillNo(orderid);
+ List<String> types = bills.stream().map(bill -> BillTypeEnum.getByCode(Integer.parseInt(bill.getBillType())).getName()).distinct().collect(Collectors.toList());
// 封装详细账单信息
- respBill.setBillName(order.getUserName());
- respBill.setFeeAmt(BigDecimal.valueOf(order.getAmount()).divide(AmountConstant.b100,2, RoundingMode.HALF_DOWN).toPlainString());
+ respBill.setBillName("缴费："+CollectionUtil.join(types,","));
+ respBill.setOweAmt(BigDecimal.valueOf(order.getAmount()).divide(AmountConstant.b100,2, RoundingMode.HALF_DOWN).toPlainString());
respBills.add(respBill);
respInfo.setCustName(order.getUserName());
respInfo.setCustAddress("");
@@ -151,9 +154,7 @@
respInfo.setAmtRule(amtRule);
/*QueryBillResponse.Message.Info.Bill.UnitDetail unitDetail = respBill.new UnitDetail(
"unitName", "6.66", "1");*/
- BigDecimal outstandAmount = bills.stream().map(TBillDto::getOutstandingMoney).reduce(BigDecimal::add).get();
//欠费金额
- respBill.setOweAmt(outstandAmount.setScale(2,RoundingMode.HALF_DOWN).toPlainString());
respBill.setFeeAmt("0.00");
//
// QueryBillResponse.Message.Info.Bill.DescDetail descDtail1 = respBill.new DescDetail(
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BillTypeEnum.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/BillTypeEnum.java
new file mode 100644
index 0000000..3145e60
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/BillTypeEnum.java
@@ -0,0 +1,32 @@
+package com.ruoyi.common.enums;
+
+import lombok.Getter;
+
+@Getter
+public enum BillTypeEnum {
+
+ Zujin(1,"租金"),
+ Yajin(2,"押金"),
+ ShenghuoFee(3,"生活费用"),
+ FangwuYanshou(4,"房屋验收"),
+ ;
+
+ private Integer code;
+
+ private String name;
+ BillTypeEnum(Integer code,String name){
+ this.code = code;
+ this.name = name;
+ }
+
+ public static BillTypeEnum getByCode(Integer code){
+ BillTypeEnum[] values = BillTypeEnum.values();
+ for (BillTypeEnum value : values) {
+ if (value.code==code){
+ return value;
+ }
+ }
+ return null;
+ }
+
+}
--
Gitblit v1.7.1