From ca8c83c771495363c46b6cfe56a599dfbdbe70d2 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 07 三月 2025 14:23:34 +0800
Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/BankOutController.java | 11 ++++++-----
1 files changed, 6 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(
--
Gitblit v1.7.1