修改支付问题

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderPayBiz.java

@@ -116,7 +116,11 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
             jsParam = WXPay.apppay(amount + "", orderPayVo.getBody(), notify_url, trade_no, orderPayVo.getBuyerIp(), 0);
         } else if (type == 1 && payWay == 2) {
             sellerAccount = SystemConfig.ALIPAY_PID;
-            orderPayVo.setPayType(2);
+            //支付宝支付类型：1、APP支付，2、预授权支付
+            //预授权支付
+            //orderPayVo.setPayType(2);
+            //普通支付
+            orderPayVo.setPayType(1);
             jsParam = generateAliPayment(orderPayVo, notifyUrl);
         } else if (type == 3 && payWay == 1) {
             sellerAccount = SystemConfig.APP_PARTNER;
@@ -271,6 +275,10 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
         AlipayClient alipayClient = getAlipayClient();
         //实例化具体API对应的request类,类名称和接口名称对应,当前调用接口名称：alipay.trade.app.pay
         try {
+            //预授权冻结
+            //return fundAuthOrderAppFreeze(alipayClient, orderPayVo, notifyUrl);
+
+            //普通支付
             return appOrderPay(alipayClient, orderPayVo, notifyUrl);
         } catch (Exception e) {
             log.error(e.getMessage(), e);;