This commit is contained in:
YAS\29473
2025-06-17 11:06:36 +08:00
parent 4d69f9e9b0
commit feb927cc88

View File

@@ -197,11 +197,15 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService {
// throw new BusinessException("2", "密钥错误");
// }
String a = "146";
/* String a = "146";
String s = String.valueOf(a);
System.out.println(s);
boolean zhiHeMerchant = MerchantUtils.isZhiHeMerchant(s);
System.out.println(zhiHeMerchant);
System.out.println(zhiHeMerchant);*/
String pn = "8823000000107601";
String pileSn = YKCUtils.getPileSn(pn);
System.out.println(pileSn);
}
@@ -630,20 +634,6 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService {
info.setAccountNumber(pileStationInfo.getAccountNumber());
}
// 由于88250000005324在对方测试环境的LC658的站点,因此在这里将站点LC149改为LC658
/* if (StringUtils.equals("149", stationId)) {
info.setStationID("LC658");
}*/
//正式环境站点149推送时报错,"Msg":"更新站点数据出错。站点ID:LC149,错误信息:站点的所属运营商不能修改",
// 正确运营商为"上海之禾"-057643496
if(StringUtils.equals("149", stationId)){
//使用EquipmentOwnerID = MA1JLFUU8
info.setEquipmentOwnerID(Constants.OPERATORID_LIANLIAN);
}
// 容量
if (StringUtils.isNotBlank(String.valueOf(pileStationInfo.getCapacity()))) {
info.setCapacity(pileStationInfo.getCapacity().setScale(4, BigDecimal.ROUND_HALF_UP));
@@ -1065,18 +1055,6 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService {
}
orderInfo.setChargeDetails(chargeDetails);
// 由于订单在对方测试环境的LC658的站点,因此在这里将站点LC149改为LC658
/* if (orderInfo.getStationID().equals("LC149")){
orderInfo.setStationID("LC658");
}*/
// 正确运营商"之禾"
if(StringUtils.equals("149", orderInfo.getStationID())){
//使用EquipmentOwnerID = MA1JLFUU8
orderInfo.setEquipmentOwnerID(Constants.OPERATORID_LIANLIAN);
}
// 获取令牌
String token = getToken(urlAddress, operatorId, operatorSecret, dataSecretIv, signSecret, dataSecret);
if (StringUtils.isBlank(token)) {