autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-12 03:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
YAS\29473
2025-05-23 19:35:41 +08:00
parent 267e4e523f
commit abe90eb37f
4 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java vendored
View File

@@ -465,13 +465,13 @@ public class CommonService {
continue; continue;
} }
if (StringUtils.equals(ThirdPlatformTypeEnum.LIAN_LIAN_PLATFORM.getTypeCode(), thirdPartyType)) { if (StringUtils.equals(ThirdPlatformTypeEnum.LIAN_LIAN_PLATFORM.getTypeCode(), thirdPartyType)) {
// 联联平台 /* // 联联平台
// 推送停止充电结果 // 推送停止充电结果
lianLianService.pushStopChargeResult(orderBasicInfo.getOrderCode()); lianLianService.pushStopChargeResult(orderBasicInfo.getOrderCode());
// 推送订单信息 // 推送订单信息
lianLianService.pushOrderInfo(orderBasicInfo.getOrderCode()); lianLianService.pushOrderInfo(orderBasicInfo.getOrderCode());
// 推送充电订单信息 // 推送充电订单信息
lianLianService.pushChargeOrderInfo(orderBasicInfo.getOrderCode()); lianLianService.pushChargeOrderInfo(orderBasicInfo.getOrderCode());*/
} }
// if (StringUtils.equals(ThirdPlatformTypeEnum.NING_BO_PLATFORM.getTypeCode(), thirdPartyType)) { // if (StringUtils.equals(ThirdPlatformTypeEnum.NING_BO_PLATFORM.getTypeCode(), thirdPartyType)) {
// // 中电联 // // 中电联

4
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/NotificationService.java vendored
View File

@@ -169,6 +169,10 @@ public class NotificationService {
ThirdPartyPlatformService platformService = ThirdPartyPlatformFactory.getInvokeStrategy(secretInfoVO.getPlatformType()); ThirdPartyPlatformService platformService = ThirdPartyPlatformFactory.getInvokeStrategy(secretInfoVO.getPlatformType());
//充电订单信息推送 //充电订单信息推送
platformService.notificationChargeOrderInfo(orderCode, secretInfoVO); platformService.notificationChargeOrderInfo(orderCode, secretInfoVO);
//订单信息推送
platformService.notificationChargeOrderInfo(orderCode);
//停止充电结果推送
platformService.notificationStopChargeResult(orderCode);
} catch (Exception e) { } catch (Exception e) {
logger.error("充电订单信息推送error", e); logger.error("充电订单信息推送error", e);
} }

12
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java vendored
View File

@@ -944,6 +944,14 @@ public class LianLianServiceImpl implements LianLianService {
// 再循环该list，拼装对应的充电价格、费率 // 再循环该list，拼装对应的充电价格、费率
for (BillingPriceVO billingPriceVO : billingList) { for (BillingPriceVO billingPriceVO : billingList) {
detail = new ChargeDetail(); 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")) { if (StringUtils.equals(billingPriceVO.getTimeType(), "1")) {
// 尖时段 // 尖时段
detail.setDetailStartTime(billingPriceVO.getStartTime()); detail.setDetailStartTime(billingPriceVO.getStartTime());
@@ -1153,7 +1161,7 @@ public class LianLianServiceImpl implements LianLianService {
*/ */
@Override @Override
public String pushStopChargeResult(String orderCode) { public String pushStopChargeResult(String orderCode) {
logger.info("pushStopChargeResult start, orderCode={}", orderCode);
// 根据订单号查询订单信息 // 根据订单号查询订单信息
OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode); OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode);
if (orderInfo == null) { if (orderInfo == null) {
@@ -1229,7 +1237,7 @@ public class LianLianServiceImpl implements LianLianService {
*/ */
@Override @Override
public String pushChargeOrderInfo(String orderCode) { public String pushChargeOrderInfo(String orderCode) {
logger.info("pushChargeOrderInfo start, orderCode={}", orderCode);
OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode); OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode);
OrderDetail orderDetail = orderBasicInfoService.getOrderDetailByOrderCode(orderCode); OrderDetail orderDetail = orderBasicInfoService.getOrderDetailByOrderCode(orderCode);

2
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java vendored
View File

@@ -887,7 +887,7 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService {
.totalPower(new BigDecimal(realTimeMonitorData.getChargingDegree())) // 累计充电量 .totalPower(new BigDecimal(realTimeMonitorData.getChargingDegree())) // 累计充电量
.elecMoney(totalElectricityAmount.setScale(2, BigDecimal.ROUND_HALF_UP)) // 累计电费 .elecMoney(totalElectricityAmount.setScale(2, BigDecimal.ROUND_HALF_UP)) // 累计电费
.seviceMoney(totalServiceAmount.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(); .build();
String url = urlAddress + BusinessInformationExchangeEnum.NOTIFICATION_EQUIP_CHARGE_STATUS.getValue(); String url = urlAddress + BusinessInformationExchangeEnum.NOTIFICATION_EQUIP_CHARGE_STATUS.getValue();