Merge branches 'develop' and 'feature/20200303_预约单2_wuping' of…

Merge branches 'develop' and 'feature/20200303_预约单2_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

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

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

@@ -2758,4 +2758,47 @@ public class OrderSdkAdapter {
         }
         return totalWeight;
     }
+
+
+    /**
+     * 匹配订单类型
+     *
+     * @param orderType
+     * @return
+     */
+    public OrderType getNewOrderTypeEnum(Integer orderType, Long gmtExpect) {
+        if (orderType == null) {
+            return null;
+        }
+
+        switch (orderType) {
+            case 1:
+                // 外卖
+                if (gmtExpect == null || gmtExpect == 0L) {
+                    return OrderType.GENERAL_EXPRESS;
+                } else {
+                    return OrderType.RESERVED_EXPRESS;
+                }
+            case 4:
+                // 自取
+                if (gmtExpect == null || gmtExpect == 0L) {
+                    return OrderType.GENERAL_SELF_PICKUP;
+                } else {
+                    return OrderType.RESERVED_SELF_PICKUP;
+                }
+            case 5:
+                // 堂食
+                if (gmtExpect == null || gmtExpect == 0L) {
+                    return OrderType.GENERAL_DINE_IN;
+                } else {
+                    return OrderType.RESERVED_DINE_IN;
+                }
+            default:
+                return null;
+        }
+    }
+
+}
+
+
 }