订单详情的订单类型描述到店拆分自提和堂食

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

@@ -1013,7 +1013,7 @@ public class OrderAdapter {
                 responseVo.setOrderTypeDesc("商城订单");
             } else {
                 // TODO: 21-11-25  OrderTypeGather 待合并
-                responseVo.setOrderTypeDesc(Optional.ofNullable(OrderTypeGather.getByCode(ordersBean.getOrderType())).map(OrderTypeGather::getDesc).orElse(""));
+                responseVo.setOrderTypeDesc(Optional.ofNullable(OrderTypeV1.getByCode(ordersBean.getOrderType())).map(OrderTypeV1::getDesc).orElse(""));
             }
             responseVo.setOrderRemark(ordersBean.getRemark());
             if (ordersBean.getGmtModified() != null) {

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

-package cn.freemud.enums;
-
-/**
- * All rights Reserved, Designed By www.freemud.cn
- *
- * @Title: cn.freemud.enums OrderTypeGather
- * @Description: TDO 描述....
- * @author: family
- * @date: 2020/5/7
- * @Copyright: www.freemud.cn Inc. All rights reserved.
- * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
- */
-public enum  OrderTypeGather {
-    TAKE_OUT(1, "外卖"),
-    PRE_ORDER(2, "预订单"),
-    MALL(3, "商城"),
-    COLLECT_GOODS(4, "到店"),
-    EAT_IN(5, "到店");
-
-    private Integer code;
-    private String desc;
-    //订单服务订单类型 1=外卖 4=自提，5=堂食
-    //外卖平台订单类型 1=常规堂食，2=预约堂食，3=常规外送，4=预约外送，5=常规自取，6=预约自取
-    OrderTypeGather(Integer code, String desc) {
-        this.code = code;
-        this.desc = desc;
-    }
-
-    public static OrderTypeGather getByCode(Integer code) {
-        if (code==null) {
-            return null;
-        }
-        for (OrderTypeGather orderTypeGather : values()) {
-            if (orderTypeGather.getCode().equals(code)) {
-                return orderTypeGather;
-            }
-        }
-        return null;
-    }
-
-    public Integer getCode() {
-        return code;
-    }
-
-    public void setCode(Integer code) {
-        this.code = code;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    public void setDesc(String desc) {
-        this.desc = desc;
-    }
-}
+//package cn.freemud.enums;
+//
+///**
+// * All rights Reserved, Designed By www.freemud.cn
+// *
+// * @Title: cn.freemud.enums OrderTypeGather
+// * @Description: TDO 描述....
+// * @author: family
+// * @date: 2020/5/7
+// * @Copyright: www.freemud.cn Inc. All rights reserved.
+// * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+// */
+//public enum  OrderTypeGather {
+//    TAKE_OUT(1, "外卖"),
+//    PRE_ORDER(2, "预订单"),
+//    MALL(3, "商城"),
+//    COLLECT_GOODS(4, "到店"),
+//    EAT_IN(5, "到店");
+//
+//    private Integer code;
+//    private String desc;
+//    //订单服务订单类型 1=外卖 4=自提，5=堂食
+//    //外卖平台订单类型 1=常规堂食，2=预约堂食，3=常规外送，4=预约外送，5=常规自取，6=预约自取
+//    OrderTypeGather(Integer code, String desc) {
+//        this.code = code;
+//        this.desc = desc;
+//    }
+//
+//    public static OrderTypeGather getByCode(Integer code) {
+//        if (code==null) {
+//            return null;
+//        }
+//        for (OrderTypeGather orderTypeGather : values()) {
+//            if (orderTypeGather.getCode().equals(code)) {
+//                return orderTypeGather;
+//            }
+//        }
+//        return null;
+//    }
+//
+//    public Integer getCode() {
+//        return code;
+//    }
+//
+//    public void setCode(Integer code) {
+//        this.code = code;
+//    }
+//
+//    public String getDesc() {
+//        return desc;
+//    }
+//
+//    public void setDesc(String desc) {
+//        this.desc = desc;
+//    }
+//}

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/orderv1/OrderTypeV1.java

@@ -11,8 +11,8 @@ public enum OrderTypeV1 {
     TAKE_OUT(1, "外卖", "takeOut"),
 //    PRE_ORDER(2, "预订单", "preOrder"),
 //    MALL(3, "商城", "mall"),
-    COLLECT_GOODS(4, "打包带走", "collectGoods"),
-    EAT_IN(5, "店内就餐", "eatIn");
+    COLLECT_GOODS(4, "自提", "collectGoods"),
+    EAT_IN(5, "堂食", "eatIn");
 
     private Integer code;
     private String desc;