diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
index afe7ca74..ebb24e65 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
@@ -194,7 +194,7 @@ public class OrderController extends BaseController {
         orderMaster.setCode(orderMasterService.createOrderCode());
         orderMaster.setOrderType(1);
         orderMaster.setPayType(appOrderRequest.getPayType());
-        orderMaster.setOrderStatus(OrderStatus.PLAIN.getCode());
+        orderMaster.setOrderStatus(OrderStatus.PLAIN.code());
         orderMaster.setCustomerId(appOrderRequest.getCustomerId());
         orderMaster.setPayStatus(PayStatus.WAIT_PAY.getCode());
         orderMaster.setCreateTime(new Date());
diff --git a/ghy-admin/src/main/resources/templates/order/master.html b/ghy-admin/src/main/resources/templates/order/master.html
index 3888f696..65dcf31b 100644
--- a/ghy-admin/src/main/resources/templates/order/master.html
+++ b/ghy-admin/src/main/resources/templates/order/master.html
@@ -127,7 +127,7 @@
                     formatter: function (value, row, index) {
                         var actions = [];
                         if(value){
-                            actions.push("订单状态:" + value.orderStatus + "</br>" );
+                            actions.push("订单状态:" + value.orderStatusDesc + "</br>" );
                             actions.push("订单时间:" + value.receivingTime + "</br>" );
                         }
                         return actions.join('');
diff --git a/ghy-common/src/main/java/com/ghy/common/enums/OrderStatus.java b/ghy-common/src/main/java/com/ghy/common/enums/OrderStatus.java
index 82800ab8..b8158b35 100644
--- a/ghy-common/src/main/java/com/ghy/common/enums/OrderStatus.java
+++ b/ghy-common/src/main/java/com/ghy/common/enums/OrderStatus.java
@@ -1,11 +1,17 @@
 package com.ghy.common.enums;
 
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Arrays;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 /**
  *  订单状态
  *
  * @author clunt
  */
-public enum OrderStatus {
+public enum OrderStatus implements IEnumType {
 
     RECEIVE(0, "待接单"),
     PLAIN(1, "待排期"),
@@ -14,20 +20,62 @@ public enum OrderStatus {
     FINISH(4, "已完成"),
     CANCEL(5, "已取消");
 
-    private final Integer code;
+    private final int code;
     private final String desc;
 
-    OrderStatus(Integer code, String desc) {
+    private final static Map<Integer, OrderStatus> BY_CODE_MAP
+            = Arrays.stream(OrderStatus.values()).collect(Collectors.toMap(OrderStatus::code, code -> code));
+
+    private final static Map<String, OrderStatus> BY_NAME_MAP
+            = Arrays.stream(OrderStatus.values()).collect(Collectors.toMap(code -> code.name().toLowerCase(), code -> code));
+
+
+    /**
+     * @param code 代码
+     * @param desc 描述
+     */
+    OrderStatus(final int code, final String desc) {
         this.code = code;
         this.desc = desc;
     }
 
-    public Integer getCode() {
-        return code;
+    @Override
+    public int code() {
+        return this.code;
     }
 
-    public String getDesc() {
-        return desc;
+    @Override
+    public String desc() {
+        return this.desc;
     }
 
+    /**
+     * @param code 代码
+     * @return 转换出来的状态码
+     */
+    public static OrderStatus parse(Integer code) {
+        return BY_CODE_MAP.get(code);
+    }
+
+    public static OrderStatus parse(Integer code, OrderStatus defaultState) {
+        return BY_CODE_MAP.getOrDefault(code, defaultState);
+    }
+
+    /**
+     * @param name 名字
+     * @return 转换出来的状态码
+     */
+    public static OrderStatus parse(String name) {
+        if (StringUtils.isBlank(name)) {
+            return null;
+        }
+        return BY_NAME_MAP.get(name.trim().toLowerCase());
+    }
+
+    public static OrderStatus parse(String name, OrderStatus defaultState) {
+        if (StringUtils.isBlank(name)) {
+            return defaultState;
+        }
+        return BY_NAME_MAP.getOrDefault(name.trim().toLowerCase(), defaultState);
+    }
 }