diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/util/MerchantUtils.java b/jsowell-pile/src/main/java/com/jsowell/pile/util/MerchantUtils.java index 0677e6de7..a77209582 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/util/MerchantUtils.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/util/MerchantUtils.java @@ -10,11 +10,18 @@ public class MerchantUtils { // 希晓运营商id public static final String XIXIAO_MERCHANT_ID = "35"; + public static final String YUAN_DA_MERCHANT_ID = "36"; + // 是否是希晓运营商 public static boolean isXiXiaoMerchant(String merchantId) { return StringUtils.equals(XIXIAO_MERCHANT_ID, merchantId); } + // 是否是远大运营商 + public static boolean isYuanDaMerchant(String merchantId) { + return StringUtils.equals(YUAN_DA_MERCHANT_ID, merchantId); + } + /** * 从统一社会信用代码中获取组织机构代码 * @param organizationCode 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 a3b3b5b5a..40803ea8e 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 @@ -458,7 +458,7 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService { settingInfo.setType(thirdPlatformType); ThirdPartySecretInfoVO thirdPartySecretInfoVO = getLianLianPlatformSecretInfo(); - String operatorId = thirdPartySecretInfoVO.getTheirOperatorId(); + String operatorId = thirdPartySecretInfoVO.getOurOperatorId(); String operatorSecret = thirdPartySecretInfoVO.getTheirOperatorSecret(); String signSecret = thirdPartySecretInfoVO.getTheirSigSecret(); String dataSecret = thirdPartySecretInfoVO.getTheirDataSecret(); @@ -575,25 +575,18 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService { */ @Override public String notificationStationStatus(PushRealTimeInfoDTO dto) { - String thirdPartyType = dto.getThirdPartyType(); String status = dto.getStatus(); String pileConnectorCode = dto.getPileConnectorCode(); - // 查出该桩所属哪个站点 - // String pileSn = StringUtils.substring(pileConnectorCode, 0, 14); - String pileSn = YKCUtils.getPileSn(pileConnectorCode); - PileStationVO stationVO = pileStationInfoService.getStationInfoByPileSn(pileSn); - // 通过站点id查询相关配置信息 - ThirdPartyStationRelationVO relationInfo = thirdPartyStationRelationService.selectRelationInfo(stationVO.getId()); - if (relationInfo == null) { - return null; - } - String operatorId = relationInfo.getOperatorId(); - String operatorSecret = relationInfo.getOperatorSecret(); - String signSecret = relationInfo.getSignSecret(); - String dataSecret = relationInfo.getDataSecret(); - String dataSecretIv = relationInfo.getDataSecretIv(); - String urlAddress = relationInfo.getUrlAddress(); + // 查询相关配置信息 + ThirdPartySecretInfoVO thirdPartySecretInfoVO = getLianLianPlatformSecretInfo(); + + String operatorId = thirdPartySecretInfoVO.getOurOperatorId(); + String operatorSecret = thirdPartySecretInfoVO.getTheirOperatorSecret(); + String signSecret = thirdPartySecretInfoVO.getTheirSigSecret(); + String dataSecret = thirdPartySecretInfoVO.getTheirDataSecret(); + String dataSecretIv = thirdPartySecretInfoVO.getTheirDataSecretIv(); + String urlAddress = thirdPartySecretInfoVO.getTheirUrlPrefix(); String url = urlAddress + BusinessInformationExchangeEnum.NOTIFICATION_STATION_STATUS.getValue(); ConnectorStatusInfo info = ConnectorStatusInfo.builder() @@ -641,7 +634,7 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService { ThirdPartySecretInfoVO thirdPartySecretInfoVO = getLianLianPlatformSecretInfo(); - String operatorId = thirdPartySecretInfoVO.getTheirOperatorId(); + String operatorId = thirdPartySecretInfoVO.getOurOperatorId(); String operatorSecret = thirdPartySecretInfoVO.getTheirOperatorSecret(); String signSecret = thirdPartySecretInfoVO.getTheirSigSecret(); String dataSecret = thirdPartySecretInfoVO.getTheirDataSecret(); @@ -692,7 +685,7 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService { // if (relationInfo == null) { // return null; // } - String operatorId = secretInfoVO.getTheirOperatorId(); + String operatorId = secretInfoVO.getOurOperatorId(); String operatorSecret = secretInfoVO.getTheirOperatorSecret(); String signSecret = secretInfoVO.getTheirSigSecret(); String dataSecret = secretInfoVO.getTheirDataSecret(); @@ -801,16 +794,14 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService { OrderDetail orderDetail = orderBasicInfoService.getOrderDetailByOrderCode(orderCode); // 通过站点id查询相关配置信息 - ThirdPartyStationRelationVO relationInfo = thirdPartyStationRelationService.selectRelationInfo(orderBasicInfo.getStationId()); - if (relationInfo == null) { - return null; - } - String operatorId = relationInfo.getOperatorId(); - String operatorSecret = relationInfo.getOperatorSecret(); - String signSecret = relationInfo.getSignSecret(); - String dataSecret = relationInfo.getDataSecret(); - String dataSecretIv = relationInfo.getDataSecretIv(); - String urlAddress = relationInfo.getUrlAddress(); + ThirdPartySecretInfoVO thirdPartySecretInfoVO = getLianLianPlatformSecretInfo(); + + String operatorId = thirdPartySecretInfoVO.getOurOperatorId(); + String operatorSecret = thirdPartySecretInfoVO.getTheirOperatorSecret(); + String signSecret = thirdPartySecretInfoVO.getTheirSigSecret(); + String dataSecret = thirdPartySecretInfoVO.getTheirDataSecret(); + String dataSecretIv = thirdPartySecretInfoVO.getTheirDataSecretIv(); + String urlAddress = thirdPartySecretInfoVO.getTheirUrlPrefix(); String url = urlAddress + "notification_orderInfo"; @@ -837,7 +828,8 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService { if (MerchantUtils.isXiXiaoMerchant(orderBasicInfo.getMerchantId())) { orderInfo.setEquipmentOwnerID(Constants.OPERATORID_XI_XIAO); } - if (StringUtils.equals("36", String.valueOf(orderBasicInfo.getMerchantId()))) { + if (MerchantUtils.isYuanDaMerchant(orderBasicInfo.getMerchantId())) { + logger.info("订单号:{} 为远大运营商订单", orderBasicInfo.getOrderCode()); // 远大 orderInfo.setEquipmentOwnerID(Constants.OPERATORID_YUAN_DA); } @@ -928,7 +920,7 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService { // if (relationInfo == null) { // return null; // } - String operatorId = secretInfoVO.getTheirOperatorId(); + String operatorId = Constants.OPERATORID_LIANLIAN; String operatorSecret = secretInfoVO.getTheirOperatorSecret(); String signSecret = secretInfoVO.getTheirSigSecret(); String dataSecret = secretInfoVO.getTheirDataSecret(); @@ -1068,16 +1060,14 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService { vo.setChargeFeeDetail(chargeFeeDetailList); // 通过站点id查询相关配置信息 - ThirdPartyStationRelationVO relationInfo = thirdPartyStationRelationService.selectRelationInfo(stationId); - if (relationInfo == null) { - return null; - } - String operatorId = relationInfo.getOperatorId(); - String operatorSecret = relationInfo.getOperatorSecret(); - String signSecret = relationInfo.getSignSecret(); - String dataSecret = relationInfo.getDataSecret(); - String dataSecretIv = relationInfo.getDataSecretIv(); - String urlAddress = relationInfo.getUrlAddress(); + ThirdPartySecretInfoVO thirdPartySecretInfoVO = getLianLianPlatformSecretInfo(); + + String operatorId = thirdPartySecretInfoVO.getOurOperatorId(); + String operatorSecret = thirdPartySecretInfoVO.getTheirOperatorSecret(); + String signSecret = thirdPartySecretInfoVO.getTheirSigSecret(); + String dataSecret = thirdPartySecretInfoVO.getTheirDataSecret(); + String dataSecretIv = thirdPartySecretInfoVO.getTheirDataSecretIv(); + String urlAddress = thirdPartySecretInfoVO.getTheirUrlPrefix(); String url = urlAddress + "notification_stationFee"; @@ -1129,7 +1119,7 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService { // if (relationInfo == null) { // return null; // } - String operatorId = secretInfoVO.getTheirOperatorId(); + String operatorId = Constants.OPERATORID_LIANLIAN; String operatorSecret = secretInfoVO.getTheirOperatorSecret(); String signSecret = secretInfoVO.getTheirSigSecret(); String dataSecret = secretInfoVO.getTheirDataSecret();