diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java index 8a8e26256..2d6d5ebef 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java @@ -465,13 +465,13 @@ public class CommonService { continue; } if (StringUtils.equals(ThirdPlatformTypeEnum.LIAN_LIAN_PLATFORM.getTypeCode(), thirdPartyType)) { - // 联联平台 +/* // 联联平台 // 推送停止充电结果 lianLianService.pushStopChargeResult(orderBasicInfo.getOrderCode()); // 推送订单信息 lianLianService.pushOrderInfo(orderBasicInfo.getOrderCode()); // 推送充电订单信息 - lianLianService.pushChargeOrderInfo(orderBasicInfo.getOrderCode()); + lianLianService.pushChargeOrderInfo(orderBasicInfo.getOrderCode());*/ } // if (StringUtils.equals(ThirdPlatformTypeEnum.NING_BO_PLATFORM.getTypeCode(), thirdPartyType)) { // // 中电联 diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/NotificationService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/NotificationService.java index 8565f55fb..06adc49be 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/NotificationService.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/NotificationService.java @@ -169,6 +169,10 @@ public class NotificationService { ThirdPartyPlatformService platformService = ThirdPartyPlatformFactory.getInvokeStrategy(secretInfoVO.getPlatformType()); //充电订单信息推送 platformService.notificationChargeOrderInfo(orderCode, secretInfoVO); + //订单信息推送 + platformService.notificationChargeOrderInfo(orderCode); + //停止充电结果推送 + platformService.notificationStopChargeResult(orderCode); } catch (Exception e) { logger.error("充电订单信息推送error", e); } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java index 986376570..1b6c4c19e 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java @@ -944,6 +944,14 @@ public class LianLianServiceImpl implements LianLianService { // 再循环该list,拼装对应的充电价格、费率 for (BillingPriceVO billingPriceVO : billingList) { detail = new ChargeDetail(); + //改为YYYY-MM-DD HH:mm:ss格式 + //拼接 开始时间和结束时间 + String startTime = billingPriceVO.getStartTime(); + String endTime = billingPriceVO.getEndTime(); + + billingPriceVO.setStartTime(DateUtils.formatTime(startTime)); + billingPriceVO.setEndTime(DateUtils.formatTime(endTime)); + if (StringUtils.equals(billingPriceVO.getTimeType(), "1")) { // 尖时段 detail.setDetailStartTime(billingPriceVO.getStartTime()); @@ -1153,7 +1161,7 @@ public class LianLianServiceImpl implements LianLianService { */ @Override public String pushStopChargeResult(String orderCode) { - + logger.info("pushStopChargeResult start, orderCode={}", orderCode); // 根据订单号查询订单信息 OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode); if (orderInfo == null) { @@ -1229,7 +1237,7 @@ public class LianLianServiceImpl implements LianLianService { */ @Override public String pushChargeOrderInfo(String orderCode) { - + logger.info("pushChargeOrderInfo start, orderCode={}", orderCode); OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode); OrderDetail orderDetail = orderBasicInfoService.getOrderDetailByOrderCode(orderCode); diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java index 483f50a1f..87b3ef154 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java @@ -887,7 +887,7 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService { .totalPower(new BigDecimal(realTimeMonitorData.getChargingDegree())) // 累计充电量 .elecMoney(totalElectricityAmount.setScale(2, BigDecimal.ROUND_HALF_UP)) // 累计电费 .seviceMoney(totalServiceAmount.setScale(2, BigDecimal.ROUND_HALF_UP)) // 累计服务费 - .totalMoney(new BigDecimal(realTimeMonitorData.getChargingAmount())) // 已充金额 + .totalMoney(realTimeMonitorData.getChargingAmount() == null ? BigDecimal.ZERO : new BigDecimal(realTimeMonitorData.getChargingAmount()).setScale(2, BigDecimal.ROUND_HALF_UP)) // 已充金额 .build(); String url = urlAddress + BusinessInformationExchangeEnum.NOTIFICATION_EQUIP_CHARGE_STATUS.getValue();