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 7d6fb6495..c0cb1d32d 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 @@ -160,30 +160,36 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService { public static void main(String[] args) { // 中电联平台 - String operatorId = "14405899X"; - String operatorSecret = "EOub5WNbERyOedvk"; - String dataSecret = "vj3RWNsWIxT5MC0K"; - String dataSecretIv = "jjkySnGlM3pbOUki"; - String signSecret = "NbELMbWtbHikNSlu"; + // String operatorId = "14405899X"; + // String operatorSecret = "EOub5WNbERyOedvk"; + // String dataSecret = "vj3RWNsWIxT5MC0K"; + // String dataSecretIv = "jjkySnGlM3pbOUki"; + // String signSecret = "NbELMbWtbHikNSlu"; + // + // String data = "JdVMdw0JVYvouzS4WA9APlqKyQJuTuvh43lDYGaVccrvMboNTVajQdkvtLfqq3+lxlUXkokSkGSDsmxNkUT/SQ=="; + // String Seq = "0029"; + // String sig = "C6410BF5C7185CAE8594846E006740E1"; + // String timeStamp = "2024-03-27 16:18:39"; + // + // // 解密data 获取参数中的OperatorSecret + // try { + // String decrypt = Cryptos.decrypt(data, dataSecret, dataSecretIv); + // String inputOperatorSecret = null; + // if (StringUtils.isNotBlank(decrypt)) { + // inputOperatorSecret = JSON.parseObject(decrypt).getString("OperatorSecret"); + // } + // if (!StringUtils.equals(operatorSecret, inputOperatorSecret)) { + // throw new RuntimeException("密钥不一致"); + // } + // } catch (RuntimeException e) { + // throw new BusinessException("2", "密钥错误"); + // } - String data = "JdVMdw0JVYvouzS4WA9APlqKyQJuTuvh43lDYGaVccrvMboNTVajQdkvtLfqq3+lxlUXkokSkGSDsmxNkUT/SQ=="; - String Seq = "0029"; - String sig = "C6410BF5C7185CAE8594846E006740E1"; - String timeStamp = "2024-03-27 16:18:39"; - - // 解密data 获取参数中的OperatorSecret - try { - String decrypt = Cryptos.decrypt(data, dataSecret, dataSecretIv); - String inputOperatorSecret = null; - if (StringUtils.isNotBlank(decrypt)) { - inputOperatorSecret = JSON.parseObject(decrypt).getString("OperatorSecret"); - } - if (!StringUtils.equals(operatorSecret, inputOperatorSecret)) { - throw new RuntimeException("密钥不一致"); - } - } catch (RuntimeException e) { - throw new BusinessException("2", "密钥错误"); - } + String a = "146"; + String s = String.valueOf(a); + System.out.println(s); + boolean zhiHeMerchant = MerchantUtils.isZhiHeMerchant(s); + System.out.println(zhiHeMerchant); } @@ -914,7 +920,8 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService { // 远大 orderInfo.setEquipmentOwnerID(Constants.OPERATORID_YUAN_DA); } - if (MerchantUtils.isZhiHeMerchant(String.valueOf(orderBasicInfo.getMerchantId()))) { + if (MerchantUtils.isZhiHeMerchant(orderBasicInfo.getMerchantId())) { + logger.info("订单号:{} 为之禾运营商订单", orderBasicInfo.getOrderCode()); orderInfo.setEquipmentOwnerID(Constants.OPERATORID_ZHI_HE); } // 支付方式