msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix 全量备份超时报错

Browse Source
master
luoyang 5 years ago
parent 8c32b331ad
commit 52fda84527
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File

2
pom.xml
Unescape View File

@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>manage</artifactId> <artifactId>manage</artifactId>
<version>1.0.27</version> <version>1.0.28</version>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

35
src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java
Unescape View File

@ -129,24 +129,31 @@ public class AliforexcelServiceImpl implements AliforexcelService {
lessInfoMerchant.add(exception); lessInfoMerchant.add(exception);
continue; continue;
} }
AlipayConfig.AlipayMerchant mch = AlipayEnvironment.getEnv().getAlipayOnlineMerchant(); try {
Element resultElement = alipayClient.registerOnlineGmsPortal(mch.getPid(), client); AlipayConfig.AlipayMerchant mch = AlipayEnvironment.getEnv().getAlipayOnlineMerchant();
if (!StringUtils.equalsIgnoreCase("T", resultElement.elementText("is_success"))) { Element resultElement = alipayClient.registerOnlineGmsPortal(mch.getPid(), client);
JSONObject exception = new JSONObject(); if (!StringUtils.equalsIgnoreCase("T", resultElement.elementText("is_success"))) {
exception.put("client_moniker", client.getString("client_moniker")); JSONObject exception = new JSONObject();
exception.put("return_msg", resultElement.elementText("error")); exception.put("client_moniker", client.getString("client_moniker"));
registerFailMerchant.add(exception); exception.put("return_msg", resultElement.elementText("error"));
continue; registerFailMerchant.add(exception);
} continue;
Element responseElement = resultElement.element("response").element("alipay"); }
if (!StringUtils.equalsIgnoreCase("SUCCESS", responseElement.elementText("result_code"))) { Element responseElement = resultElement.element("response").element("alipay");
if (!StringUtils.equalsIgnoreCase("SUCCESS", responseElement.elementText("result_code"))) {
JSONObject exception = new JSONObject();
exception.put("client_moniker", client.getString("client_moniker"));
exception.put("return_msg", resultElement.elementText("error"));
registerFailMerchant.add(exception);
continue;
}
registerSuccessMerchant.add(client.getString("client_moniker"));
} catch (Exception e) {
JSONObject exception = new JSONObject(); JSONObject exception = new JSONObject();
exception.put("client_moniker", client.getString("client_moniker")); exception.put("client_moniker", client.getString("client_moniker"));
exception.put("return_msg", resultElement.elementText("error")); exception.put("return_msg", e.getMessage());
registerFailMerchant.add(exception); registerFailMerchant.add(exception);
continue;
} }
registerSuccessMerchant.add(client.getString("client_moniker"));
} }
result.put("need_register_merchant", needRegisterMerchant); result.put("need_register_merchant", needRegisterMerchant);
result.put("success_register_merchant", registerSuccessMerchant); result.put("success_register_merchant", registerSuccessMerchant);

Write Preview
Loading…
Cancel
Save