第三方联联平台新增运营商上海派荷科技有限公司

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

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

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<EquipmentInfo> 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())) {
             // 微信支付

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();