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

Merge branch 'dev-zza' into dev

Browse Source
This commit is contained in:
Lemon
2025-03-07 08:47:23 +08:00
parent ddba59129d 981de5aeaa
commit da99250515
1 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -206,7 +206,7 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService {
stationInfo.setStationID(stationId); stationInfo.setStationID(stationId);
// MerchantInfoVO merchantInfo = pileMerchantInfoService.getMerchantInfo(String.valueOf(pileStationInfo.getMerchantId())); // MerchantInfoVO merchantInfo = pileMerchantInfoService.getMerchantInfo(String.valueOf(pileStationInfo.getMerchantId()));
stationInfo.setOperatorID(Constants.OPERATORID_LIANLIAN); // 组织机构代码 stationInfo.setOperatorID(Constants.OPERATORID_LIANLIAN); // 组织机构代码
stationInfo.setEquipmentOwnerID(String.valueOf(pileStationInfo.getMerchantId())); stationInfo.setEquipmentOwnerID(Constants.OPERATORID_LIANLIAN);
stationInfo.setStationName(pileStationInfo.getStationName()); stationInfo.setStationName(pileStationInfo.getStationName());
stationInfo.setIsAloneApply(Integer.valueOf(pileStationInfo.getAloneApply())); stationInfo.setIsAloneApply(Integer.valueOf(pileStationInfo.getAloneApply()));
stationInfo.setIsPublicParkingLot(Integer.valueOf(pileStationInfo.getPublicParking())); stationInfo.setIsPublicParkingLot(Integer.valueOf(pileStationInfo.getPublicParking()));
@@ -235,6 +235,21 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService {
stationInfo.setPrinterFlag(Integer.valueOf(pileStationInfo.getPrinterFlag())); stationInfo.setPrinterFlag(Integer.valueOf(pileStationInfo.getPrinterFlag()));
stationInfo.setBarrierFlag(Integer.valueOf(pileStationInfo.getBarrierFlag())); stationInfo.setBarrierFlag(Integer.valueOf(pileStationInfo.getBarrierFlag()));
stationInfo.setParkingLockFlag(Integer.valueOf(pileStationInfo.getParkingLockFlag())); stationInfo.setParkingLockFlag(Integer.valueOf(pileStationInfo.getParkingLockFlag()));
// 截取运营商组织机构代码(去除最后一位后的最后九位)
MerchantInfoVO merchantInfo = pileMerchantInfoService.getMerchantInfoVO(String.valueOf(pileStationInfo.getMerchantId()));
String organizationCode = merchantInfo.getOrganizationCode();
if (StringUtils.isNotBlank(organizationCode) && organizationCode.length() == 18) {
String equipmentOwnerId = StringUtils.substring(organizationCode, organizationCode.length() - 10, organizationCode.length() - 1);
stationInfo.setEquipmentOwnerID(equipmentOwnerId);
}
if (StringUtils.equals("36", String.valueOf(pileStationInfo.getMerchantId()))) {
// 远大
stationInfo.setEquipmentOwnerID(Constants.OPERATORID_YUAN_DA);
}
if (MerchantUtils.isXiXiaoMerchant(String.valueOf(pileStationInfo.getMerchantId()))) {
// 如果是希晓运营商，则把equipmentOwnerID换成希晓
stationInfo.setEquipmentOwnerID(Constants.OPERATORID_XI_XIAO);
}
List<EquipmentInfo> pileList = pileBasicInfoService.getPileListForLianLian(stationId); List<EquipmentInfo> pileList = pileBasicInfoService.getPileListForLianLian(stationId);
if (CollectionUtils.isNotEmpty(pileList)) { if (CollectionUtils.isNotEmpty(pileList)) {
@@ -744,6 +759,10 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService {
if (MerchantUtils.isXiXiaoMerchant(orderBasicInfo.getMerchantId())) { if (MerchantUtils.isXiXiaoMerchant(orderBasicInfo.getMerchantId())) {
orderInfo.setEquipmentOwnerID(Constants.OPERATORID_XI_XIAO); orderInfo.setEquipmentOwnerID(Constants.OPERATORID_XI_XIAO);
} }
if (StringUtils.equals("36", String.valueOf(orderBasicInfo.getMerchantId()))) {
// 远大
orderInfo.setEquipmentOwnerID(Constants.OPERATORID_YUAN_DA);
}
// 支付方式 // 支付方式
if (StringUtils.equals(orderBasicInfo.getPayMode(), OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue())) { if (StringUtils.equals(orderBasicInfo.getPayMode(), OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue())) {
// 微信支付 // 微信支付
@@ -863,6 +882,10 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService {
if (MerchantUtils.isXiXiaoMerchant(orderBasicInfo.getMerchantId())) { if (MerchantUtils.isXiXiaoMerchant(orderBasicInfo.getMerchantId())) {
orderInfo.setEquipmentOwnerID(Constants.OPERATORID_XI_XIAO); orderInfo.setEquipmentOwnerID(Constants.OPERATORID_XI_XIAO);
} }
if (StringUtils.equals("36", String.valueOf(orderBasicInfo.getMerchantId()))) {
// 远大
orderInfo.setEquipmentOwnerID(Constants.OPERATORID_YUAN_DA);
}
// 支付方式 // 支付方式
if (StringUtils.equals(orderBasicInfo.getPayMode(), OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue())) { if (StringUtils.equals(orderBasicInfo.getPayMode(), OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue())) {
// 微信支付 // 微信支付
@@ -1193,11 +1216,11 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService {
.succStat(0) .succStat(0)
.failReason(0) .failReason(0)
.build(); .build();
String type = ThirdPartyOperatorIdEnum.getTypeByOperatorId(dto.getOperatorId()); // String type = ThirdPartyOperatorIdEnum.getTypeByOperatorId(dto.getOperatorId());
if (StringUtils.equals(ThirdPlatformTypeEnum.XIN_DIAN_TU.getTypeCode(), type)) { // if (StringUtils.equals(ThirdPlatformTypeEnum.XIN_DIAN_TU.getTypeCode(), type)) {
// 如果是新电途平台，则将 startChargeSeqStat 改为 1-启动中 // // 如果是新电途平台，则将 startChargeSeqStat 改为 1-启动中
vo.setStartChargeSeqStat(1); // vo.setStartChargeSeqStat(1);
} // }
// 异步推送启动充电结果 2024.01.25改为在0x33帧类型中统一回复 // 异步推送启动充电结果 2024.01.25改为在0x33帧类型中统一回复
// CompletableFuture.runAsync(() -> { // CompletableFuture.runAsync(() -> {
// try { // try {
@@ -1259,10 +1282,10 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService {
vo.setFailReason(0); vo.setFailReason(0);
String type = ThirdPartyOperatorIdEnum.getTypeByOperatorId(dto.getOperatorId()); String type = ThirdPartyOperatorIdEnum.getTypeByOperatorId(dto.getOperatorId());
if (StringUtils.equals(ThirdPlatformTypeEnum.XIN_DIAN_TU.getTypeCode(), type)) { // if (StringUtils.equals(ThirdPlatformTypeEnum.XIN_DIAN_TU.getTypeCode(), type)) {
// 如果是新电途平台，则将 startChargeSeqStat 改为 3-停止中 // // 如果是新电途平台，则将 startChargeSeqStat 改为 3-停止中
vo.setStartChargeSeqStat(3); // vo.setStartChargeSeqStat(3);
} // }
// 加密 // 加密
Map<String, String> resultMap = ThirdPartyPlatformUtils.generateResultMapV2(vo, thirdPartySecretInfoVO.getOurDataSecret(), Map<String, String> resultMap = ThirdPartyPlatformUtils.generateResultMapV2(vo, thirdPartySecretInfoVO.getOurDataSecret(),
thirdPartySecretInfoVO.getOurDataSecretIv(), thirdPartySecretInfoVO.getTheirSigSecret()); thirdPartySecretInfoVO.getOurDataSecretIv(), thirdPartySecretInfoVO.getTheirSigSecret());