java/mx_charging_pile.git

			@@ -88,13 +88,7 @@

			@Override
			public ChargingBillVO chargingBillList1(ChargingListQuery dto) {
			if (dto.getState()!=null){
			if (dto.getState()==1){
			dto.setState(2);
			}else {
			dto.setState(1);
			}
			}

			ChargingBillVO chargingBillVO = new ChargingBillVO();
			List<TChargingOrder> tChargingOrders1 = new ArrayList<>();
			String startTime1 = null;
			@@ -107,44 +101,50 @@
			Long userId = tokenService.getLoginUser().getUserid();
			// 查询当前登陆人按钮权限
			SysUser sysUser = sysUserClient.getSysUser(tokenService.getLoginUser().getUserid()).getData();
			List<Site> siteList = siteClient.getSiteAll().getData();
			List<TChargingGun> gunList = chargingGunClient.getAllGun().getData();
			List<TChargingPile> pileList = chargingGunClient.getAllPile().getData();
			List<TAppUser> userList = appUserClient.getAllUser().getData();
			List<TAppUserCar> carList = appUserCarClient.getAllCar().getData();
			List<TChargingOrder> total = chargingOrderList.selectList(new LambdaQueryWrapper<>(TChargingOrder.class)
			.eq(TChargingOrder::getRechargePaymentStatus, 2));
			List<TChargingOrderRefund> totalRefund = chargingOrderRefundService.lambdaQuery().eq(TChargingOrderRefund::getRefundStatus, 2).list();
			Integer roleType = sysUser.getRoleType();
			List<Integer> siteIds = new ArrayList<>();
			//如果没传siteId,获取当前登陆人所有的siteIds
			if (dto.getSiteId()==null){
			if (userId != null){
			List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData();
			for (GetSiteListDTO datum : data) {
			siteIds.add(datum.getId());
			}
			//如果没传siteId,获取当前登陆人所有的siteIds
			if (dto.getSiteId()==null){
			if (userId != null){
			List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData();
			for (GetSiteListDTO datum : data) {
			siteIds.add(datum.getId());
			}
			}else {
			siteIds.add(dto.getSiteId());
			}
			if (siteIds.isEmpty()){
			siteIds.add(-1);
			}else{
			if (roleType == 2){
			List<Integer> integers = new ArrayList<>();
			for (Integer siteId : siteIds) {
			// 校验有没有这个站点的权限
			List<Boolean> t1= partnerClient.getAccountMenu(sysUser.getObjectId(),siteId).getData();
			}else {
			siteIds.add(dto.getSiteId());
			}
			if (siteIds.isEmpty()){
			siteIds.add(-1);
			}else{
			if (roleType == 2){
			List<Integer> integers = new ArrayList<>();
			for (Integer siteId : siteIds) {
			// 校验有没有这个站点的权限
			List<Boolean> t1= partnerClient.getChargingOrderMenu(sysUser.getObjectId(),siteId).getData();

			Boolean b = t1.get(1);
			if (b){
			integers.add(siteId);
			}
			Boolean b = t1.get(1);
			if (b){
			integers.add(siteId);
			}
			siteIds = integers;
			}
			siteIds = integers;
			}
			if (siteIds.isEmpty())siteIds.add(-1);
			dto.setSiteIds(siteIds);
			}
			dto.setSiteIds(siteIds);


			PageInfo<ChargingBillListVO> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
			PageInfo<ChargingBillListVO> pageInfo1 = new PageInfo<>(1,9999999);
			List<ChargingBillListVO> list = this.baseMapper.chargingBillList1(pageInfo,dto,startTime1,startTime2);
			List<ChargingBillListVO> list1 = this.baseMapper.chargingBillList1(pageInfo1,dto,startTime1,startTime2);
			List<ChargingBillListVO> list1 = this.baseMapper.chargingBillList1Nolimt(dto,startTime1,startTime2);

			BigDecimal paymentAmountTotal = new BigDecimal("0");
			BigDecimal orderAmountTotal = new BigDecimal("0");
			@@ -155,7 +155,7 @@
			BigDecimal sharingAmountTotal = new BigDecimal("0");
			BigDecimal chargingCapacityTotal = new BigDecimal("0");
			BigDecimal discountTotal = new BigDecimal("0");
			int orderCount = 0;


			for (ChargingBillListVO chargingBillListVO : list) {
			if (roleType==2){
			@@ -192,23 +192,19 @@
			chargingBillListVO.setUid(chargingBillListVO.getId().toString());
			// 根据账单的出账时间查询上个月的充电订单
			LocalDateTime localDate = chargingBillListVO.getBillTime().minusMonths(1);
			// LocalDateTime localDate = chargingBillListVO.getBillTime().minusDays(1);
			// 账单周期
			chargingBillListVO.setBillWeek(localDate.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM")));
			// 获取 LocalDate 对象
			LocalDate date = localDate.toLocalDate();
			// // 获取该月份的第一天
			LocalDate firstDayOfMonth = date.withDayOfMonth(1);
			// 获取该月份的最后一天
			LocalDate lastDayOfMonth = date.with(TemporalAdjusters.lastDayOfMonth());
			QueryWrapper<TChargingOrder> eq = new QueryWrapper<TChargingOrder>()
			.between("pay_time", firstDayOfMonth.atTime(0, 0, 0), lastDayOfMonth.atTime(23, 59, 59))
			.eq("status", 5)
			.eq("recharge_payment_status", 2);
			if (chargingBillListVO.getType() == 2) {
			eq.eq("site_id", chargingBillListVO.getSiteId());
			}
			List<TChargingOrder> tChargingOrders = chargingOrderList.selectList(eq);
			LocalDateTime lastDayOfMonth = localDate.with(TemporalAdjusters.lastDayOfMonth());
			LocalDateTime firstDayOfMonth = localDate.with(TemporalAdjusters.firstDayOfMonth());
			List<TChargingOrder> tChargingOrders = total.stream().filter(e -> chargingBillListVO.getType() == 2 ?
			e.getSiteId().equals(chargingBillListVO.getSiteId()) : true &&
			e.getPayTime().isBefore(lastDayOfMonth.withHour(23).withMinute(59).withSecond(59))
			&& e.getPayTime().isAfter(firstDayOfMonth.withHour(0).withMinute(0).withSecond(0))).collect(Collectors.toList());


			int chargingSecond = 0;
			BigDecimal paymentAmount = new BigDecimal("0");
			BigDecimal rechargeAmount = new BigDecimal("0");
			@@ -219,16 +215,15 @@
			BigDecimal sharingAmount = new BigDecimal("0");
			BigDecimal chargingCapacity = new BigDecimal("0");
			BigDecimal refundAmount = new BigDecimal("0");
			orderCount+=tChargingOrders.size();
			chargingBillVO.setCategory("");
			chargingBillVO.setExportList(tChargingOrders);
			for (TChargingOrder tChargingOrder : tChargingOrders) {
			List<Site> data = siteClient.getSiteByIds(Arrays.asList(tChargingOrder.getSiteId())).getData();
			if (!data.isEmpty()){
			chargingBillVO.setSiteName(data.get(0).getName());
			Site site1 = siteList.stream().filter(site -> site.getId().equals(tChargingOrder.getSiteId())).findFirst().orElse(null);
			if (site1!=null){
			chargingBillVO.setSiteName(site1.getName());
			}
			TChargingPile data1 = chargingPileClient.getChargingPileById(tChargingOrder.getChargingPileId()).getData();
			TChargingGun data2 = chargingGunClient.getChargingGunById(tChargingOrder.getChargingGunId()).getData();
			TChargingPile data1 = pileList.stream().filter(e -> e.getId().equals(tChargingOrder.getChargingPileId())).findFirst().orElse(null);
			TChargingGun data2 = gunList.stream().filter(e -> e.getId().equals(tChargingOrder.getChargingGunId())).findFirst().orElse(null);
			if (data1!=null && data2!=null){
			tChargingOrder.setTerminalName(data1.getName()+data2.getName());
			tChargingOrder.setTerminalCode(data2.getCode());
			@@ -287,47 +282,51 @@
			tChargingOrder.setDiscount(tChargingOrder.getCouponDiscountAmount()!=null?tChargingOrder.getCouponDiscountAmount().toString():"0");
			UploadRealTimeMonitoringData data5 = uploadRealTimeMonitoringDataClient.chargingOrderInfo(tChargingOrder.getCode()).getData();
			if (data5!=null){
			if (data5.getTime_remaining()!=null){
			chargingSecond+=data5.getTime_remaining()*60;
			}
			Integer cumulativeChargingTime = data5.getCumulative_charging_time();
			// 将其转化为xx小时xx分钟xx秒显示如果是0小时则不展示小时如果是0分钟则不展示分钟
			if (cumulativeChargingTime!=null){
			// 计算小时、分钟和秒
			int hours = cumulativeChargingTime / 60;
			int minutes = cumulativeChargingTime % 60;
			int seconds = 0; // 如果没有秒数，则默认是0
			StringBuilder result = new StringBuilder();
			if (hours > 0) {
			result.append(hours).append("小时");
			}
			if (minutes > 0) {
			result.append(minutes).append("分钟");
			}
			if (seconds > 0 \|\| result.length() == 0) { // 如果秒数大于0，或者小时和分钟都为0，则显示秒数
			result.append(seconds).append("秒");
			}
			tChargingOrder.setChargingTime(result.toString());
			}
			tChargingOrder.setEndSoc(data5.getSoc().toString());
			}
			if (tChargingOrder.getStartTime()!=null && tChargingOrder.getEndTime()!=null){
			LocalDateTime startTime = tChargingOrder.getStartTime();
			LocalDateTime endTime = tChargingOrder.getEndTime();
			// 计算时间差单位秒
			long between = ChronoUnit.SECONDS.between(startTime, endTime);
			chargingSecond+=between;
			// 将其转化为xx小时xx分钟xx秒显示如果是0小时则不展示小时如果是0分钟则不展示分钟

			TAppUser data3 = appUserClient.getUserById(tChargingOrder.getAppUserId()).getData();
			if (tChargingOrder.getAppUserCarId()!=null){
			List<TAppUserCar> data4 = appUserCarClient.getCarByIds(Arrays.asList(tChargingOrder.getAppUserCarId())).getData();
			if (!data4.isEmpty()){
			tChargingOrder.setLicensePlate(data4.get(0).getLicensePlate());
			tChargingOrder.setVehicleModel(data4.get(0).getVehicleModel());
			// 计算小时、分钟和秒
			long hours = between / 60 / 60;
			long minutes = (between % 3600) / 60;
			long seconds = between % 60; // 如果没有秒数，则默认是0
			StringBuilder result = new StringBuilder();
			if (hours > 0) {
			result.append(hours).append("小时");
			}
			if (minutes > 0) {
			result.append(minutes).append("分钟");
			}
			if (seconds > 0 \|\| result.length() == 0) { // 如果秒数大于0，或者小时和分钟都为0，则显示秒数
			result.append(seconds).append("秒");
			}
			tChargingOrder.setChargingTime(result.toString());

			}
			TAppUser data3 = userList.stream().filter(e -> e.getId().equals(tChargingOrder.getAppUserId())).findFirst().orElse(null);
			if (tChargingOrder.getAppUserCarId()!=null){
			TAppUserCar data4 = carList.stream().filter(e -> e.getId().equals(tChargingOrder.getAppUserCarId())).findFirst().orElse(null);
			if (data4!=null){
			tChargingOrder.setLicensePlate(data4.getLicensePlate());
			tChargingOrder.setVehicleModel(data4.getVehicleModel());
			}
			}else{
			tChargingOrder.setLicensePlate(tChargingOrder.getPlateNum());
			}
			if (data3!=null)tChargingOrder.setUserName(data3.getName());
			// 累加实收金额支付结算金额
			if (tChargingOrder.getChargeAmount()!=null){
			paymentAmount = paymentAmount.add(tChargingOrder.getRechargeAmount());
			if (tChargingOrder.getRechargeAmount()!=null){
			paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount());
			}
			// 总金额
			if (tChargingOrder.getOrderAmount()!=null){
			orderAmount = orderAmount.add(tChargingOrder.getOrderAmount());
			orderAmount = orderAmount.add(tChargingOrder.getRechargeAmount());
			}
			// 累加累计电费
			if (tChargingOrder.getElectrovalence()!=null){
			@@ -336,12 +335,9 @@
			if (tChargingOrder.getRechargeAmount()!=null){
			rechargeAmount = rechargeAmount.add(tChargingOrder.getRechargeAmount());
			}
			List<TChargingOrderRefund> list2 = chargingOrderRefundService.lambdaQuery().eq(TChargingOrderRefund::getRefundStatus, 2)
			.eq(TChargingOrderRefund::getChargingOrderId, tChargingOrder.getId()).list();
			List<TChargingOrderRefund> list2 = totalRefund.stream().filter(e -> e.getChargingOrderId().equals(tChargingOrder.getId())).collect(Collectors.toList());
			for (TChargingOrderRefund tChargingOrderRefund : list2) {
			if (tChargingOrderRefund.getRefundStatus()==2){
			refundAmount = refundAmount.add(tChargingOrderRefund.getRefundTotalAmount());
			}
			}
			// 累加累计服务费
			if (tChargingOrder.getServiceCharge()!=null){
			@@ -349,7 +345,7 @@
			}
			// 累加平台手续费
			if (tChargingOrder.getOrderAmount()!=null){
			commissionAmount = commissionAmount.add(tChargingOrder.getPaymentAmount().multiply(BigDecimal.valueOf(0.006))
			commissionAmount = commissionAmount.add(tChargingOrder.getRechargeAmount().multiply(BigDecimal.valueOf(0.006))
			.setScale(2,BigDecimal.ROUND_DOWN));
			}
			// 累加平台分佣
			@@ -373,22 +369,22 @@
			chargingBillVO.setPaymentAmount(BigDecimal.ZERO);
			}

			chargingBillListVO.setPaymentAmount(rechargeAmount);
			chargingBillListVO.setOrderAmount(paymentAmount == null?BigDecimal.ZERO:orderAmount.subtract(sharingAmount).subtract(commissionAmount));
			chargingBillListVO.setPaymentAmount(paymentAmount.subtract(sharingAmount));
			chargingBillListVO.setOrderAmount(paymentAmount);
			chargingBillListVO.setRefundAmount(refundAmount == null?BigDecimal.ZERO:refundAmount);
			chargingBillListVO.setElectrovalence(electrovalence == null?BigDecimal.ZERO:electrovalence);
			chargingBillListVO.setServiceCharge(serviceCharge == null?BigDecimal.ZERO:serviceCharge);
			chargingBillListVO.setCommissionAmount(commissionAmount == null?BigDecimal.ZERO:commissionAmount.setScale(2,BigDecimal.ROUND_DOWN));
			chargingBillListVO.setSharingAmount(sharingAmount == null?BigDecimal.ZERO:sharingAmount);
			chargingBillListVO.setChargingCapacity(chargingCapacity == null?BigDecimal.ZERO:chargingCapacity);
			chargingBillListVO.setBillMoney(rechargeAmount.subtract(refundAmount==null?BigDecimal.ZERO:refundAmount)
			chargingBillListVO.setBillMoney(orderAmount
			.subtract(commissionAmount.setScale(2,BigDecimal.ROUND_DOWN)).subtract(sharingAmount).setScale(2, BigDecimal.ROUND_DOWN));
			switch (chargingBillListVO.getType()){
			case 1:
			chargingBillListVO.setSiteName("全站");
			break;
			case 2:
			Site site = siteClient.getSiteByIds(Arrays.asList(chargingBillListVO.getSiteId())).getData().get(0);
			Site site = siteList.stream().filter(e -> e.getId().equals(chargingBillListVO.getSiteId())).findFirst().orElse(null);
			if (site!=null){
			chargingBillListVO.setSiteName(site.getName());
			}
			@@ -416,42 +412,36 @@
			chargingBillVO.setBillWeek(billTime.minusMonths(1).format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM")));

			chargingBillListVO.setUid(chargingBillListVO.getId().toString());
			// 根据账单的出账时间查询上个月的充电订单
			LocalDateTime localDate = chargingBillListVO.getBillTime().minusMonths(1);
			// 账单周期
			chargingBillListVO.setBillWeek(localDate.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM")));
			// 获取 LocalDate 对象
			LocalDate date = localDate.toLocalDate();
			// 获取该月份的第一天
			LocalDate firstDayOfMonth = date.withDayOfMonth(1);
			// // 获取该月份的第一天
			// 获取该月份的最后一天
			LocalDate lastDayOfMonth = date.with(TemporalAdjusters.lastDayOfMonth());
			QueryWrapper<TChargingOrder> eq = new QueryWrapper<TChargingOrder>()
			.between("create_time", firstDayOfMonth, lastDayOfMonth)
			.eq("status", 5)
			.eq("recharge_payment_status", 2);
			if (chargingBillListVO.getType() == 2) {
			eq.eq("site_id", chargingBillListVO.getSiteId());
			}
			List<TChargingOrder> tChargingOrders = chargingOrderList.selectList(eq);
			LocalDateTime lastDayOfMonth = localDate.with(TemporalAdjusters.lastDayOfMonth());
			LocalDateTime firstDayOfMonth = localDate.with(TemporalAdjusters.firstDayOfMonth());
			List<TChargingOrder> tChargingOrders = total.stream().filter(e -> chargingBillListVO.getType() == 2 ?
			e.getSiteId().equals(chargingBillListVO.getSiteId()) : true &&
			e.getPayTime().isBefore(lastDayOfMonth.withHour(23).withMinute(59).withSecond(59))
			&& e.getPayTime().isAfter(firstDayOfMonth.withHour(0).withMinute(0).withSecond(0))).collect(Collectors.toList());
			tChargingOrders1.addAll(tChargingOrders);
			orderCount+=tChargingOrders.size();
			chargingBillVO.setCategory("");
			chargingBillVO.setExportList(tChargingOrders);
			for (TChargingOrder tChargingOrder : tChargingOrders) {
			if (tChargingOrder.getOrderAmount()!=null){
			paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getRechargeAmount());
			paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getPaymentAmount());
			}

			// 累加订单金额
			if (tChargingOrder.getOrderAmount()!=null){
			orderAmountTotal = orderAmountTotal.add(tChargingOrder.getOrderAmount());
			orderAmountTotal = orderAmountTotal.add(tChargingOrder.getPaymentAmount());
			}
			// 累加累计电费
			if (tChargingOrder.getElectrovalence()!=null){
			electrovalenceTotal = electrovalenceTotal.add(tChargingOrder.getElectrovalence());
			}
			List<TChargingOrderRefund> list2 = chargingOrderRefundService.lambdaQuery().eq(TChargingOrderRefund::getChargingOrderId, tChargingOrder.getId())
			.eq(TChargingOrderRefund::getRefundStatus, 2).list();
			List<TChargingOrderRefund> list2 = totalRefund.stream().filter(e -> e.getChargingOrderId().equals(tChargingOrder.getId())).collect(Collectors.toList());
			for (TChargingOrderRefund tChargingOrderRefund : list2) {
			refundAmountTotal =refundAmountTotal.add(tChargingOrderRefund.getRefundAmount());
			tChargingOrder.setRefundAmount(tChargingOrderRefund.getRefundAmount());
			@@ -466,7 +456,7 @@
			}
			// 累加平台手续费
			if (tChargingOrder.getOrderAmount()!=null){
			commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getPaymentAmount().multiply(new BigDecimal("0.006"))
			commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getRechargeAmount().multiply(new BigDecimal("0.006"))
			.setScale(2,BigDecimal.ROUND_DOWN));
			}
			// 累加平台分佣
			@@ -489,11 +479,10 @@
			}
			chargingBillVO.setOrderCount(i);
			chargingBillVO.setChargingCapacity(chargingCapacityTotal);
			chargingBillVO.setPaymentAmount(paymentAmountTotal);
			chargingBillVO.setOrderAmount(paymentAmountTotal.subtract(refundAmountTotal).subtract(commissionAmountTotal).subtract(sharingAmountTotal));
			chargingBillVO.setPaymentAmount(paymentAmountTotal.subtract(sharingAmountTotal));
			chargingBillVO.setOrderAmount(orderAmountTotal);
			chargingBillVO.setElectrovalence(electrovalenceTotal);
			chargingBillVO.setServiceCharge(serviceChargeTotal);
			chargingBillVO.setOrderCount(orderCount);
			chargingBillVO.setCommissionAmount(commissionAmountTotal);
			chargingBillVO.setSharingAmount(sharingAmountTotal);
			chargingBillVO.setDiscount(discountTotal);
			@@ -639,7 +628,6 @@
			chargingBillListVO.setUid(chargingBillListVO.getId().toString());
			// 根据账单的出账时间查询上个月的充电订单
			LocalDateTime localDate = chargingBillListVO.getBillTime().minusMonths(1);
			// LocalDateTime localDate = chargingBillListVO.getBillTime().minusDays(1);
			// 账单周期
			chargingBillListVO.setBillWeek(localDate.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM")));
			// 获取 LocalDate 对象
			@@ -647,13 +635,6 @@
			// 获取该月份的最后一天
			LocalDateTime lastDayOfMonth = localDate.with(TemporalAdjusters.lastDayOfMonth());
			LocalDateTime firstDayOfMonth = localDate.with(TemporalAdjusters.firstDayOfMonth());
			// QueryWrapper<TChargingOrder> eq = new QueryWrapper<TChargingOrder>()
			// .between("pay_time", firstDayOfMonth.withHour(0).withMinute(0).withSecond(0), lastDayOfMonth.withHour(23).withMinute(59).withSecond(59))
			// .eq("recharge_payment_status", 2);
			// if (chargingBillListVO.getType() == 2) {
			// eq.eq("site_id", chargingBillListVO.getSiteId());
			// }
			// List<TChargingOrder> tChargingOrders = chargingOrderList.selectList(eq);
			List<TChargingOrder> tChargingOrders = total.stream().filter(e -> chargingBillListVO.getType() == 2 ?
			e.getSiteId().equals(chargingBillListVO.getSiteId()) : true &&
			e.getPayTime().isBefore(lastDayOfMonth.withHour(23).withMinute(59).withSecond(59))
			@@ -764,6 +745,8 @@
			tChargingOrder.setLicensePlate(tAppUserCar.getLicensePlate());
			tChargingOrder.setVehicleModel(tAppUserCar.getVehicleModel());
			}
			}else{
			tChargingOrder.setLicensePlate(tChargingOrder.getPlateNum());
			}
			if (data3!=null)tChargingOrder.setUserName(data3.getName());
			if ( tChargingOrder.getPaymentAmount()!=null){
			@@ -786,7 +769,7 @@
			}
			// 累加平台手续费
			if (tChargingOrder.getOrderAmount()!=null){
			commissionAmount = commissionAmount.add(tChargingOrder.getPaymentAmount().multiply(BigDecimal.valueOf(0.006))
			commissionAmount = commissionAmount.add(tChargingOrder.getRechargeAmount().multiply(BigDecimal.valueOf(0.006))
			.setScale(2,BigDecimal.ROUND_DOWN));
			}
			// 累加平台分佣
			@@ -807,7 +790,7 @@
			chargingBillVO.setChargingTime(timeString);
			chargingBillListVO.setOrderAmount(paymentAmount);

			chargingBillListVO.setPaymentAmount(paymentAmount.subtract(commissionAmount).subtract(sharingAmount).setScale(2,BigDecimal.ROUND_DOWN));
			chargingBillListVO.setPaymentAmount(paymentAmount.subtract(sharingAmount).setScale(2,BigDecimal.ROUND_DOWN));
			chargingBillListVO.setElectrovalence(electrovalence);
			chargingBillListVO.setServiceCharge(serviceCharge.setScale(2,BigDecimal.ROUND_DOWN));
			chargingBillListVO.setCommissionAmount(commissionAmount.setScale(2,BigDecimal.ROUND_DOWN));
			@@ -855,13 +838,6 @@
			// 获取该月份的最后一天
			LocalDateTime lastDayOfMonth = localDate.with(TemporalAdjusters.lastDayOfMonth());
			LocalDateTime firstDayOfMonth = localDate.with(TemporalAdjusters.firstDayOfMonth());
			// QueryWrapper<TChargingOrder> eq = new QueryWrapper<TChargingOrder>()
			// .between("pay_time", firstDayOfMonth.withHour(0).withMinute(0).withSecond(0), lastDayOfMonth.withHour(23).withMinute(59).withSecond(59))
			// .eq("recharge_payment_status", 2);
			// if (chargingBillListVO.getType() == 2) {
			// eq.eq("site_id", chargingBillListVO.getSiteId());
			// }
			// List<TChargingOrder> tChargingOrders = chargingOrderList.selectList(eq);
			List<TChargingOrder> tChargingOrders = total.stream().filter(e -> chargingBillListVO.getType() == 2 ?
			e.getSiteId().equals(chargingBillListVO.getSiteId()) : true &&
			e.getPayTime().isBefore(lastDayOfMonth.withHour(23).withMinute(59).withSecond(59))
			@@ -901,8 +877,8 @@
			}
			// 累加平台手续费
			if (tChargingOrder.getOrderAmount()!=null){
			commissionAmount = commissionAmount.add(tChargingOrder.getPaymentAmount().multiply(new BigDecimal("0.006")).setScale(2,BigDecimal.ROUND_DOWN));
			commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getPaymentAmount().multiply(new BigDecimal("0.006"))
			commissionAmount = commissionAmount.add(tChargingOrder.getRechargeAmount().multiply(new BigDecimal("0.006")).setScale(2,BigDecimal.ROUND_DOWN));
			commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getRechargeAmount().multiply(new BigDecimal("0.006"))
			.setScale(2,BigDecimal.ROUND_DOWN));
			}
			// 累加平台分佣