添加支付宝app付款支持

src/main/java/com/qkdata/alipay/service/AlipayService.java

 package com.qkdata.alipay.service;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.alipay.api.*;
+import com.alipay.api.domain.AlipayTradeAppPayModel;
 import com.alipay.api.domain.AlipayTradeCloseModel;
 import com.alipay.api.domain.AlipayTradeQueryModel;
 import com.alipay.api.domain.AlipayTradeWapPayModel;
+import com.alipay.api.request.AlipayTradeAppPayRequest;
 import com.alipay.api.request.AlipayTradeCloseRequest;
 import com.alipay.api.request.AlipayTradeQueryRequest;
 import com.alipay.api.request.AlipayTradeWapPayRequest;
+import com.alipay.api.response.AlipayTradeAppPayResponse;
 import com.alipay.api.response.AlipayTradeCloseResponse;
 import com.alipay.api.response.AlipayTradeQueryResponse;
 import com.alipay.api.response.AlipayTradeWapPayResponse;
 import com.qkdata.alipay.config.AlipayProperties;
+import com.qkdata.biz.enums.PaySourceEnum;
+import com.qkdata.biz.management.entity.ProductOrderPO;
+import com.qkdata.common.base.exception.BusinessException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -49,23 +56,58 @@ public class AlipayService {
 
     /**
      * 统一下单调用
-     * @param model
+     * @param orderPO
+     * @param  source
+     * @param  returnUrl
      * @return
      * @throws AlipayApiException
      */
-    public String prePayOrder(AlipayTradeWapPayModel model) throws AlipayApiException {
-        AlipayTradeWapPayRequest alipay_request=new AlipayTradeWapPayRequest();
-        alipay_request.setBizModel(model);
-        alipay_request.setNotifyUrl(frontendDomain + "/online-edu-backend/alipay/notify/order");
-        alipay_request.setReturnUrl(model.getQuitUrl()+"&result=true");
-        String form = "";
-        AlipayTradeWapPayResponse response = alipayClient.pageExecute(alipay_request);
+    public Object prePayOrder(ProductOrderPO orderPO, PaySourceEnum source, String returnUrl) throws AlipayApiException {
+        AlipayRequest alipay_request=null;
+        if (source == PaySourceEnum.MWEB){
+            AlipayTradeWapPayModel requestObj =  new AlipayTradeWapPayModel();
+            requestObj.setOutTradeNo(orderPO.getOrderNo());
+            requestObj.setSubject(orderPO.getOrderName());
+            requestObj.setTotalAmount(orderPO.getPaymentMoney().toString());
+            requestObj.setProductCode("QUICK_WAP_WAY");
+            requestObj.setQuitUrl(returnUrl+"&result=true");
+
+            alipay_request = new AlipayTradeWapPayRequest();
+            alipay_request.setBizModel(requestObj);
+            alipay_request.setNotifyUrl(frontendDomain + "/online-edu-backend/alipay/notify/order");
+            alipay_request.setReturnUrl(returnUrl+"&result=true");
+        }else if (source == PaySourceEnum.APP){
+            AlipayTradeAppPayModel requestObj =  new AlipayTradeAppPayModel();
+            requestObj.setGoodsType("1");
+            requestObj.setOutTradeNo(orderPO.getOrderNo());
+            requestObj.setSubject(orderPO.getOrderName());
+            requestObj.setTotalAmount(orderPO.getPaymentMoney().toString());
+            requestObj.setProductCode("QUICK_MSECURITY_PAY");
+
+            alipay_request = new AlipayTradeAppPayRequest();
+            alipay_request.setBizModel(requestObj);
+            alipay_request.setNotifyUrl(frontendDomain + "/online-edu-backend/alipay/notify/order");
+
+        }else {
+            throw new BusinessException("暂不支持该支付类型。source:"+source);
+        }
+
+        Object rtObj = null;
+        AlipayResponse response = null;
+        if (source == PaySourceEnum.MWEB){
+            response = alipayClient.pageExecute(alipay_request);
+        }else if (source == PaySourceEnum.APP){
+            response = alipayClient.sdkExecute(alipay_request);
+        }else {
+            throw new BusinessException("暂不支持该支付类型。source:"+source);
+        }
         if (response.isSuccess()){
-            form = response.getBody();
+            rtObj = response.getBody();
+            return rtObj;
         }else {
             log.info("Alipay prePay request faild:"+ JSONObject.toJSONString(response));
         }
-        return form;
+        return rtObj;
     }
 
     /**

src/main/java/com/qkdata/biz/management/service/ProductOrderService.java

@@ -134,15 +134,9 @@ public class ProductOrderService extends ServiceImpl<ProductOrderMapper, Product
                 throw new BusinessException("微信支付异常");
             }
         }else if (orderPO.getPayMethod() == PayMethodEnum.AliPay){
-            AlipayTradeWapPayModel payModel = new AlipayTradeWapPayModel();
-            payModel.setOutTradeNo(orderPO.getOrderNo());
-            payModel.setSubject(orderPO.getOrderName());
-            payModel.setTotalAmount(orderPO.getPaymentMoney().toString());
-            payModel.setQuitUrl(returnUrl+"&result=true");
-            payModel.setProductCode("QUICK_WAP_WAY");
             try {
-                String form = alipayService.prePayOrder(payModel);
-                return form;
+                Object rtObj = alipayService.prePayOrder(orderPO,source,returnUrl);
+                return rtObj;
             } catch (AlipayApiException e) {
                 log.error(e.getMessage(),e);
                 throw new BusinessException("支付宝创建订单异常");