This commit is contained in:
YAS\29473
2025-05-22 14:26:27 +08:00
parent db44ef86c3
commit 66dd65d84f
5 changed files with 12 additions and 22 deletions

View File

@@ -333,9 +333,9 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService {
// 如果是希晓运营商则把equipmentOwnerID换成希晓
stationInfo.setEquipmentOwnerID(Constants.OPERATORID_XI_XIAO);
}
if (MerchantUtils.isZhiHeMerchant(String.valueOf(pileStationInfo.getMerchantId()))) {
/* if (MerchantUtils.isZhiHeMerchant(String.valueOf(pileStationInfo.getMerchantId()))) {
stationInfo.setEquipmentOwnerID(Constants.OPERATORID_ZHI_HE);
}
}*/
List<EquipmentInfo> pileList = pileBasicInfoService.getPileListForLianLian(stationId);
if (CollectionUtils.isNotEmpty(pileList)) {
@@ -606,9 +606,9 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService {
// 如果是希晓运营商则把equipmentOwnerID换成希晓
info.setEquipmentOwnerID(Constants.OPERATORID_XI_XIAO);
}
if (MerchantUtils.isZhiHeMerchant(String.valueOf(pileStationInfo.getMerchantId()))) {
/* if (MerchantUtils.isZhiHeMerchant(String.valueOf(pileStationInfo.getMerchantId()))) {
info.setEquipmentOwnerID(Constants.OPERATORID_ZHI_HE);
}
}*/
String payment = StationPaymentEnum.getPaymentByCode(pileStationInfo.getPayment());
info.setPayment(payment);
if (StringUtils.isNotBlank(pileStationInfo.getParkingNumber())) {
@@ -966,10 +966,10 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService {
// 远大
orderInfo.setEquipmentOwnerID(Constants.OPERATORID_YUAN_DA);
}
if (MerchantUtils.isZhiHeMerchant(orderBasicInfo.getMerchantId())) {
/* if (MerchantUtils.isZhiHeMerchant(orderBasicInfo.getMerchantId())) {
logger.info("订单号:{} 为之禾运营商订单", orderBasicInfo.getOrderCode());
orderInfo.setEquipmentOwnerID(Constants.OPERATORID_ZHI_HE);
}
}*/
// 支付方式
if (StringUtils.equals(orderBasicInfo.getPayMode(), OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue())) {
// 微信支付