Merge branch 'hotfix2' into develop

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

@@ -315,7 +315,7 @@ public class TestController implements ApplicationEventPublisherAware {
                 res.put("xml", xml);
                 break;
             case "Alipay":
-                elem = alipayClient.retailRefund(type, refundOrder.getBigDecimal("refund_exchange_rate"), refundOrder);
+                elem = alipayClient.retailRefund(type, refundOrder.getBigDecimal("refund_exchange_rate"), refundOrder,AlipayEnvironment.getEnv().getAlipayRetailMerchant().getPid());
                 String xmlStr = XmlFormatUtils.formatXml(elem);
                 res.put("xml", xmlStr);
                 break;
@@ -330,7 +330,7 @@ public class TestController implements ApplicationEventPublisherAware {
                 res.put("xml", xmlStr);
                 break;
             case "AlipayOnline":
-                elem = alipayClient.onlineRefund(refundOrder, type == TradeType.GATEWAY_H5);
+                elem = alipayClient.onlineRefund(refundOrder,AlipayEnvironment.getEnv().getAlipayOnlineMerchant().getPid(), type == TradeType.GATEWAY_H5);
                 xmlStr = XmlFormatUtils.formatXml(elem);
                 res.put("xml", xmlStr);
                 break;