Merge branch 'feature/20200103_支付宝支付下单_wuping' into develop

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/enums/OrderSourceType.java

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -1134,6 +1134,9 @@ public class OrderSdkAdapter {
             case "saas":
                 orderClientType = 2;
                 break;
+            case "alipay":
+                orderClientType=3;
+                break;
             case "jdwm":
                 orderClientType = 10;
                 break;
@@ -1177,6 +1180,9 @@ public class OrderSdkAdapter {
             case 2:
                 name = "saas";
                 break;
+            case 3:
+                name="alipay";
+                break;
             case 10:
                 name = "jdwm";
                 break;
@@ -1218,6 +1224,9 @@ public class OrderSdkAdapter {
             case 2:
                 name = "saas 点餐";
                 break;
+            case 3:
+                name="支付宝";
+                break;
             case 10:
                 name = "京东";
                 break;

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -883,6 +883,9 @@ public class OrderAdapter {
             }else {
                 responseVo.setOrderPayType("微信支付");
             }
+            if(OrderSourceType.ALIPAY.getCode().equals(ordersBean.getSource())){
+                responseVo.setOrderPayType("支付宝支付");
+            }
             //取餐码用日订单序号代替- v1.5.4变更为四位随机数
             responseVo.setTakeCode(ordersBean.getOtherCode());
             responseVo.setAmount(ordersBean.getAmount());

order-application-service/src/main/java/cn/freemud/enums/OrderSourceType.java

@@ -31,7 +31,8 @@ public enum OrderSourceType {
     SAAS("saas", "saas 点餐"),
 
     SAASMALL("saasmall", "微商城"),
-    ;
+
+    ALIPAY("alipay", "支付宝小程序点餐");
 
     private String code;