From e1f732c12c6ef00f9ff56b059147b2427056dd4c Mon Sep 17 00:00:00 2001 From: "YAS\\29473" <2947326429@qq.com> Date: Thu, 11 Sep 2025 08:49:16 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E8=81=94=E8=81=94?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E6=96=B0=E5=A2=9E=E8=BF=90=E8=90=A5=E5=95=86?= =?UTF-8?q?=E4=B8=8A=E6=B5=B7=E6=B4=BE=E8=8D=B7=E7=A7=91=E6=8A=80=E6=9C=89?= =?UTF-8?q?=E9=99=90=E5=85=AC=E5=8F=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jsowell/common/constant/Constants.java | 3 +++ .../java/com/jsowell/pile/util/MerchantUtils.java | 8 ++++++++ .../service/impl/LianLianPlatformServiceImpl.java | 12 ++++++++++++ .../thirdparty/platform/util/HttpRequestUtil.java | 2 +- 4 files changed, 24 insertions(+), 1 deletion(-) 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 5b5744a5b..803289c10 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 @@ -113,6 +113,9 @@ public class Constants { public static final String OPERATORID_YUAN_DA = "599777560"; + public static final String OPERATORID_PAI_HE = "MACTXP7X8"; + + // public static final String APP_ID = "wxbb3e0d474569481d"; // 举视充电网 wxbb3e0d474569481d // // public static final String APP_SECRET = "bbac689f4654b209de4d6944808ec80b"; // 举视充电网 bbac689f4654b209de4d6944808ec80b 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 6d3362360..daaa3b363 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 @@ -15,6 +15,10 @@ public class MerchantUtils { // 上海之禾服饰有限公司 public static final String ZHI_HE_MERCHANT_ID = "146"; + // 上海派荷科技有限公司 + public static final String PAI_HE_MERCHANT_ID = "367"; + + // 是否是希晓运营商 public static boolean isXiXiaoMerchant(String merchantId) { return StringUtils.equals(XIXIAO_MERCHANT_ID, merchantId); @@ -29,6 +33,10 @@ public class MerchantUtils { return StringUtils.equals(ZHI_HE_MERCHANT_ID, merchantId); } + public static boolean isPaiHeMerchant(String merchantId) { + return StringUtils.equals(PAI_HE_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 cdfe2f4a9..01afc354d 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 @@ -348,6 +348,10 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService { if (MerchantUtils.isZhiHeMerchant(String.valueOf(pileStationInfo.getMerchantId()))) { stationInfo.setEquipmentOwnerID(Constants.OPERATORID_ZHI_HE); } + if( MerchantUtils.isPaiHeMerchant(String.valueOf(pileStationInfo.getMerchantId()))){ + stationInfo.setEquipmentOwnerID(Constants.OPERATORID_PAI_HE); + } + List pileList = pileBasicInfoService.getPileListForLianLian(stationId); if (CollectionUtils.isNotEmpty(pileList)) { @@ -621,6 +625,10 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService { if (MerchantUtils.isZhiHeMerchant(String.valueOf(pileStationInfo.getMerchantId()))) { info.setEquipmentOwnerID(Constants.OPERATORID_ZHI_HE); } + if( MerchantUtils.isPaiHeMerchant(String.valueOf(pileStationInfo.getMerchantId()))){ + info.setEquipmentOwnerID(Constants.OPERATORID_PAI_HE); + } + String payment = StationPaymentEnum.getPaymentByCode(pileStationInfo.getPayment()); info.setPayment(payment); if (StringUtils.isNotBlank(pileStationInfo.getParkingNumber())) { @@ -982,6 +990,10 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService { logger.info("订单号：{} 为之禾运营商订单", orderBasicInfo.getOrderCode()); orderInfo.setEquipmentOwnerID(Constants.OPERATORID_ZHI_HE); } + if( MerchantUtils.isPaiHeMerchant(String.valueOf(orderBasicInfo.getMerchantId()))){ + orderInfo.setEquipmentOwnerID(Constants.OPERATORID_PAI_HE); + } + // 支付方式 if (StringUtils.equals(orderBasicInfo.getPayMode(), OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue())) { // 微信支付 diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/util/HttpRequestUtil.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/util/HttpRequestUtil.java index f84621db6..41562ed1e 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/util/HttpRequestUtil.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/util/HttpRequestUtil.java @@ -156,7 +156,7 @@ public class HttpRequestUtil { String postData = JSON.toJSONString(params); // log.info(label + "发送请求 最终提交数据:{}, 加密数据:{}", params, postData); - log.info("[{}]准备发送请求, 原始data:{}, 请求param:{}", label, data, postData); + log.info("[{}]准备发送请求, 原始data:{}, 请求param:{},token:{}", label, data, postData,token); String response = HttpRequest.post(url).header("Authorization", "Bearer " + token).body(postData).execute().body();