java/xizang.git

			@@ -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(

New file
			@@ -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;
			}

			}

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/BankOutController.java	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-common/src/main/java/com/ruoyi/common/enums/BillTypeEnum.java	32 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史