--no commit message

app/third/src/main/java/com/zrqx/third/pay/interfaces/payType/impl/AliPayImpl.java

@@ -14,6 +14,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.alipay.api.AlipayApiException;
 import com.alipay.api.AlipayClient;
 import com.alipay.api.DefaultAlipayClient;
+import com.alipay.api.request.AlipayTradeAppPayRequest;
 import com.alipay.api.request.AlipayTradeCloseRequest;
 import com.alipay.api.request.AlipayTradeFastpayRefundQueryRequest;
 import com.alipay.api.request.AlipayTradePagePayRequest;
@@ -104,27 +105,48 @@ public class AliPayImpl extends PayTypeAdapter{
 		logger.info("zzzzzzzzzzzzzzzzzzzz订单:" + toPayForm.getOut_trade_no() + "开始获取支付宝链接zzzzzzzzzzzzzzzzzzzz");
 		OrderPayVo orderPayVo = getOrderPayVo(toPayForm.getOut_trade_no());
 		// 获得初始化的AlipayClient
-		AlipayClient alipayClient = new DefaultAlipayClient(gatewayUrl, app_id,
-				merchant_private_key, "json", charset, alipay_public_key,
-				sign_type);
-		// 设置请求参数
-		AlipayTradePagePayRequest alipayRequest = new AlipayTradePagePayRequest();
-		alipayRequest.setReturnUrl(return_url);
-		alipayRequest.setNotifyUrl(notify_url);
-		// String total_amount = "0.01";
-		alipayRequest.setBizContent("{\"out_trade_no\":\"" + toPayForm.getOut_trade_no() + "\"," + "\"total_amount\":\""
-				+ orderPayVo.getPayment() + "\"," + "\"subject\":\"" + orderPayVo.getSubject() + "\"," 
-				+ "\"product_code\":\"FAST_INSTANT_TRADE_PAY\"}");
+		AlipayClient alipayClient = new DefaultAlipayClient(gatewayUrl, app_id, merchant_private_key, "json", charset,
+				alipay_public_key, sign_type);
 		// 请求
 		String result = "";
 		String url = "https://openapi.alipay.com/gateway.do?";
-		try {
-			logger.info("zzzzzzzzzzzzzzzzzzzz订单:" + toPayForm.getOut_trade_no() + "获取链接请求参数zzzzzzzzzzzzzzzzzzzz\n" + alipayRequest.getBizContent());
-			result = url + alipayClient.sdkExecute(alipayRequest).getBody();
-			logger.info("zzzzzzzzzzzzzzzzzzzz订单:" + toPayForm.getOut_trade_no() + "获取链接响应zzzzzzzzzzzzzzzzzzzz\n" + result);
-		} catch (AlipayApiException e) {
-			logger.error("zzzzzzzzzzzzzzzzzzzz订单:" + toPayForm.getOut_trade_no() + "获取链接失败zzzzzzzzzzzzzzzzzzzz");
-			logger.error(e.getMessage());
+		// 设置请求参数
+		if("2".equals(toPayForm.getTrade_type())) {
+			AlipayTradeAppPayRequest request = new AlipayTradeAppPayRequest();
+			request.setReturnUrl(return_url);
+			request.setNotifyUrl(notify_url);
+			request.setBizContent("{\"out_trade_no\":\"" + toPayForm.getOut_trade_no() + "\"," + "\"total_amount\":\""
+					+ orderPayVo.getPayment() + "\"," + "\"subject\":\"" +  orderPayVo.getSubject() + "\","
+					+ "\"product_code\":\"QUICK_MSECURITY_PAY\"}");
+			//AlipayTradeAppPayResponse response = alipayClient.pageExecute(request);
+			try {
+				logger.info("app订单:" + toPayForm.getOut_trade_no() + "获取链接请求参数zzzzzzzzzzzzzzzzzzzz\n"
+						+ request.getBizContent());
+				result = url + alipayClient.sdkExecute(request).getBody();
+				logger.info("app订单:" + toPayForm.getOut_trade_no() + "获取链接响应zzzzzzzzzzzzzzzzzzzz\n" + result);
+			}catch (Exception e) {
+				logger.error("app订单:" + toPayForm.getOut_trade_no() + "获取链接失败zzzzzzzzzzzzzzzzzzzz");
+				logger.error(e.getMessage());
+			}
+		}else {
+			AlipayTradePagePayRequest alipayRequest = new AlipayTradePagePayRequest();
+			alipayRequest.setReturnUrl(return_url);
+			alipayRequest.setNotifyUrl(notify_url);
+			// String total_amount = "0.01";
+			alipayRequest.setBizContent("{\"out_trade_no\":\"" + toPayForm.getOut_trade_no() + "\"," + "\"total_amount\":\""
+					+ orderPayVo.getPayment() + "\"," + "\"subject\":\"" + orderPayVo.getSubject() + "\","
+					+ "\"product_code\":\"FAST_INSTANT_TRADE_PAY\"}");
+			
+			try {
+				logger.info("zzzzzzzzzzzzzzzzzzzz订单:" + toPayForm.getOut_trade_no() + "获取链接请求参数zzzzzzzzzzzzzzzzzzzz\n"
+						+ alipayRequest.getBizContent());
+				result = url + alipayClient.sdkExecute(alipayRequest).getBody();
+				logger.info(
+						"zzzzzzzzzzzzzzzzzzzz订单:" + toPayForm.getOut_trade_no() + "获取链接响应zzzzzzzzzzzzzzzzzzzz\n" + result);
+			} catch (AlipayApiException e) {
+				logger.error("zzzzzzzzzzzzzzzzzzzz订单:" + toPayForm.getOut_trade_no() + "获取链接失败zzzzzzzzzzzzzzzzzzzz");
+				logger.error(e.getMessage());
+			}
 		}
 		logger.info("zzzzzzzzzzzzzzzzzzzz订单:" + toPayForm.getOut_trade_no() + "完成获取支付宝链接zzzzzzzzzzzzzzzzzzzz");
 		return CallBack.success(result);