Merge branch 'hotfix2' into develop

src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java

@@ -1,5 +1,6 @@
 package au.com.royalpay.payment.manage.dev.web;
 
+import au.com.royalpay.payment.channels.alipay.config.AlipayEnvironment;
 import au.com.royalpay.payment.channels.alipay.runtime.AlipayClient;
 import au.com.royalpay.payment.channels.bestpay.runtime.BestPayClient;
 import au.com.royalpay.payment.channels.jd.runtime.JDClient;
@@ -270,7 +271,7 @@ public class TestController implements ApplicationEventPublisherAware {
                 res.put("xml", xmlStr);
                 break;
             case "Alipay":
-                elem = alipayClient.checkRetailOrderStatusByOrderId(orderId);
+                elem = alipayClient.checkRetailOrderStatusByOrderId(orderId, AlipayEnvironment.getEnv().getAlipayRetailMerchant().getPid());
                 xmlStr = XmlFormatUtils.formatXml(elem);
                 res.put("xml", xmlStr);
                 break;
@@ -285,7 +286,7 @@ public class TestController implements ApplicationEventPublisherAware {
                 res.put("xml", xmlStr);
                 break;
             case "AlipayOnline":
-                elem = alipayClient.checkOnlineOrderStatusByOrderId(orderId);
+                elem = alipayClient.checkOnlineOrderStatusByOrderId(orderId,AlipayEnvironment.getEnv().getAlipayOnlineMerchant().getPid());
                 xmlStr = XmlFormatUtils.formatXml(elem);
                 res.put("xml", xmlStr);
                 break;