java/mx_charging_pile.git

			@@ -79,8 +79,7 @@
			}
			}
			ChargingBillVO chargingBillVO = new ChargingBillVO();
			List<TChargingOrder> exports = new ArrayList<>();

			List<TChargingOrder> tChargingOrders1 = new ArrayList<>();
			String startTime1 = null;
			String startTime2 = null;
			if (StringUtils.hasLength(dto.getStartTime())){
			@@ -300,7 +299,6 @@
			}

			}
			exports.addAll(tChargingOrders);
			// 将chargingSecond 这是以秒为单位存放的总秒数将其转化为xx小时xx分钟xx秒
			int hours = chargingSecond / 3600;
			int minutes = (chargingSecond % 3600) / 60;
			@@ -321,7 +319,7 @@
			chargingBillListVO.setSharingAmount(sharingAmount == null?BigDecimal.ZERO:sharingAmount);
			chargingBillListVO.setChargingCapacity(chargingCapacity == null?BigDecimal.ZERO:chargingCapacity);
			chargingBillListVO.setBillMoney(paymentAmount.subtract(refundAmount==null?BigDecimal.ZERO:refundAmount)
			.subtract(commissionAmount).subtract(sharingAmount).setScale(2, BigDecimal.ROUND_DOWN));
			.subtract(commissionAmount.setScale(2,BigDecimal.ROUND_DOWN)).subtract(sharingAmount).setScale(2, BigDecimal.ROUND_DOWN));
			switch (chargingBillListVO.getType()){
			case 1:
			chargingBillListVO.setSiteName("全站");
			@@ -371,6 +369,7 @@
			eq.eq("site_id", chargingBillListVO.getSiteId());
			}
			List<TChargingOrder> tChargingOrders = chargingOrderList.selectList(eq);
			tChargingOrders1.addAll(tChargingOrders);
			orderCount+=tChargingOrders.size();
			chargingBillVO.setCategory("");
			chargingBillVO.setExportList(tChargingOrders);
			@@ -432,7 +431,7 @@
			chargingBillVO.setSharingAmount(sharingAmountTotal);
			chargingBillVO.setDiscount(discountTotal);
			chargingBillVO.setRefundAmount(refundAmountTotal);

			chargingBillVO.setExportList(tChargingOrders1);
			pageInfo.setRecords(list);
			chargingBillVO.setList(pageInfo);
			return chargingBillVO;

	ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -81,6 +81,7 @@
			accountListVO.setCommissionAmount(res.getCommissionAmount().setScale(2, BigDecimal.ROUND_DOWN));
			accountListVO.setSharingAmount(res.getSharingAmount().setScale(2, BigDecimal.ROUND_DOWN));
			accountListVO.setList(res.getList());
			accountListVO.setOrderList(res.getExportList());
			return R.ok(accountListVO);
			}
			@PostMapping(value = "/chargingBillList")