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

Merge remote-tracking branch 'origin/master'

Browse Source
master
eason 8 years ago
parent 78ab90501b 0e65780bbe
commit 8a61e47a50
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File

9
src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java
Unescape View File

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

Write Preview
Loading…
Cancel
Save