Merge remote-tracking branch 'origin/master-alipay-change' into master-alipay-change

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/entity/OrderPay.java

 package com.xxfc.platform.universal.entity;
 
-import java.io.Serializable;
-import java.util.Date;
-import javax.persistence.*;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+
 
 /**
  * 订单支付
@@ -45,6 +48,10 @@ public class OrderPay implements Serializable {
 	@ApiModelProperty(value = "1:微信公众号支付 2.支付宝即时到账,3,银联")
     private Integer payWay;
 
+	@Column(name = "pay_type")
+    @ApiModelProperty(value = "1：支付宝APP支付，2：支付宝预授权支付")
+    private Integer payType;
+
 	    //渠道：1-租车;2-旅游
     @Column(name = "channel")
 	@ApiModelProperty(value = "渠道：1-租车;2-旅游")

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/vo/OrderPayVo.java

@@ -69,4 +69,7 @@ public class OrderPayVo{
     @Column(name = "serial_number")
     @ApiModelProperty(value = "支付接口返回的流水号")
     private String serialNumber;
+
+	@ApiModelProperty(value = "1：支付宝APP支付，2：支付宝预授权支付")
+	private Integer payType;
 }

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

@@ -113,6 +113,7 @@ 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(1);
             jsParam = generateAliPayment(orderPayVo, notifyUrl);
         }else if (type == 3 && payWay == 1){
             sellerAccount = SystemConfig.APP_PARTNER;