微信新版订阅消息判断新加返回orderType字段

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

@@ -2271,6 +2271,10 @@ public class OrderAdapter {
         createOrderResponseVo.setPackageX(payOrderBean == null ? "" : payOrderBean.getPackageX());
         createOrderResponseVo.setSignType(payOrderBean == null ? "" : payOrderBean.getSignType());
         createOrderResponseVo.setSign(payOrderBean == null ? "" : payOrderBean.getSign());
+        //微信新版订阅消息判断新加字段
+        if(orderBean != null && orderBean.getType() != null){
+            createOrderResponseVo.setOrderType(getNewOrderType(orderBean.getOrderType(), orderBean.getGmtExpect()));
+        }
         return createOrderResponseVo;
     }
 
@@ -2579,4 +2583,41 @@ public class OrderAdapter {
         return minTime;
     }
 
+    /**
+     * 新老订单类型转换
+     * @return
+     */
+    public Integer getNewOrderType(Integer orderType, Long gmtExpect) {
+        //老订单服务订单类型 1=外卖 4=自提，5=堂食
+        //新订单服务订单类型 1=常规堂食，2=预约堂食，3=常规外送，4=预约外送，5=常规自取，6=预约自取
+        Integer type = 0;
+        switch (orderType) {
+            case 1:
+                if (gmtExpect == null || gmtExpect == 0L) {
+                    type = 3;
+                } else {
+                    type = 4;
+                }
+                break;
+            case 4:
+                if (gmtExpect == null || gmtExpect == 0L) {
+                    type = 5;
+                } else {
+                    type = 6;
+                }
+                break;
+            case 5:
+                if (gmtExpect == null || gmtExpect == 0L) {
+                    type = 1;
+                } else {
+                    type = 2;
+                }
+                break;
+            default:
+                break;
+        }
+
+        return type;
+    }
+
 }

order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderResponseVo.java

@@ -45,4 +45,9 @@ public class CreateOrderResponseVo {
      */
     private Integer orderUpdateVer;
 
+    /**
+     * 订单类型
+     */
+    private Integer orderType;
+
 }