Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/service/impl/PayServiceImpl.java

@@ -47,13 +47,13 @@ public class PayServiceImpl implements PayService {
         //支付通道决策
         SysAccount routingAccount = getRoutingAccount(amount);
         Map unionPay = new HashMap();
-        Map payMap = new Pay().getPayMap(amount, orderNo, notifyUrl, orderSubject, orderBody);
+        //Map payMap = new Pay().getPayMap(amount, orderNo, notifyUrl, orderSubject, orderBody);
 
         unionPay.put("orderNo", orderNo);
-        unionPay.put("type", "ADAPAY");
+       // unionPay.put("type", "ADAPAY");
 
-       // Map payMap = YqPayUtil.getPayMap(amount, orderNo, notifyUrl, returnUrl, orderSubject, orderBody, null);
-       // unionPay.put("type", "YQPAY");
+        Map payMap = YqPayUtil.getPayMap(amount, orderNo, notifyUrl, returnUrl, orderSubject, orderBody, null);
+        unionPay.put("type", "YQPAY");
         unionPay.put("payMap", payMap);
 
         return unionPay;