From 4b47d63f3a39c845eebd44a8e2be7d48173f073f Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 23 五月 2023 18:37:23 +0800
Subject: [PATCH] 欧普特眯着

---
 service-job/src/main/java/com/java110/job/adapt/returnMoney/bbg/ReturnPayFeeBbgMoneyAdapt.java |   58 +++-------------------------------------------------------
 1 files changed, 3 insertions(+), 55 deletions(-)

diff --git a/service-job/src/main/java/com/java110/job/adapt/returnMoney/bbg/ReturnPayFeeBbgMoneyAdapt.java b/service-job/src/main/java/com/java110/job/adapt/returnMoney/bbg/ReturnPayFeeBbgMoneyAdapt.java
index 69fedf7..e0ef9f4 100644
--- a/service-job/src/main/java/com/java110/job/adapt/returnMoney/bbg/ReturnPayFeeBbgMoneyAdapt.java
+++ b/service-job/src/main/java/com/java110/job/adapt/returnMoney/bbg/ReturnPayFeeBbgMoneyAdapt.java
@@ -124,15 +124,11 @@
 
         String communityId = "";
 
-        String mchtNo_RSA2 = CommunitySettingFactory.getValue(communityId, "mchtNo_RSA2");
-        String productNo_RSA2 = CommunitySettingFactory.getValue(communityId, "productNo_RSA2");
-        String opToken_RSA2 = CommunitySettingFactory.getValue(communityId, "opToken_RSA2");
-        String mcht_PrivateKey_RSA2 = CommunitySettingFactory.getRemark(communityId, "mcht_PrivateKey_RSA2");
-        String bank_PublicKey_RSA2 = CommunitySettingFactory.getRemark(communityId, "bank_PublicKey_RSA2");
+        String mchtNo_SM4 = CommunitySettingFactory.getValue(communityId, "mchtNo_SM4");
 
         Map<String, Object> params = new HashMap<>();
         params.put("version", VERSION);// 鐗堟湰鍙� 1.0
-        params.put("mcht_no", mchtNo_RSA2);// 鏀舵鍟嗘埛缂栧彿
+        params.put("mcht_no", mchtNo_SM4);// 鏀舵鍟嗘埛缂栧彿
         params.put("tran_no", onlinePayDto.getOrderId());// 鍟嗘埛娴佹按
         params.put("org_txn_no", onlinePayDto.getTransactionId());// 鍘熷钩鍙版祦姘�
         params.put("device_ip", "172.0.0.1");// 璁惧鍙戣捣浜ゆ槗IP
@@ -140,56 +136,8 @@
         params.put("ware_name", onlinePayDto.getPayName());// 鎽樿澶囨敞
 
         // 瀵瑰噯澶囧姞绛惧弬鏁版帓搴�
-        Map<String, Object> soreMap = JsonUtil.sortMapByKey(params);
-        // 鏍煎紡涓簀son
-        String json = JsonUtil.mapToJson(soreMap);
-        System.out.println("鍔犲瘑鍓嶏細" + json);
-        // 寮�濮嬪姞瀵�
-        byte[] en = AesEncrypt.encryptByte(json, "utf-8", opToken_RSA2);
-        if (en == null || en.length <= 0) {
-            System.err.println("鍔犲瘑澶辫触");
-            return;
-        }
-        String encryptBase64Str = AesEncrypt.parseByte2HexStr(en);
-        System.out.println("鍔犲瘑鍚庯細" + encryptBase64Str);
+        String decryParams = EncryptDecryptFactory.execute(communityId, refundUrl, params);
 
-        String signtBase64Str = CAUtil.rsa256Sign(json, "utf-8", mcht_PrivateKey_RSA2);
-        System.out.println("鍔犵涓诧細" + signtBase64Str);
-
-        Map<String, Object> signParams = new HashMap<>();
-        signParams.put("mcht_no", mchtNo_RSA2);// 鏀舵鍟嗘埛缂栧彿
-        signParams.put("sign_type", SIGN_TYPE);
-        signParams.put("sign", signtBase64Str);
-        signParams.put("enc_data", encryptBase64Str);// 鍔犲瘑鍚庤姹傚弬鏁�
-
-        String requestParams = JsonUtil.mapToJson(signParams);
-        System.out.println("鏈�缁堣姹傚弬鏁帮細" + requestParams);
-        System.err.println("");
-        String returnResult = HttpRequestUtil.httpPost(refundUrl, requestParams);
-        System.out.println("鏀粯缁撴灉杩斿洖鍊�(鍘熸枃):" + returnResult);
-        if (returnResult == null) {
-            System.err.println("閫氶亾鍝嶅簲寮傚父");
-            return;
-        }
-        // 寮�濮嬭В瀵�
-        Map<String, Object> responseParams = JsonUtil.jsonToMap(returnResult);
-        // 寮�濮嬭В瀵�
-        String decryptBase64Str = (String) responseParams.get("enc_data");
-        String verifyBase64Str = (String) responseParams.get("sign");
-        byte[] bt = AesEncrypt.parseHexStr2Byte(decryptBase64Str);
-        byte[] decrypt = AesEncrypt.decryptByte(bt, opToken_RSA2);
-        if (decrypt == null) {
-            System.err.println("瑙e瘑澶辫触");
-            return;
-        }
-        boolean isSuccess = CAUtil.rsa256Verify(decrypt, verifyBase64Str, bank_PublicKey_RSA2);
-        System.out.println("鏁版嵁楠岀锛�" + isSuccess);
-        if (!isSuccess) {
-            System.err.println("楠岀澶辫触");
-            return;
-        }
-        String decryParams = new String(decrypt);
-        System.out.println("鏀粯缁撴灉杩斿洖鍊�(瑙e瘑鍚�):" + decryParams);
         JSONObject paramOut = JSONObject.parseObject(decryParams);
         if (!"0000".equals(paramOut.getString("return_code"))
                 || !"SUCCESS".equals(paramOut.getString("status"))

--
Gitblit v1.8.0