alipay gms query hotfix

src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java

@@ -5829,16 +5829,16 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
             throw new InvalidShortIdException();
         }
         checkOrgPermission(manager, client);
+        try {
             AlipayMerchantEntity alipayMch = merchantChannelApplicationManager.getRegister(AlipayRetailApi.class).findMerchant(client);
-        Element resultElement = alipayMch.getRawResponseXml();
-        if (!StringUtils.equalsIgnoreCase("T", resultElement.elementText("is_success"))) {
-            return "查询成功：" + resultElement.elementText("error");
-        }
-        Element responseElement = resultElement.element("response").element("alipay");
+            Element responseElement = alipayMch.getRawResponseXml();
             String rejectReason = responseElement.elementText("reject_reason");
             return "查询成功:" + responseElement.elementText("secondary_merchant_id") +
                     "报备状态:" + responseElement.elementText("status") + StringUtils.defaultString(rejectReason, "");
-
+        }catch (BadRequestException e){
+            logger.error(e.getMessage(),e);
+            return e.getMessage();
+        }
     }
 
     @Override
@@ -5969,17 +5969,17 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         if (client == null) {
             throw new InvalidShortIdException();
         }
-        AlipayConfig.AlipayMerchant mch = AlipayEnvironment.getEnv().getAlipayOnlineMerchant();
+        try {
             AlipayMerchantEntity entity = merchantChannelApplicationManager.getRegister(AlipayOnlineApi.class)
                     .findMerchant(client);
-        Element resultElement = entity.getRawResponseXml();
-        if (!StringUtils.equalsIgnoreCase("T", resultElement.elementText("is_success"))) {
-            return "查询成功：" + resultElement.elementText("error");
-        }
-        Element responseElement = resultElement.element("response").element("alipay");
+            Element responseElement = entity.getRawResponseXml();
             String rejectReason = responseElement.elementText("reject_reason");
             return "查询成功:" + responseElement.elementText("secondary_merchant_id") +
                     "报备状态:" + responseElement.elementText("status") + StringUtils.defaultString(rejectReason, "");
+        } catch (BadRequestException e) {
+            logger.error(e.getMessage(), e);
+            return e.getMessage();
+        }
     }
 
     @Override