XMPoleManager.git

			@@ -36,8 +36,8 @@
			import javax.servlet.http.HttpServletRequest;
			import javax.servlet.http.HttpServletResponse;
			import java.io.IOException;
			import java.text.SimpleDateFormat;
			import java.math.BigDecimal;
			import java.text.SimpleDateFormat;
			import java.time.LocalDateTime;
			import java.time.ZoneId;
			import java.util.Date;
			@@ -142,7 +142,7 @@
			*/
			@Transactional(rollbackFor = Exception.class)
			public C3mOrder advancePayOrder(Long streetlightId, C3mCharging c3m, String orderType, Double totalAmount,
			Integer subscribeChargingCapacity, String wxCode) throws InterruptedException {
			Integer subscribeChargingCapacity, String openId) throws InterruptedException {
			//查询充电桩是否存在正在进行中的订单
			C3mOrder c3mOrder = getOne(Wrappers.lambdaQuery(C3mOrder.class)
			.eq(C3mOrder::getC3Udid, c3m.getMcuUdid()).eq(C3mOrder::getC3Mac, c3m.getC3Mac()).last("limit 1"));
			@@ -177,43 +177,45 @@
			c3mOrderEntity.setPoleMac(pole.getDeviceCode());
			c3mOrderEntity.setPoleName(pole.getPoleName());
			c3mOrderEntity.setC3Mac(c3m.getC3Mac());
			c3mOrderEntity.setC3Name(c3m.getC3Name());
			c3mOrderEntity.setOrderStatus(0);
			c3mOrderEntity.setUserCode(wxCode);
			c3mOrderEntity.setUserCode(openId);
			c3mOrderEntity.setC3Udid(c3m.getMcuUdid());
			c3mOrderEntity.setRefundAmount(totalAmount);
			c3mOrderEntity.setSurplusAmount(totalAmount);

			//确认充电桩状态
			ChargingDto chargingInfo = c3ChargingService.getChargingInfo(streetlightId.toString());
			if (chargingInfo.getStatusBit() != 1) {
			throw new BusinessException("充电桩非空闲状态,无法创建订单!");
			}
			Thread.sleep(500);

			//同步时间戳
			System.out.println("同步时间戳开始");
			String date = new SimpleDateFormat("yyMMddHHmmss").format(new Date());
			String s = c3ChargingService.SetCalendar(c3m.getC3Mac(), Integer.parseInt(date.substring(0, 2)), Integer.parseInt(date.substring(2, 4)),
			Integer.parseInt(date.substring(4, 6)), Integer.parseInt(date.substring(6, 8)),
			Integer.parseInt(date.substring(8, 10)), Integer.parseInt(date.substring(10, 12)), true);
			log.error("同步时间戳结果 : " + s);
			if (!"操作成功".equals(s)) {
			throw new BusinessException(s + "!");
			}
			Thread.sleep(500);

			//同步费率
			List<C3mChargingCharge> list = SpringContextHolder.getBean(C3mChargingChargeService.class)
			.list(Wrappers.lambdaQuery(C3mChargingCharge.class).eq(C3mChargingCharge::getC3Id, c3m.getC3Id()));
			if (list == null && list.size() == 0) {
			//费率表中没有此充电桩数据时添加默认费率
			SpringContextHolder.getBean(C3mChargingChargeService.class).initCharge((c3m.getC3Id()).intValue());
			}
			String rateState = c3ChargingService.setRate(c3m.getC3Mac(), list, true);
			log.error("费率设置结果 : " + rateState);
			if (!"操作成功".equals(rateState)) {
			throw new BusinessException(s + "!");
			}
			// //确认充电桩状态
			// ChargingDto chargingInfo = c3ChargingService.getChargingInfo(streetlightId.toString());
			// if (chargingInfo.getStatusBit() != 1) {
			// throw new BusinessException("充电桩非空闲状态,无法创建订单!");
			// }
			// Thread.sleep(500);
			//
			// //同步时间戳
			// System.out.println("同步时间戳开始");
			// String date = new SimpleDateFormat("yyMMddHHmmss").format(new Date());
			// String s = c3ChargingService.SetCalendar(c3m.getC3Mac(), Integer.parseInt(date.substring(0, 2)), Integer.parseInt(date.substring(2, 4)),
			// Integer.parseInt(date.substring(4, 6)), Integer.parseInt(date.substring(6, 8)),
			// Integer.parseInt(date.substring(8, 10)), Integer.parseInt(date.substring(10, 12)), true);
			// log.error("同步时间戳结果 : " + s);
			// if (!"操作成功".equals(s)) {
			// throw new BusinessException(s + "!");
			// }
			// Thread.sleep(500);
			//
			// //同步费率
			// System.out.println("同步费率开始");
			// List<C3mChargingCharge> list = SpringContextHolder.getBean(C3mChargingChargeService.class)
			// .list(Wrappers.lambdaQuery(C3mChargingCharge.class).eq(C3mChargingCharge::getC3Id, c3m.getC3Id()));
			// if (list == null && list.size() == 0) {
			// //费率表中没有此充电桩数据时添加默认费率
			// SpringContextHolder.getBean(C3mChargingChargeService.class).initCharge((c3m.getC3Id()).intValue());
			// }
			// String rateState = c3ChargingService.setRate(c3m.getC3Mac(), list, true);
			// log.error("费率设置结果 : " + rateState);
			// if (!"操作成功".equals(rateState)) {
			// throw new BusinessException(s + "!");
			// }

			if (save(c3mOrderEntity)) {
			return c3mOrderEntity;
			@@ -420,39 +422,6 @@
			//充电时长
			c3mOrder.setAlreadyChargingTime(dataPackage.getAlreadyChargingTime());
			updateById(c3mOrder);
			}
			}

			/**
			* 刷新充电中订单信息
			*
			* @param aPackage
			*/
			public void orderProcess(A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage) {

			String c3Mac = aPackage.getC3Mac();
			//结束充电更改订单状态
			C3mOrder lastOrderByC3Mac = SpringContextHolder.getBean(C3mOrderService.class).getLastOrderByC3Mac(c3Mac);
			if (lastOrderByC3Mac != null) {
			//设置订单状态为已完成
			lastOrderByC3Mac.setOrderStatus(OrderStatus.COMPLETE.getStatus());

			BigDecimal actualChargingCapacity = BigDecimal.valueOf(lastOrderByC3Mac.getActualChargingCapacity());
			BigDecimal actualChargingCapacityHide = BigDecimal.valueOf(lastOrderByC3Mac.getActualChargingCapacityHide());
			//设置实际充电电量
			lastOrderByC3Mac.setActualChargingCapacity(actualChargingCapacity.add(actualChargingCapacityHide).doubleValue());
			//设置订单结束时间
			lastOrderByC3Mac.setStopChargingTimestamp(System.currentTimeMillis());
			lastOrderByC3Mac.setActualChargingCapacity(0.00);
			//设置订单状态为充电结束
			lastOrderByC3Mac.setChargingStates(1);
			//设置剩余金额
			lastOrderByC3Mac.setSurplusAmount(Double.parseDouble(aPackage.getRemainingAmount()));
			//设置退款金额
			lastOrderByC3Mac.setRefundAmount(Double.parseDouble(aPackage.getRemainingAmount()));
			//充电时长
			lastOrderByC3Mac.setAlreadyChargingTime(aPackage.getAlreadyChargingTime());
			SpringContextHolder.getBean(C3mOrderService.class).updateById(lastOrderByC3Mac);
			}
			}