java/mx_charging_pile.git

			@@ -1103,7 +1103,7 @@
			String code = Double.valueOf(Math.random() * 1000).intValue() + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS"));
			appUserIntegralChange.setCode(code);
			appUserIntegralChange.setAppUserId(appUser1.getId());
			appUserIntegralChange.setChangeType(5);
			appUserIntegralChange.setChangeType(4);
			appUserIntegralChange.setHistoricalIntegral(appUser1.getPoints());
			appUserIntegralChange.setCurrentIntegral(appUser1.getPoints() + num1);
			appUserIntegralChange.setCreateTime(LocalDateTime.now());
			@@ -1206,8 +1206,8 @@
			BigDecimal electronicMoney = new BigDecimal("0");
			BigDecimal serviceMoney = new BigDecimal("0");
			for (ChargingOrderVO chargingOrderVO : list) {
			chargingOrderVO.setCommissionAmount(chargingOrderVO.getServiceCharge().multiply(new BigDecimal("0.006")));
			chargingOrderVO.setPlatFormMoney(chargingOrderVO.getServiceCharge().multiply(new BigDecimal("0.006")));
			chargingOrderVO.setCommissionAmount(chargingOrderVO.getOrderAmount().multiply(new BigDecimal("0.006")));
			chargingOrderVO.setPlatFormMoney(chargingOrderVO.getOrderAmount().multiply(new BigDecimal("0.006")));
			chargingOrderVO.setUid(chargingOrderVO.getId()+"");
			TChargingGun data3 = chargingGunClient.getChargingGunById(chargingOrderVO.getChargingGunId()).getData();
			TChargingPile data2 = chargingPileClient.getChargingPileById(chargingOrderVO.getChargingPileId()).getData();
			@@ -1613,9 +1613,7 @@
			@Override
			public ChargingOrderListInfoVO chargingInfo(String uid) {
			TChargingOrder chargingOrder= this.getById(uid);

			ChargingOrderListInfoVO chargingOrderListInfoVO = new ChargingOrderListInfoVO();

			chargingOrderListInfoVO.setStatus(chargingOrder.getStatus());
			BigDecimal bigDecimal = new BigDecimal("0.006");
			if (chargingOrder.getOrderAmount()!=null){
			@@ -1664,7 +1662,7 @@
			if (uploadRealTimeMonitoringData.getOutput_current()!=null&&
			uploadRealTimeMonitoringData.getOutput_voltage()!=null){
			uploadRealTimeMonitoringData.setPower(uploadRealTimeMonitoringData.getOutput_voltage()
			.multiply(uploadRealTimeMonitoringData.getOutput_current()));
			.multiply(uploadRealTimeMonitoringData.getOutput_current()).divide(new BigDecimal(1000),2, BigDecimal.ROUND_HALF_UP));
			}
			}
			if (!data6.isEmpty()){
			@@ -2029,7 +2027,7 @@
			}
			}

			order.setServiceCharge(periodServicePrice_total);
			order.setServiceCharge(periodServicePrice_total.setScale(2, RoundingMode.DOWN));
			order.setPaymentAmount(payAmount);
			order.setRefundAmount(refundAmount);
			order.setRefundStatus(1);