商城，拼团OrderType改默认值1

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

@@ -51,8 +51,6 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
-//import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
-
 @Component
 public class OrderSdkAdapter {
 
@@ -246,7 +244,8 @@ public class OrderSdkAdapter {
             // 20210730之前 默认设置为1
             request.setBizType(CommonConstant.INTEGER_ONE);
         }
-        request.setOrderType(getNewOrderType(requestVO.getOrderType(), requestVO.getGmtExpect(), request.getBizType()));
+//        request.setOrderType(getNewOrderType(requestVO.getOrderType(), requestVO.getGmtExpect(), request.getBizType()));
+        request.setOrderType(requestVO.getNewOrderType().getIndex());
         request.setNote(requestVO.getRemark());
         request.setBarCounter(requestVO.getBarCounter());
 
@@ -413,7 +412,8 @@ public class OrderSdkAdapter {
         //订单业务类型 1:普通订单 2:虚拟订单
         request.setBizType(1);
         request.setNote(requestVO.getRemark());
-        request.setOrderType(getNewOrderType(requestVO.getOrderType(), requestVO.getGmtExpect(), request.getBizType()));
+//        request.setOrderType(getNewOrderType(requestVO.getOrderType(), requestVO.getGmtExpect(), request.getBizType()));
+        request.setOrderType(requestVO.getNewOrderType().getIndex());
         request.setBarCounter(requestVO.getBarCounter());
 
         //商品信息转换
@@ -472,6 +472,7 @@ public class OrderSdkAdapter {
     }
 
 
+    @Deprecated
     public CreateFatherSonOrderReq convent2NEWCreateFatherSonOrderRequest(CreateFatherSonOrderRequest request) {
         CreateFatherSonOrderReq createFatherSonOrderReq = new CreateFatherSonOrderReq();
         createFatherSonOrderReq.setPartnerId(request.getPartnerId());
@@ -485,6 +486,7 @@ public class OrderSdkAdapter {
         return createFatherSonOrderReq;
     }
 
+    @Deprecated
     private CreateOrderRequest convertOrderInfo2CreateOrderRequest(CreateFatherSonOrderRequest.OrderInfo orderInfo) {
         CreateOrderRequest createOrderRequest = new CreateOrderRequest();
         createOrderRequest.setStoreId(orderInfo.getShopId());
@@ -524,7 +526,7 @@ public class OrderSdkAdapter {
         createOrderRequest.setBizType(orderInfo.getBizType());
         createOrderRequest.setIsParent(orderInfo.getIsParent());
         createOrderRequest.setNote(orderInfo.getRemark());
-        createOrderRequest.setOrderType(getNewOrderType(orderInfo.getOrderType(), orderInfo.getGmtExpect(), createOrderRequest.getBizType()));
+//        createOrderRequest.setOrderType(getNewOrderType(orderInfo.getOrderType(), orderInfo.getGmtExpect(), createOrderRequest.getBizType()));
         createOrderRequest.setBarCounter(orderInfo.getBarCounter());
 
         //商品信息转换
@@ -1628,63 +1630,57 @@ public class OrderSdkAdapter {
     /**
      * 老订单类型转换新订单类型
      */
-    public Integer getNewOrderType(QueryOrderType orderType, Long gmtExpect, Integer bizType) {
-        //订单服务订单类型 1=外卖 4=自提，5=堂食
-        //外卖平台订单类型 1=常规堂食，2=预约堂食，3=常规外送，4=预约外送，5=常规自取，6=预约自取
-        boolean isAdvance = bizType != null && bizType.compareTo(BizTypeEnum.ADVANCE_ORDER.getBizType()) == 0;
-        Integer type = 0;
-        // 预定单 是额外的逻辑 --> 需要走实时单
-        if (isAdvance) {
-            switch (orderType) {
-                case TAKE_OUT:
-                    type = 3;
-                    break;
-                case COLLECT_GOODS:
-                    type = 5;
-                    break;
-                case EAT_IN:
-                    type = 1;
-                    break;
-                case MALL:
-                    type = 3;
-                    break;
-                default:
-                    break;
-            }
-            return type;
-        }
-
-        switch (orderType) {
-            case TAKE_OUT:
-                if (gmtExpect == null || gmtExpect == 0L) {
-                    type = 3;
-                } else {
-                    type = 4;
-                }
-                break;
-            case COLLECT_GOODS:
-                if (gmtExpect == null || gmtExpect == 0L) {
-                    type = 5;
-                } else {
-                    type = 6;
-                }
-                break;
-            case EAT_IN:
-                if (gmtExpect == null || gmtExpect == 0L) {
-                    type = 1;
-                } else {
-                    type = 2;
-                }
-                break;
-            case MALL:
-                type = 3;
-                break;
-            default:
-                break;
-        }
-
-        return type;
-    }
+//    public Integer getNewOrderType(OrderTypeV1 orderType, Long gmtExpect, Integer bizType) {
+//        //订单服务订单类型 1=外卖 4=自提，5=堂食
+//        //外卖平台订单类型 1=常规堂食，2=预约堂食，3=常规外送，4=预约外送，5=常规自取，6=预约自取
+//        boolean isAdvance = bizType != null && bizType.compareTo(BizTypeEnum.ADVANCE_ORDER.getBizType()) == 0;
+//        Integer type = 0;
+//        // 预定单 是额外的逻辑 --> 需要走实时单
+//        if (isAdvance) {
+//            switch (orderType) {
+//                case TAKE_OUT:
+//                    type = 3;
+//                    break;
+//                case COLLECT_GOODS:
+//                    type = 5;
+//                    break;
+//                case EAT_IN:
+//                    type = 1;
+//                    break;
+//                default:
+//                    break;
+//            }
+//            return type;
+//        }
+//
+//        switch (orderType) {
+//            case TAKE_OUT:
+//                if (gmtExpect == null || gmtExpect == 0L) {
+//                    type = 3;
+//                } else {
+//                    type = 4;
+//                }
+//                break;
+//            case COLLECT_GOODS:
+//                if (gmtExpect == null || gmtExpect == 0L) {
+//                    type = 5;
+//                } else {
+//                    type = 6;
+//                }
+//                break;
+//            case EAT_IN:
+//                if (gmtExpect == null || gmtExpect == 0L) {
+//                    type = 1;
+//                } else {
+//                    type = 2;
+//                }
+//                break;
+//            default:
+//                break;
+//        }
+//
+//        return type;
+//    }
 
     /**
      * 新订单类型转换老订单类型

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/QueryOrderType.java

-package com.freemud.sdk.api.assortment.order.enums;
-
-public enum QueryOrderType {
-
-    TAKE_OUT, COLLECT_GOODS, EAT_IN,MALL;
-
-}
+//package com.freemud.sdk.api.assortment.order.enums;
+//
+//public enum QueryOrderType {
+//
+//    TAKE_OUT, COLLECT_GOODS, EAT_IN;
+//
+//}

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java

 package com.freemud.sdk.api.assortment.order.request.order;
 
 import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
+import com.freemud.application.sdk.api.ordercenter.enums.OrderType;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq;
 import com.freemud.sdk.api.assortment.order.config.BaseConfig;
 import com.freemud.sdk.api.assortment.order.entities.promption.ActivityUpdateStockRequest;
@@ -71,9 +72,11 @@ public class BaseCreateOrderRequest extends BaseConfig {
      */
     private String latitude;
     /**
-     * 订单类型  1 外卖 2.预订单 3.商城 4 自提
+     * 老订单类型  1 外卖  4 自提  5 堂食
      */
-    private QueryOrderType orderType;
+//    private OrderTypeV1 orderType;
+
+    private OrderType newOrderType;
     /**
      * 订单状态
      */

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateFatherSonOrderRequest.java

@@ -4,7 +4,6 @@ import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq;
 import com.freemud.application.sdk.api.ordercenter.request.create.OrderTaskReq;
 import com.freemud.sdk.api.assortment.order.config.BaseConfig;
 import com.freemud.sdk.api.assortment.order.entities.promption.ActivityUpdateStockRequest;
-import com.freemud.sdk.api.assortment.order.enums.QueryOrderType;
 import lombok.Data;
 
 import java.util.Date;
@@ -87,7 +86,7 @@ public class CreateFatherSonOrderRequest extends BaseConfig {
         /**
          * 订单类型  1 外卖 2.预订单 3.商城 4 自提
          */
-        private QueryOrderType orderType;
+//        private QueryOrderType orderType;
         /**
          * 订单状态
          */

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

@@ -481,7 +481,8 @@ public class CreateOrderAdapter {
         request.setBizType(1);
         request.setNote(createOrderVo.getOrderRemark());
         Long gmtExpect = StringUtils.isNotBlank(createOrderVo.getExpectTime()) ? DateUtil.convert2Date(createOrderVo.getExpectTime(), "yyyy-MM-dd HH:mm:ss").getTime() : null;
-        request.setOrderType(getNewOrderType(getOldOrderType(createOrderVo.getOrderType(), createOrderVo.getReachStoreType()), gmtExpect));
+        // TODO: 21-12-16
+//        request.setOrderType(getNewOrderType(getOldOrderType(createOrderVo.getOrderType(), createOrderVo.getReachStoreType()), gmtExpect));
         request.setBarCounter(createOrderVo.getTableNumber());
 
         //订单market类型

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

@@ -510,20 +510,25 @@ public class OrderAdapter {
         String deliveryType = userDeliveryInfoDto != null && userDeliveryInfoDto.getStoreDeliveryInfoDto() != null
                 ? userDeliveryInfoDto.getStoreDeliveryInfoDto().getDeliveryType() : "";
 //        createOrderVo.setUserDeliveryInfoDto(userDeliveryInfoDto);
-        Integer orderType;
+//        Integer orderType;
+        OrderType newOrderType = null;
         String receiveAddress = createOrderVo.getStoreAddress();
         // fisherman -> 爱马哥 orderType落库的类型处理
         if (Objects.equals(createOrderVo.getOrderType(), CreateOrderType.TAKE_OUT.getCode())) {
-            orderType = OrderTypeV1.TAKE_OUT.getCode();
+//            orderType = OrderTypeV1.TAKE_OUT.getCode();
+            newOrderType = getNewOrderType(OrderTypeV1.TAKE_OUT,createOrderVo.getExpectTime(),createOrderVo.getBizType());
             receiveAddress = (userDeliveryInfoDto != null ? userDeliveryInfoDto.getReceiveOfficeName() + "," + userDeliveryInfoDto.getReceiveAddress() : "");
         } else if (Objects.equals(createOrderVo.getOrderType(), CreateOrderType.COLLECT_GOODS.getCode())) {
             if (Objects.equals(createOrderVo.getReachStoreType(), OrderTypeV1.EAT_IN.getCode())) {
-                orderType = OrderTypeV1.EAT_IN.getCode();
+//                orderType = OrderTypeV1.EAT_IN.getCode();
+                newOrderType = getNewOrderType(OrderTypeV1.EAT_IN,createOrderVo.getExpectTime(),createOrderVo.getBizType());
             } else {
-                orderType = OrderTypeV1.COLLECT_GOODS.getCode();
+                newOrderType = getNewOrderType(OrderTypeV1.COLLECT_GOODS,createOrderVo.getExpectTime(),createOrderVo.getBizType());
+//                orderType = OrderTypeV1.COLLECT_GOODS.getCode();
             }
         } else if (Objects.equals(createOrderVo.getOrderType(), CreateOrderType.SAASMALL.getCode())) {
-            orderType = OrderTypeV1.TAKE_OUT.getCode();
+//            orderType = OrderTypeV1.EAT_IN.getCode();
+            newOrderType = OrderType.GENERAL_DINE_IN;
             receiveAddress = (userDeliveryInfoDto != null ? userDeliveryInfoDto.getReceiveProvince() + userDeliveryInfoDto.getReceiveCity() + userDeliveryInfoDto.getReceiveRegion() + userDeliveryInfoDto.getReceiveAddress() : "");
             createOrderVo.setMobile(userDeliveryInfoDto != null ? userDeliveryInfoDto.getReceiveMobile() : "");
             createOrderVo.setContactsName(userDeliveryInfoDto != null ? userDeliveryInfoDto.getReceiveUserName() : "");
@@ -547,7 +552,8 @@ public class OrderAdapter {
         createOrderDto.setAddress(receiveAddress);
         createOrderDto.setLatitude(latitude);
         createOrderDto.setLongitude(longitude);
-        createOrderDto.setOrderType(convent2OrderTypeEnum(orderType));
+//        createOrderDto.setOrderType(convent2OrderTypeEnum(orderType));
+        createOrderDto.setNewOrderType(newOrderType);
         createOrderDto.setPayType(QueryPayType.ONLINE_PAY);
         //  爱马哥蛋糕预定 预定单需求, bizType= 7  其他的场景默认传递null(到基础服务默认设置为1)
         createOrderDto.setBizType(createOrderVo.getBizType());
@@ -2628,19 +2634,19 @@ public class OrderAdapter {
      * @param oldOrderType
      * @return
      */
-    public QueryOrderType convent2OrderTypeEnum(Integer oldOrderType) {
-
-        if (OrderTypeV1.TAKE_OUT.getCode().equals(oldOrderType)) {
-            return QueryOrderType.TAKE_OUT;
-        }
-        if (OrderTypeV1.COLLECT_GOODS.getCode().equals(oldOrderType)) {
-            return QueryOrderType.COLLECT_GOODS;
-        }
-        if (OrderTypeV1.EAT_IN.getCode().equals(oldOrderType)) {
-            return QueryOrderType.EAT_IN;
-        }
-        return null;
-    }
+//    public OrderTypeV1 convent2OrderTypeEnum(Integer oldOrderType) {
+//
+//        if (OrderTypeV1.TAKE_OUT.getCode().equals(oldOrderType)) {
+//            return OrderTypeV1.TAKE_OUT;
+//        }
+//        if (OrderTypeV1.COLLECT_GOODS.getCode().equals(oldOrderType)) {
+//            return OrderTypeV1.COLLECT_GOODS;
+//        }
+//        if (OrderTypeV1.EAT_IN.getCode().equals(oldOrderType)) {
+//            return OrderTypeV1.EAT_IN;
+//        }
+//        return null;
+//    }
 
     /**
      * 获取聚合订单活动类型
@@ -3911,4 +3917,56 @@ public class OrderAdapter {
     }
 
 
+    public OrderType getNewOrderType(OrderTypeV1 orderType, String gmtExpect, Integer bizType) {
+        //订单服务订单类型 1=外卖 4=自提，5=堂食
+        //外卖平台订单类型 1=常规堂食，2=预约堂食，3=常规外送，4=预约外送，5=常规自取，6=预约自取
+        boolean isAdvance = bizType != null && bizType.compareTo(BizTypeEnum.ADVANCE_ORDER.getBizType()) == 0;
+        OrderType type = null;
+        // 预定单 是额外的逻辑 --> 需要走实时单
+        if (isAdvance) {
+            switch (orderType) {
+                case TAKE_OUT:
+                    type = OrderType.GENERAL_EXPRESS;
+                    break;
+                case COLLECT_GOODS:
+                    type = OrderType.GENERAL_SELF_PICKUP;
+                    break;
+                case EAT_IN:
+                    type = OrderType.GENERAL_DINE_IN;
+                    break;
+                default:
+                    break;
+            }
+            return type;
+        }
+
+        switch (orderType) {
+            case TAKE_OUT:
+                if (StringUtils.isEmpty(gmtExpect)) {
+                    type = OrderType.GENERAL_EXPRESS;
+                } else {
+                    type = OrderType.RESERVED_EXPRESS;
+                }
+                break;
+            case COLLECT_GOODS:
+                if (StringUtils.isEmpty(gmtExpect)) {
+                    type = OrderType.GENERAL_SELF_PICKUP;
+                } else {
+                    type = OrderType.RESERVED_SELF_PICKUP;
+                }
+                break;
+            case EAT_IN:
+                if (StringUtils.isEmpty(gmtExpect)) {
+                    type = OrderType.GENERAL_DINE_IN;
+                } else {
+                    type = OrderType.RESERVED_DINE_IN;
+                }
+                break;
+            default:
+                break;
+        }
+
+        return type;
+    }
+
 }

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

@@ -56,7 +56,7 @@ public class SpellGroupOrderAdapter {
         createOrderRequest.setStoreNameEn(storeInfo.getStoreNameEn());
         createOrderRequest.setUserId(createSpellGroupOrderDto.getUserId());
         createOrderRequest.setUserName(createSpellGroupOrderDto.getNickName());
-        createOrderRequest.setOrderType(OrderType.GENERAL_EXPRESS.getIndex());
+        createOrderRequest.setOrderType(OrderType.GENERAL_DINE_IN.getIndex());
         createOrderRequest.setPayType(PayType.ONLINE_PAY.getCode());
         PayChannelType payChannelType = PayChannelType.getByIndex(createSpellGroupOrderDto.getPayChannelType());
         if (payChannelType != null) {

order-application-service/src/main/java/cn/freemud/service/universal/impl/SaasMallOrderService.java

@@ -38,7 +38,7 @@ import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
 import com.freemud.application.sdk.api.ordercenter.enums.AfterSalesType;
 import com.freemud.application.sdk.api.ordercenter.enums.BizTypeEnum;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
-import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderStatusV1;
+import com.freemud.application.sdk.api.ordercenter.enums.OrderType;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq;
 import com.freemud.application.sdk.api.ordercenter.request.create.DeliveryContactInfoCreateReq;
@@ -455,7 +455,7 @@ public class SaasMallOrderService extends UniversalOrderService {
 //        }
         request.setBizType(requestVO.getBizType());
         request.setNote(requestVO.getRemark());
-        request.setOrderType(orderSdkAdapter.getNewOrderType(requestVO.getOrderType(), requestVO.getGmtExpect(),null));
+        request.setOrderType(OrderType.GENERAL_DINE_IN.getIndex());
         request.setBarCounter(requestVO.getBarCounter());
 
         //订单market类型
@@ -736,7 +736,7 @@ public class SaasMallOrderService extends UniversalOrderService {
         createOrderDto.setAddress(userDeliveryInfoDto.getReceiveAddress());
         createOrderDto.setLatitude(userDeliveryInfoDto.getUserLatitude());
         createOrderDto.setLongitude(userDeliveryInfoDto.getUserLongitude());
-        createOrderDto.setOrderType(QueryOrderType.TAKE_OUT);
+        createOrderDto.setNewOrderType(OrderType.GENERAL_DINE_IN);
         createOrderDto.setPayType(QueryPayType.ONLINE_PAY);
 //        createOrderDto.setSource(OrderSourceType.SAASMALL.getCode());
 //        createOrderDto.setSourceName(OrderSourceType.SAASMALL.getDesc());

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

@@ -53,7 +53,7 @@ public enum OrderType {
 
     public static OrderType getOrderType(Integer type){
         for (OrderType orderType : values()){
-            if (type.equals(orderType.index)){
+            if (orderType.index.equals(type)){
                 return orderType;
             }
         }