java/mx_charging_pile.git

			@@ -37,6 +37,7 @@
			import java.time.LocalDateTime;
			import java.time.LocalTime;
			import java.time.temporal.TemporalAdjusters;
			import java.util.ArrayList;
			import java.util.Arrays;
			import java.util.List;

			@@ -77,6 +78,8 @@
			}
			}
			ChargingBillVO chargingBillVO = new ChargingBillVO();
			List<TChargingOrder> exports = new ArrayList<>();

			String startTime1 = null;
			String startTime2 = null;
			if (StringUtils.hasLength(dto.getStartTime())){
			@@ -173,6 +176,16 @@
			if (data1!=null && data2!=null){
			tChargingOrder.setTerminalName(data1.getName()+data2.getName());
			tChargingOrder.setTerminalCode(data2.getCode());
			}
			if (tChargingOrder.getRechargePaymentType()!=null && tChargingOrder.getRechargePaymentType()==1){
			chargingBillListVO.setPayTypeName("微信商户");
			}
			if (tChargingOrder.getRechargePaymentType()!=null && tChargingOrder.getRechargePaymentType()==2){
			if (StringUtils.hasLength(chargingBillListVO.getPayTypeName())){
			chargingBillListVO.setPayTypeName("微信商户+支付宝商户");
			}else{
			chargingBillListVO.setPayTypeName("支付宝商户");
			}
			}
			tChargingOrder.setOrderClassification1("线上订单");
			tChargingOrder.setRechargePaymentType1("预付");
			@@ -289,6 +302,7 @@
			}

			}
			exports.addAll(tChargingOrders);
			// 将chargingSecond 这是以秒为单位存放的总秒数将其转化为xx小时xx分钟xx秒
			int hours = chargingSecond / 3600;
			int minutes = (chargingSecond % 3600) / 60;
			@@ -631,7 +645,7 @@
			}
			// 累加平台手续费
			if (tChargingOrder.getOrderAmount()!=null){
			commissionAmount = commissionAmount.add(tChargingOrder.getOrderAmount().multiply(BigDecimal.valueOf(0.006)));
			commissionAmount = commissionAmount.add(tChargingOrder.getPaymentAmount().multiply(BigDecimal.valueOf(0.006)));
			}
			// 累加平台分佣
			if (tChargingOrder.getSharingAmount()!=null){
			@@ -650,7 +664,7 @@
			String timeString = String.format("%d小时%d分钟%d秒", hours, minutes, seconds);
			chargingBillVO.setChargingTime(timeString);

			chargingBillListVO.setPaymentAmount(paymentAmount);
			chargingBillListVO.setPaymentAmount(orderAmount.subtract(commissionAmount).subtract(sharingAmount));
			chargingBillListVO.setOrderAmount(orderAmount);
			chargingBillListVO.setElectrovalence(electrovalence);
			chargingBillListVO.setServiceCharge(serviceCharge.setScale(2,RoundingMode.HALF_DOWN));
			@@ -742,8 +756,8 @@
			}
			// 累加平台手续费
			if (tChargingOrder.getOrderAmount()!=null){
			commissionAmount = commissionAmount.add(tChargingOrder.getOrderAmount().multiply(new BigDecimal("0.006")));
			commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getOrderAmount().multiply(new BigDecimal("0.006")));
			commissionAmount = commissionAmount.add(tChargingOrder.getPaymentAmount().multiply(new BigDecimal("0.006")));
			commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getPaymentAmount().multiply(new BigDecimal("0.006")));
			}
			// 累加平台分佣
			if (tChargingOrder.getSharingAmount()!=null){