mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-20 19:15:35 +08:00
update
This commit is contained in:
@@ -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())) {
|
||||
// 微信支付
|
||||
|
||||
Reference in New Issue
Block a user