listLevel3Client(int client_id);
@@ -505,24 +507,30 @@ public interface ClientManager {
/**
* 保存/修改增值服务配置
+ *
* @param clientMoniker
* @param incrementalService
*/
- void changePartnerIncrementalService(String clientMoniker, JSONObject incrementalService,JSONObject manager);
+ void changePartnerIncrementalService(String clientMoniker, JSONObject incrementalService, JSONObject manager);
/**
* 禁用/启用增值服务
+ *
* @param clientMoniker
* @param incrementalService
*/
- void changeSwitchIncrementalService(String clientMoniker, JSONObject incrementalService,JSONObject manager);
+ void changeSwitchIncrementalService(String clientMoniker, JSONObject incrementalService, JSONObject manager);
/**
* 获取商户增值服务详情
+ *
* @param clientMoniker
* @return
*/
JSONObject partnerIncrementalServiceInfo(String clientMoniker, String incrementalId);
JSONObject findByLookupCode(String code);
+
+ RSvcMchBean findSvcMchByAccountId(String accountId);
+
}
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
index 216339750..26a4f6dd8 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
@@ -17,6 +17,7 @@ import au.com.royalpay.payment.core.PaymentChannelApi;
import au.com.royalpay.payment.core.exceptions.EmailException;
import au.com.royalpay.payment.core.exceptions.InvalidShortIdException;
import au.com.royalpay.payment.core.mappers.SysClientMapper;
+import au.com.royalpay.payment.manage.appclient.beans.RSvcMchBean;
import au.com.royalpay.payment.tools.defines.IncrementalChannel;
import au.com.royalpay.payment.core.utils.OrderExpiryRuleResolver;
import au.com.royalpay.payment.manage.analysis.mappers.TransactionAnalysisMapper;
@@ -6160,14 +6161,33 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
}
@Override
- public JSONObject findByLookupCode(String code){
+ public JSONObject findByLookupCode(String code) {
JSONObject industryInfo = industryLookupMapper.findByLookupCode(code);
- if(industryInfo==null){
- return new JSONObject(){{
- put("lookup_code","未知行业");
+ if (industryInfo == null) {
+ return new JSONObject() {{
+ put("lookup_code", "code");
+ put("lookup_value", "未知行业");
}};
}
return industryInfo;
}
+ @Override
+ public RSvcMchBean findSvcMchByAccountId(String accountId) {
+ JSONObject mchInfo = clientAccountMapper.findRSvcClientInfo(accountId);
+ if (mchInfo == null || mchInfo.isEmpty()) {
+ throw new BadRequestException("Client Not Exists!");
+ }
+ RSvcMchBean svcMchBean = new RSvcMchBean();
+ svcMchBean.setMerchantNumber(mchInfo.getString("username"));
+ svcMchBean.setMerchantName(mchInfo.getString("short_name"));
+ svcMchBean.setPartnerCode(mchInfo.getString("client_moniker"));
+ svcMchBean.setCredentialCode(mchInfo.getString("credential_code"));
+ svcMchBean.setPayHost(PlatformEnvironment.getEnv().mainHost());
+ svcMchBean.setLogo(mchInfo.getString("logo_url"));
+ svcMchBean.setIndustryCode(mchInfo.getString("industry"));
+ svcMchBean.setIndustryName(findByLookupCode(mchInfo.getString("industry")).getString("lookup_value"));
+ return svcMchBean;
+ }
+
}
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.xml
index 8abdc3f0d..b1b473e4a 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.xml
@@ -41,4 +41,24 @@
ORDER BY a.create_time DESC
limit 1
+
diff --git a/src/main/ui/static/invoice/templates/invoice_assistant.html b/src/main/ui/static/invoice/templates/invoice_assistant.html
index db6e5a9a0..ce19512fe 100644
--- a/src/main/ui/static/invoice/templates/invoice_assistant.html
+++ b/src/main/ui/static/invoice/templates/invoice_assistant.html
@@ -212,7 +212,7 @@
uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
- {{trade.order_id2}}
+ {{trade.order_id2}}
|
|
diff --git a/src/main/ui/static/payment/tradelog/templates/balance_report.html b/src/main/ui/static/payment/tradelog/templates/balance_report.html
index 7757cbf73..d926fa4bc 100644
--- a/src/main/ui/static/payment/tradelog/templates/balance_report.html
+++ b/src/main/ui/static/payment/tradelog/templates/balance_report.html
@@ -346,7 +346,7 @@
uib-tooltip="Yeepay" ng-if="trade.channel=='Yeepay'"/>
- {{trade.order_id2}}
+ {{trade.order_id2}}
|
|
diff --git a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
index 98690f9b4..a84cd2ce9 100644
--- a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
@@ -442,7 +442,7 @@
- {{trade.order_id}}
+ {{trade.order_id}}
{{trade.total_amount|currency:trade.currency+' '}}
diff --git a/src/main/ui/static/payment/tradelog/templates/trade_logs.html b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
index 1b2d1b30e..61f08ded5 100644
--- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
@@ -486,7 +486,7 @@
uib-tooltip="Yeepay" ng-if="trade.channel=='Yeepay'"/>
- {{trade.order_id}}
+ {{trade.order_id}}
|
{{trade.total_amount|currency:trade.currency}}
diff --git a/src/test/java/au/com/royalpay/payment/manage/valid/JPinYinTest.java b/src/test/java/au/com/royalpay/payment/manage/valid/JPinYinTest.java
index 46c8871e7..cef5a20dd 100644
--- a/src/test/java/au/com/royalpay/payment/manage/valid/JPinYinTest.java
+++ b/src/test/java/au/com/royalpay/payment/manage/valid/JPinYinTest.java
@@ -1,11 +1,23 @@
package au.com.royalpay.payment.manage.valid;
import au.com.royalpay.payment.manage.analysis.beans.ato.CharacterUtils;
+import au.com.royalpay.payment.manage.appclient.beans.RSvcMchBean;
+import au.com.royalpay.payment.tools.codec.AESCrypt;
+import au.com.royalpay.payment.tools.encryptalgorithm.SignUtils;
+import com.alibaba.fastjson.JSONObject;
import com.github.stuxuhai.jpinyin.PinyinException;
-import com.github.stuxuhai.jpinyin.PinyinFormat;
-import com.github.stuxuhai.jpinyin.PinyinHelper;
+import org.apache.commons.net.util.Base64;
import org.junit.Test;
+import javax.crypto.BadPaddingException;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+import java.nio.charset.StandardCharsets;
+import java.security.InvalidKeyException;
+import java.security.Key;
+import java.security.NoSuchAlgorithmException;
+import java.security.spec.InvalidKeySpecException;
+
/**
* Create by yixian at 2018-09-06 8:57
*/
@@ -16,4 +28,38 @@ public class JPinYinTest {
System.out.println(CharacterUtils.convertFullWidthToHalfWidth(CharacterUtils.convertToPinYin(test)));
}
+
+ @Test
+ public void testRSA() throws NoSuchPaddingException, NoSuchAlgorithmException, IllegalBlockSizeException, BadPaddingException, InvalidKeyException, InvalidKeySpecException {
+ String rsa1_pub = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlxNzoulC++qq9a37bvNe5hyoWhlybZxrOGXRunMK84zpTlCL1tDfiwVYuXipAH8z9U0GcU6noEeY1WqIDftK89zLiUtOEkIMZsIDkiuCbJip61ArhI/oRhb6DeyRk9oLo+5kO428ZOr/9NdVJUapMEqKSEvdMzDvnU5ruU7jBcUZpLkn108478OcNTptxAvy4+xaErij8BOuIooG6F2IfIRz9TfcYV7ycaD449lks64oeMZJok+Gr+NyD8YXJDQrVw5tP1LUwDjQHJanmShCrPboSXKF6+h2Puv8F8Iy+vXZdP3Y6X9VHJdjBn3nMaohIrbuK9YCjTOAue+lFPzK+wIDAQAB";
+ String rsa1_pri = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCXE3Oi6UL76qr1rftu817mHKhaGXJtnGs4ZdG6cwrzjOlOUIvW0N+LBVi5eKkAfzP1TQZxTqegR5jVaogN+0rz3MuJS04SQgxmwgOSK4JsmKnrUCuEj+hGFvoN7JGT2guj7mQ7jbxk6v/011UlRqkwSopIS90zMO+dTmu5TuMFxRmkuSfXTzjvw5w1Om3EC/Lj7FoSuKPwE64iigboXYh8hHP1N9xhXvJxoPjj2WSzrih4xkmiT4av43IPxhckNCtXDm0/UtTAONAclqeZKEKs9uhJcoXr6HY+6/wXwjL69dl0/djpf1Ucl2MGfecxqiEitu4r1gKNM4C576UU/Mr7AgMBAAECggEAFPmbZXPzW9yB7ehA72+UrmguK4w66eL8s/DXBIbyb0wSHFBsid+oGbodTmrlM+91PEp8aYDdHxCxtHe8+gv4pRDzpVUyOrC23hFzw3iM/BzaApS35gjA2/JWt1YwBBIS6aiwe+A61twVu12mMa200cKXnmACDxhtPC7mH+1G8cbsG23qW2LnbZoMAa8CtaE8/oVi57AsoxYdK2mEh0wgwdIVpDANWnS7WRr9Qb3VzcJNFkcd1ngt5NdjmtJaAfkV0JZuANWG/7exrUFkzTiaejeKCn3hCEmT4yD7D+27WLzrjOJDFOaPmQjcLYpWxQsckxAG1PCZcyZbW99QVl4XmQKBgQDLi9f4TwZFb55fHM9kja7KP8Ts34z6vlE2RPzd5gf6Zdt3yFxh/nl8e1m+SPzgUZnrlaSyP4HMKsEoLOGCCqyuHjxE3u8S4Y6pzZOxfD+j5t30cSfGbflyRnE1vhsHsNeQ4sx9Slcj2erZeI1IeKXbA3Z4bI5x7g4xiF8ufhMeDQKBgQC+Ahb1JNIO3JVlR5mWmcQkrlQCLCJznjoXQ2ikhtwJ4j/Gg6JZUD2OjnqX2gzIB+6DYI0Xfv6Ph31DuAQ1/pLG+Q9rRicox9PkDV7nol6ZPH0peCECVf40FvQWXlt6crWkNk8ukrQJi5Y/msFCmR1v9DA6ovaxr/KfvNA9QmlTJwKBgDaDbYQDJhrSmge/H4w+peFk0sjd1lQRRI7USyTixqA5R139O0DDdqXwI0jjI1awhBikK0fR2mFj0feAjaTWVwkK7/lB+6WC40J23Gdcb27mFeuxooVyTqxcUVWjZHna0uDq3PlxP4VKh6tWrgAKz+CoPMJj0IKSzxpU+6jn+xbBAoGAc0zfU4kxctVGTvxA5lOO49dpoRvZGCHnDGDaaiRv+At0Oel9Jgd8Izqwh99IrEWr5cs8MwrcPIqyZ9qNq5o8xUMzqRwb/TItkZDPi25LS1+acAS2uy0locRgAAboKgjb0rcmG5PobnZnCVfGeLxjUaFzdtGXM8IaT/aKwvG+6jcCgYEAnyMYkTyyyPlzJRdvQz/ovuXzI+dRvDGbkOpwZcCp5JukoQGSZvy8LCDbiMjKXq1q2/PfUdYxvala7pCBstX7MHg4dy8UvZAnAVy1jM6sJs2zXsR3d4F6/GlVO0aLd0spEgmxqEnLl84F/bRwypr6CzqpkROxUa/SbtdxSjXFqOA=";
+ String rsa2_pub = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoDwO29Hs7XCm7bEhNVs57Jfgr+kj0vivPcX3XvIs+jXQzvMDfNrnwcsI3cNqQ/4+tVmt9ie8Qy1yn4mjJW4Leuv+2CqIRkOmzohwzjN2F1ue4EaNUF0YJaM1OTYhTMxud/6h05h4fVapuAycJ5NZ9fZW+7pV73Jn4ZMm5pIdE4m+NDcqVUyrBqBsxmJ0QVf6qpvfU5zE9a3PhLK4YhnLT278B+J+yGKFiNO/0W5KMpVcLSZ9e29x/aPFu+SyqmkJfGECNmvRKD3JkD3+YnCBR/TQLHPallL/mUDBc7kLQqkhzdEXepfPVg99K7PggNcsyIlUMmSP9SsSUcmXLUUcHwIDAQAB";
+ String rsa2_pri = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCgPA7b0eztcKbtsSE1Wznsl+Cv6SPS+K89xfde8iz6NdDO8wN82ufBywjdw2pD/j61Wa32J7xDLXKfiaMlbgt66/7YKohGQ6bOiHDOM3YXW57gRo1QXRglozU5NiFMzG53/qHTmHh9Vqm4DJwnk1n19lb7ulXvcmfhkybmkh0Tib40NypVTKsGoGzGYnRBV/qqm99TnMT1rc+EsrhiGctPbvwH4n7IYoWI07/RbkoylVwtJn17b3H9o8W75LKqaQl8YQI2a9EoPcmQPf5icIFH9NAsc9qWUv+ZQMFzuQtCqSHN0Rd6l89WD30rs+CA1yzIiVQyZI/1KxJRyZctRRwfAgMBAAECggEAYpexuNY5h3vqapSzz0XbpVVqXjMA5P45rbPS2uv+etKEMeJbggab1aVdRj7Icx/Ma//LR4v5jgg34CxrY0uL6s2tGEtLYJid2bUgW/BUOFkar/sZVpqBkh8TT6mb4cpkKpdV8YF+mfiqI2I27y7+ipZRvUBRQi1N+AF4TSUYmP0N+l+13y+ndDAi45qzhhsyF7aD50jZ6cRK35PqkgWx9vEhnDHBUYVWIJ3V5D/fFiJHjTX8+a/pC8SriQvvi3p1sUdcMil3qn/6J/rytZ331h1f7IcHaR3RRfJrVd0g9JT4jUOx1wzZTLw3ZxEK3xKMRDHCIpYkDBti4fk00nZ9IQKBgQDLHUCIlNEA3WQcee/t1031N5VzxDRTy4SHW6jgDsllHOcvC2URIBga4mbczS5MYlZ2Jll3iyqDBD8FDhCdf5CE5Ey2N4DxSKPzHSqn+rdvQRAs2QaVPUcND63V7J5mpp97MzsqWzBiESG0jIoNys0IrpdrqHCkcMAtOukEZ9o+MQKBgQDJ9KB086XiS3gIYqgfutF2QuTTpm9sjuPr3Ij1Xq6xPo3Dxc1nCMNx8dnka0erwPZ1bypbQcvgjxjxuow1XsnbvY9dQpmg51eH1/oFoXHeuY4qel5LnODJ05RSPK25bYX29ezV4Fp+LX/5ZRQwJXojPvZhxB8i0RdMiNmPQzjbTwKBgQCRB0sL+w6dSndwKdUag5CjllO9fIxMhNYVfGpBye0dqJyeJ8m7h6oOkDgYUt1LJzBLXqilRhZNxJtm9ZsBipNbgFQSC+Gi51ZBgkLx/IA8DT4Kd9BOgZmZBuf+Bt03uKPJaVRGsyQB8e+aJntwy6zJFTkDYxtDH0rpQNYfEjRwEQKBgA+p3IQVnakWh2HHHRkQ6UwN1iegQgYecwkJGspFJLF0k5Q6lDrIkDgXNPolY/KrTbJAA/399W0eTCX7fQJqrqdPZX4rOzUinERZ+PdU1TscEy2yPfwJV9nvghJ6yFKYbwp/enYAJ6SfrMxQDafKUFXJfVyJ1IxjwTXba1xUL2W7AoGAc6PzW66wEVYqvzfWzWr22tR0JS87b0h9eqyqHib5XATKmpKpJztMZvgj50fCGWxWcwW+QoEoxFZqRXWiFiS1Tax+UY7QDRF55JOOfZyl1+eerAQAq99sVg0QAom/9V4jZNfX3JZvIYI15opGSdI2hsRrtW7CBvYxsGz7mT3cLoE=";
+ RSvcMchBean aaa = new RSvcMchBean();
+ aaa.setMerchantNumber("taylor");
+ aaa.setIndustryName("其他服务行业");
+ aaa.setIndustryCode("331");
+ aaa.setCredentialCode("7dlXrdvhyuN73NDpZsGYftdIMuZms1Qc");
+ aaa.setLogo("https://file.royalpay.com.au/open/2017/07/24/1500898932409_7uFGyWIpk4IRTQyT3INk2Nk3KHedOG.png");
+ aaa.setPayHost("http://192.168.1.6:9008/");
+ aaa.setPartnerCode("PINE");
+ aaa.setMerchantName("TEST");
+ String pubKeyEncCredentialCode = SignUtils.encData(aaa.getCredentialCode(), rsa1_pub);
+ String aesKeyStr = Base64.encodeBase64String(AESCrypt.randomKey().getEncoded());
+ Key key = AESCrypt.fromKeyString(Base64.decodeBase64(aesKeyStr));
+ String decCredentialCode = Base64.encodeBase64String(AESCrypt.encrypt(pubKeyEncCredentialCode.getBytes(StandardCharsets.UTF_8), key));
+ JSONObject result = (JSONObject) JSONObject.toJSON(aaa);
+ result.put("sign_type", "RSA2");
+ result.put("enc_data", decCredentialCode);
+ result.put("nonce_str", aesKeyStr);
+ result.put("timestamp", System.currentTimeMillis());
+ result.put("sign", SignUtils.buildSign(result.toJSONString(), rsa2_pri));
+ System.err.println(result);
+ String signa = result.getString("sign");
+ result.remove("sign");
+ SignUtils.checkStringSign(result.toJSONString(), signa, rsa2_pub);
+ String aesData = new String(AESCrypt.decrypt(Base64.decodeBase64(result.getString("enc_data")), key), StandardCharsets.UTF_8);
+ System.err.println(SignUtils.decData(aesData, rsa1_pri));
+
+ }
}
|