diff --git a/pom.xml b/pom.xml
index 55932b945..107be3249 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,12 +5,12 @@
au.com.royalpay.payment
payment-parent
- 1.0.1
+ 1.0.4
4.0.0
manage
- 1.0.26
+ 1.0.28
UTF-8
diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java
index 46a94aec3..04e8acdfe 100644
--- a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java
@@ -21,6 +21,8 @@ import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.dom4j.Element;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -44,6 +46,8 @@ public class AliforexcelServiceImpl implements AliforexcelService {
private AlipayClient alipayClient;
@Resource
private OrderMapper orderMapper;
+ private Logger logger = LoggerFactory.getLogger(getClass());
+
@Override
public JSONObject listClients(HttpServletResponse httpResponse,JSONObject manager, AliExcel query) {
@@ -105,7 +109,7 @@ public class AliforexcelServiceImpl implements AliforexcelService {
List registerSuccessMerchant = new ArrayList<>();
List registerFailMerchant = new ArrayList<>();
List lessInfoMerchant = new ArrayList<>();
- List useAlipayOnlineMerchant = transactionMapper.useAlipayOnlineClients();
+ List useAlipayOnlineMerchant = clientMapper.listUseAlipayMerchant();
for (int clientId : useAlipayOnlineMerchant) {
JSONObject client = clientMapper.findClient(clientId);
if (client == null) {
@@ -113,6 +117,9 @@ public class AliforexcelServiceImpl implements AliforexcelService {
}
try {
needRegisterMerchant.add(client.getString("client_moniker"));
+ if (StringUtils.isBlank(client.getString("company_website"))) {
+ client.put("company_website", client.getString("ali_sub_merchant_id")+".royalpay.com.au");
+ }
checkPartnerInfo(client,"online");
} catch (InvalidParameterException e) {
JSONObject exception = new JSONObject();
@@ -122,29 +129,37 @@ public class AliforexcelServiceImpl implements AliforexcelService {
lessInfoMerchant.add(exception);
continue;
}
- AlipayConfig.AlipayMerchant mch = AlipayEnvironment.getEnv().getAlipayOnlineMerchant();
- Element resultElement = alipayClient.registerOnlineGmsPortal(mch.getPid(), client);
- if (!StringUtils.equalsIgnoreCase("T", resultElement.elementText("is_success"))) {
- JSONObject exception = new JSONObject();
- exception.put("client_moniker", client.getString("client_moniker"));
- exception.put("return_msg", resultElement.elementText("error"));
- registerFailMerchant.add(exception);
- continue;
- }
- Element responseElement = resultElement.element("response").element("alipay");
- if (!StringUtils.equalsIgnoreCase("SUCCESS", responseElement.elementText("result_code"))) {
+ try {
+ AlipayConfig.AlipayMerchant mch = AlipayEnvironment.getEnv().getAlipayOnlineMerchant();
+ Element resultElement = alipayClient.registerOnlineGmsPortal(mch.getPid(), client);
+ if (!StringUtils.equalsIgnoreCase("T", resultElement.elementText("is_success"))) {
+ JSONObject exception = new JSONObject();
+ exception.put("client_moniker", client.getString("client_moniker"));
+ exception.put("return_msg", resultElement.elementText("error"));
+ registerFailMerchant.add(exception);
+ continue;
+ }
+ 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();
exception.put("client_moniker", client.getString("client_moniker"));
- exception.put("return_msg", resultElement.elementText("error"));
+ exception.put("return_msg", e.getMessage());
registerFailMerchant.add(exception);
- continue;
}
- registerSuccessMerchant.add(client.getString("client_moniker"));
}
result.put("need_register_merchant", needRegisterMerchant);
result.put("success_register_merchant", registerSuccessMerchant);
result.put("fail_register_merchant", registerFailMerchant);
result.put("less_info_merchant", lessInfoMerchant);
+ logger.info("-------AlipayOnline Gms end----fail_register_merchant"+registerFailMerchant.toString());
return result;
}
diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java
index a142120c2..062933a06 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java
@@ -136,4 +136,7 @@ public interface ClientMapper {
int getPartnercode(@Param("codes") String codes);
JSONObject findCountByBd(@Param("bd_group") String bd_group, @Param("today") Date today, @Param("yesterday") Date yesterday, @Param("month") Date month);
+
+ List listUseAlipayMerchant();
+
}
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml
index 663dfd9f2..e38fbae78 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml
@@ -735,6 +735,9 @@
WHERE address= #{address}
GROUP BY
address
+
+