From f609af30ee9d19d04e73b118ed296cf37173cb8a Mon Sep 17 00:00:00 2001 From: Lemon Date: Thu, 3 Apr 2025 09:55:00 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=20=E8=81=94=E8=81=94=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0Service?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jsowell/common/constant/Constants.java | 2 ++ .../service/impl/LianLianPlatformServiceImpl.java | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java b/jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java index f90e4bb99..86e438082 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java +++ b/jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java @@ -102,6 +102,8 @@ public class Constants { public static final String OPERATORID_XI_XIAO = "MAC13L2Q9"; + public static final String OPERATORID_ZHI_HE = "057643496"; + public static final String OPERATORID_YUAN_DA = "599777560"; // public static final String APP_ID = "wxbb3e0d474569481d"; // 举视充电网 wxbb3e0d474569481d diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java index a4c291725..7d6fb6495 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java @@ -325,6 +325,9 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService { // 如果是希晓运营商，则把equipmentOwnerID换成希晓 stationInfo.setEquipmentOwnerID(Constants.OPERATORID_XI_XIAO); } + if (MerchantUtils.isZhiHeMerchant(String.valueOf(pileStationInfo.getMerchantId()))) { + stationInfo.setEquipmentOwnerID(Constants.OPERATORID_ZHI_HE); + } List pileList = pileBasicInfoService.getPileListForLianLian(stationId); if (CollectionUtils.isNotEmpty(pileList)) { @@ -595,6 +598,9 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService { // 如果是希晓运营商，则把equipmentOwnerID换成希晓 info.setEquipmentOwnerID(Constants.OPERATORID_XI_XIAO); } + 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())) { @@ -908,6 +914,9 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService { // 远大 orderInfo.setEquipmentOwnerID(Constants.OPERATORID_YUAN_DA); } + if (MerchantUtils.isZhiHeMerchant(String.valueOf(orderBasicInfo.getMerchantId()))) { + orderInfo.setEquipmentOwnerID(Constants.OPERATORID_ZHI_HE); + } // 支付方式 if (StringUtils.equals(orderBasicInfo.getPayMode(), OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue())) { // 微信支付