@be-link/pos-cli-nodejs 0.0.8 → 0.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@be-link/pos-cli-nodejs",
-  "version": "0.0.8",
+  "version": "0.0.11",
   "description": "正向订单服务Nodejs客户端",
   "main": "index.js",
   "scripts": {

package/pos/modules/orderCore/service.d.ts

@@ -11,11 +11,8 @@ declare class OrderCoreService extends BaseService implements Service.OrderCoreC
     supplierConfirmed(request: Service.Request.supplierConfirmed): Promise<void>;
     submittedToSupplier(request: Service.Request.submittedToSupplier): Promise<void>;
     sendOrderPaidNotification(request: Service.Request.sendOrderPaidNotification): Promise<void>;
-    createScheduleNotice(request: Service.Request.createScheduleNotice): Promise<void>;
-    markServiceNoticeRead(request: Service.Request.markServiceNoticeRead): Promise<void>;
-    markItineraryRead(request: Service.Request.markItineraryRead): Promise<void>;
-    markServiceNoticeAuth(request: Service.Request.markServiceNoticeAuth): Promise<void>;
     orderSettled(request: Service.Request.orderSettled): Promise<void>;
+    changeOrderContactInfo(request: Service.Request.changeOrderContactInfo): Promise<void>;
 }
 declare const orderCoreService: OrderCoreService;
 export default orderCoreService;

package/pos/modules/orderCore/service.js

@@ -37,21 +37,12 @@ class OrderCoreService extends service_1.default {
     sendOrderPaidNotification(request) {
         return (0, http_1.callApi)(this.getApiUrl(this.sendOrderPaidNotification), request);
     }
-    createScheduleNotice(request) {
-        return (0, http_1.callApi)(this.getApiUrl(this.createScheduleNotice), request);
-    }
-    markServiceNoticeRead(request) {
-        return (0, http_1.callApi)(this.getApiUrl(this.markServiceNoticeRead), request);
-    }
-    markItineraryRead(request) {
-        return (0, http_1.callApi)(this.getApiUrl(this.markItineraryRead), request);
-    }
-    markServiceNoticeAuth(request) {
-        return (0, http_1.callApi)(this.getApiUrl(this.markServiceNoticeAuth), request);
-    }
     orderSettled(request) {
         return (0, http_1.callApi)(this.getApiUrl(this.orderSettled), request);
     }
+    changeOrderContactInfo(request) {
+        return (0, http_1.callApi)(this.getApiUrl(this.changeOrderContactInfo), request);
+    }
 }
 const orderCoreService = new OrderCoreService();
 exports.default = orderCoreService;

package/pos/modules/orderCore/types.d.ts

@@ -27,15 +27,16 @@ export declare namespace Service {
                 fromUnionRole: string;
                 /** 主单Id */
                 rootOrderId?: string;
-            };
-            /** 出行人信息 */
-            tourismInfo: {
+                /** 联系人信息 */
                 contactInfo: {
                     /** 联系人姓名 */
                     name: string;
                     /** 联系人手机号 */
                     mobile: string;
                 };
+            };
+            /** 出行人信息 */
+            tourismInfo: {
                 /** 出行人id列表 */
                 touristIdList: string[];
             };
@@ -137,30 +138,6 @@ export declare namespace Service {
             /** 订单Id */
             tradeOrderId: string;
         }
-        interface createScheduleNotice {
-            /** 订单id */
-            tradeOrderId: string;
-            /** unionId */
-            unionId: string;
-            /** openId */
-            openId: string;
-        }
-        interface markServiceNoticeRead {
-            /**  订单id */
-            tradeOrderId: string;
-            /**  是否是微信渠道 */
-            channel: boolean;
-        }
-        interface markItineraryRead {
-            /**  订单id */
-            tradeOrderId: string;
-            /**  是否是微信渠道 */
-            mobile: string;
-        }
-        interface markServiceNoticeAuth {
-            /**  订单id */
-            tradeOrderId: string;
-        }
         interface submittedToSupplier {
             /** 订单Id */
             tradeOrderId: string;
@@ -177,6 +154,16 @@ export declare namespace Service {
             /** 操作人角色 */
             operatorRole: POS.Constants.OperatorRoleEnum;
         }
+        interface changeOrderContactInfo {
+            /** 联系人姓名 */
+            name: string;
+            /** 联系人身份证号 */
+            idCard: string;
+            /** 联系人手机号 */
+            mobile: string;
+            /** 订单号 */
+            tradeOrderId: string;
+        }
     }
     namespace Response {
         interface orderCreate {
@@ -247,30 +234,15 @@ export declare namespace Service {
          * @path /core/send-order-paid-notification
          */
         sendOrderPaidNotification(request: Request.sendOrderPaidNotification): Promise<void>;
-        /**
-         * 创建日程提醒服务通知
-         * @path /core/create-schedule-notice
-         */
-        createScheduleNotice(request: Request.createScheduleNotice): Promise<void>;
-        /**
-         * 标记服务通知已读
-         * @path /core/mark-service-notice-read
-         */
-        markServiceNoticeRead(request: Request.markServiceNoticeRead): Promise<void>;
-        /**
-         * 标记行程单已读
-         * @path /core/mark-itinerary-read
-         */
-        markItineraryRead(request: Request.markItineraryRead): Promise<void>;
-        /**
-         * 标记服务通知授权
-         * @path /core/mark-service-notice-auth
-         */
-        markServiceNoticeAuth(request: Request.markServiceNoticeAuth): Promise<void>;
         /**
          * 订单完结
          * @path /core/order-settled
          */
         orderSettled(request: Request.orderSettled): Promise<void>;
+        /**
+         * 修改联系人信息
+         * @path /core/change-order-contact-info
+         */
+        changeOrderContactInfo(request: Request.changeOrderContactInfo): Promise<void>;
     }
 }

package/pos/modules/orderFulfill/service.d.ts

@@ -17,13 +17,16 @@ declare class OrderFulfillService extends BaseService implements Service.orderFu
     isOrderCanAddTourists(request: Service.Request.isOrderCanAddTourists): Promise<boolean>;
     preCheckTourists(request: Service.Request.preCheckTourists): Promise<void>;
     addShuttleInfo(request: Service.Request.addShuttleInfo): Promise<void>;
-    changeOrderContactInfo(request: Service.Request.changeOrderContactInfo): Promise<void>;
     changeOrderSku(request: Service.Request.changeOrderSku): Promise<void>;
     confirmMealInfo(request: Service.Request.confirmMealInfo): Promise<void>;
     updateShuttleInfo(request: Service.Request.updateShuttleInfo): Promise<void>;
     updateTradeOrderRoomCount(request: Service.Request.updateTradeOrderRoomCount): Promise<void>;
     updateTradeOrderTouristsInfo(request: Service.Request.updateTradeOrderTouristsInfo): Promise<void>;
     queryOrderChangeSkuRecords(request: Service.Request.queryOrderChangeSkuRecords): Promise<POS.DTO.IPositiveChangeSkuRecord>;
+    createScheduleNotice(request: Service.Request.createScheduleNotice): Promise<void>;
+    markServiceNoticeRead(request: Service.Request.markServiceNoticeRead): Promise<void>;
+    markItineraryRead(request: Service.Request.markItineraryRead): Promise<void>;
+    markServiceNoticeAuth(request: Service.Request.markServiceNoticeAuth): Promise<void>;
 }
 declare const orderFulfillService: OrderFulfillService;
 export default orderFulfillService;

package/pos/modules/orderFulfill/service.js

@@ -52,9 +52,6 @@ class OrderFulfillService extends service_1.default {
     addShuttleInfo(request) {
         return (0, http_1.callApi)(this.getApiUrl(this.addShuttleInfo), request);
     }
-    changeOrderContactInfo(request) {
-        return (0, http_1.callApi)(this.getApiUrl(this.changeOrderContactInfo), request);
-    }
     changeOrderSku(request) {
         return (0, http_1.callApi)(this.getApiUrl(this.changeOrderSku), request);
     }
@@ -73,6 +70,18 @@ class OrderFulfillService extends service_1.default {
     queryOrderChangeSkuRecords(request) {
         return (0, http_1.callApi)(this.getApiUrl(this.queryOrderChangeSkuRecords), request);
     }
+    createScheduleNotice(request) {
+        return (0, http_1.callApi)(this.getApiUrl(this.createScheduleNotice), request);
+    }
+    markServiceNoticeRead(request) {
+        return (0, http_1.callApi)(this.getApiUrl(this.markServiceNoticeRead), request);
+    }
+    markItineraryRead(request) {
+        return (0, http_1.callApi)(this.getApiUrl(this.markItineraryRead), request);
+    }
+    markServiceNoticeAuth(request) {
+        return (0, http_1.callApi)(this.getApiUrl(this.markServiceNoticeAuth), request);
+    }
 }
 const orderFulfillService = new OrderFulfillService();
 exports.default = orderFulfillService;

package/pos/modules/orderFulfill/types.d.ts

@@ -131,16 +131,6 @@ export declare namespace Service {
             /** 班车供应商id */
             shuttleBusId?: string;
         }
-        interface changeOrderContactInfo {
-            /** 联系人姓名 */
-            name: string;
-            /** 联系人身份证号 */
-            idCard: string;
-            /** 联系人手机号 */
-            mobile: string;
-            /** 订单号 */
-            tradeOrderId: string;
-        }
         interface changeOrderSku {
             /** 订单Id */
             tradeOrderId: string;
@@ -221,12 +211,36 @@ export declare namespace Service {
             /** 餐食信息 */
             mealInfo: string;
         }
+        interface createScheduleNotice {
+            /** 订单id */
+            tradeOrderId: string;
+            /** unionId */
+            unionId: string;
+            /** openId */
+            openId: string;
+        }
+        interface markServiceNoticeRead {
+            /**  订单id */
+            tradeOrderId: string;
+            /**  是否是微信渠道 */
+            channel: boolean;
+        }
+        interface markItineraryRead {
+            /**  订单id */
+            tradeOrderId: string;
+            /**  是否是微信渠道 */
+            mobile: string;
+        }
+        interface markServiceNoticeAuth {
+            /**  订单id */
+            tradeOrderId: string;
+        }
     }
     namespace Response {
         interface getTourismInfoByOrderId {
             /**  订单id */
             _id: string;
-            /** 订单联系人 */
+            /** 订单联系人(待废弃) */
             contactInfo: {
                 /** 姓名 */
                 name: string;
@@ -427,11 +441,6 @@ export declare namespace Service {
          * @path /fulfill/add-shuttle-info
          */
         addShuttleInfo(request: Request.addShuttleInfo): Promise<void>;
-        /**
-         * 修改联系人信息
-         * @path /fulfill/change-order-contact-info
-         */
-        changeOrderContactInfo(request: Request.changeOrderContactInfo): Promise<void>;
         /**
          * 修改团期
          * @path /fulfill/change-order-sku
@@ -462,5 +471,25 @@ export declare namespace Service {
          * @path /fulfill/update-trade-order-tourists-info
          */
         updateTradeOrderTouristsInfo(request: Request.updateTradeOrderTouristsInfo): Promise<void>;
+        /**
+        * 创建日程提醒服务通知
+        * @path /fulfill/create-schedule-notice
+        */
+        createScheduleNotice(request: Request.createScheduleNotice): Promise<void>;
+        /**
+         * 标记服务通知已读
+         * @path /fulfill/mark-service-notice-read
+         */
+        markServiceNoticeRead(request: Request.markServiceNoticeRead): Promise<void>;
+        /**
+         * 标记行程单已读
+         * @path /fulfill/mark-itinerary-read
+         */
+        markItineraryRead(request: Request.markItineraryRead): Promise<void>;
+        /**
+         * 标记服务通知授权
+         * @path /fulfill/mark-service-notice-auth
+         */
+        markServiceNoticeAuth(request: Request.markServiceNoticeAuth): Promise<void>;
     }
 }

package/pos/modules/orderQuery/commodity.d.ts

@@ -1,11 +1,12 @@
 import BaseService from '../service';
 import { Service } from './types';
+import { POS } from '../../../types';
 declare class QueryByCommodityService extends BaseService implements Service.QueryByCommodityController {
     protected prefixUrl: string;
     queryTopSaleItem(request: Service.Request.queryTopSaleItem): Promise<Service.Response.queryTopSaleItem[]>;
     querySaleItem(request: Service.Request.querySaleItem): Promise<Service.Response.querySaleItem[]>;
-    queryOrder<K extends Service.DTO.QueryDataBlock[]>(request: any): Promise<Service.DTO.QueryDataRes<K>[]>;
-    queryOrderBySkuIdList<K extends Service.DTO.QueryDataBlock[]>(request: Service.Request.queryOrderBySkuIdList<K>): Promise<Service.DTO.QueryDataRes<K>[]>;
+    queryOrderInDepartureDate<K extends (keyof POS.Constants.QueryDataBlockTypeMap)[]>(request: Service.Request.queryOrderInDepartureDate<K>): Promise<POS.Constants.QueryDataRes<K>[]>;
+    queryOrderBySkuIdList<K extends (keyof POS.Constants.QueryDataBlockTypeMap)[]>(request: Service.Request.queryOrderBySkuIdList<K>): Promise<POS.Constants.QueryDataRes<K>[]>;
     queryItineraryList(request: Service.Request.queryItineraryList): Promise<Service.Response.queryItineraryList[]>;
     getItineraryCount(request: Service.Request.getItineraryCount): Promise<number>;
     queryPartyOrderInfo(request: Service.Request.queryPartyOrderInfo): Promise<Service.Response.queryPartyOrderInfo[]>;

package/pos/modules/orderQuery/commodity.js

@@ -16,8 +16,8 @@ class QueryByCommodityService extends service_1.default {
     querySaleItem(request) {
         return (0, http_1.callApi)(this.getApiUrl(this.querySaleItem), request);
     }
-    queryOrder(request) {
-        return (0, http_1.callApi)(this.getApiUrl(this.queryOrder), request);
+    queryOrderInDepartureDate(request) {
+        return (0, http_1.callApi)(this.getApiUrl(this.queryOrderInDepartureDate), request);
     }
     queryOrderBySkuIdList(request) {
         return (0, http_1.callApi)(this.getApiUrl(this.queryOrderBySkuIdList), request);

package/pos/modules/orderQuery/store.d.ts

@@ -1,8 +1,9 @@
 import BaseService from '../service';
 import { Service } from './types';
+import { POS } from '../../../types';
 declare class QueryByStoreService extends BaseService implements Service.QueryByStoreController {
     protected prefixUrl: string;
-    queryOrderList<K extends Service.DTO.QueryDataBlock[]>(request: Service.Request.queryStoreOrderList<K>): Promise<Service.DTO.QueryDataRes<K>[]>;
+    queryOrderList<K extends (keyof POS.Constants.QueryDataBlockTypeMap)[]>(request: Service.Request.queryStoreOrderList<K>): Promise<POS.Constants.QueryDataRes<K>[]>;
     getOrderCount(request: Service.Request.getStoreOrderCount): Promise<number>;
 }
 declare const queryByStoreService: QueryByStoreService;

package/pos/modules/orderQuery/types.d.ts

@@ -1,47 +1,7 @@
 import { POS } from '../../../types';
 export declare namespace Service {
-    namespace DTO {
-        /**  查询块枚举 */
-        enum QueryDataBlock {
-            /** 订单id */
-            _id = "_id",
-            /** 主要信息 */
-            basicInfo = "basicInfo",
-            /** 标记信息 */
-            attributes = "attributes",
-            /** 商品快照信息 */
-            itemInfo = "itemInfo",
-            /** sku快照信息 */
-            skuInfo = "skuInfo",
-            /** 支付信息 */
-            paymentInfo = "paymentInfo",
-            /** 营销信息 */
-            promotionInfo = "promotionInfo"
-        }
-        /**  订单查询结果和查询块的映射 */
-        interface QueryDataBlockTypeMap {
-            /** 订单Id */
-            _id: string;
-            /** 主要信息 */
-            [QueryDataBlock.basicInfo]: POS.DTO.IPositiveOrder;
-            /** 标记信息 */
-            [QueryDataBlock.attributes]: POS.DTO.IPositiveAttributes;
-            /** 商品快照信息 */
-            [QueryDataBlock.itemInfo]: POS.DTO.IPositiveItemInfo[];
-            /** sku快照信息 */
-            [QueryDataBlock.skuInfo]: POS.DTO.IPositiveSkuInfo[];
-            /** 支付信息 */
-            [QueryDataBlock.paymentInfo]: POS.DTO.IPositivePaymentInfo[];
-            /** 营销信息 */
-            [QueryDataBlock.promotionInfo]: POS.DTO.IPositivePromotionInfo[];
-        }
-        /**  订单查询结果 */
-        type QueryDataRes<K extends DTO.QueryDataBlock[]> = {
-            [key in K[number]]: DTO.QueryDataBlockTypeMap[key];
-        };
-    }
     namespace Request {
-        interface getOrderById<K extends DTO.QueryDataBlock[]> {
+        interface getOrderById<K> {
             /** 订单id */
             id: string;
             /** 需要查询的块 */
@@ -51,13 +11,13 @@ export declare namespace Service {
             /** 用户id */
             unionId: string;
             /** 订单状态列表 */
-            statusList: POS.Constants.TradeOrderStatusEnum[];
+            statusList?: POS.Constants.TradeOrderStatusEnum[];
             /** 二级类目 */
-            categoryTwoList: string[];
+            categoryTwoList?: string[];
             /** 履约时间 */
-            fulfillAt: number;
+            fulfillAt?: number;
         }
-        interface queryOrderByIdList<K extends DTO.QueryDataBlock[]> {
+        interface queryOrderByIdList<K> {
             /** 订单id列表 */
             idList: string[];
             /** 需要查询的块 */
@@ -67,29 +27,29 @@ export declare namespace Service {
             /** 用户id列表 */
             unionIdList: string[];
             /** 订单状态列表 */
-            statusList: POS.Constants.TradeOrderStatusEnum[];
+            statusList?: POS.Constants.TradeOrderStatusEnum[];
         }
-        interface queryUserOrder<K extends DTO.QueryDataBlock[]> {
+        interface queryUserOrder<K> {
             condition: {
                 /** 用户id */
                 unionId: string;
                 /** 订单状态列表 */
-                statusList: POS.Constants.TradeOrderStatusEnum[];
+                statusList?: POS.Constants.TradeOrderStatusEnum[];
                 /** 二级类目 */
-                categoryTwoList: string[];
+                categoryTwoList?: string[];
                 /** 是否是会员订单 */
-                isMemberOrder: boolean;
+                isMemberOrder?: boolean;
             };
             /** 排序规则 */
             sort: {
                 /** 订单创建时间 */
-                createdAt: 'ASC' | 'DESC';
+                createdAt?: 'ASC' | 'DESC';
                 /** 订单支付时间 */
-                paidAt: 'ASC' | 'DESC';
+                paidAt?: 'ASC' | 'DESC';
                 /** 完结时间 */
-                completedAt: 'ASC' | 'DESC';
+                completedAt?: 'ASC' | 'DESC';
                 /** 履约时间 */
-                fulfillAt: 'ASC' | 'DESC';
+                fulfillAt?: 'ASC' | 'DESC';
             };
             /** 页面下标 */
             pageIndex: number;
@@ -98,15 +58,15 @@ export declare namespace Service {
             /** 需要查询的块 */
             needBlocks: K;
         }
-        interface queryMemberUserOrder<K extends DTO.QueryDataBlock[]> {
+        interface queryMemberUserOrder<K> {
             /** 用户id */
             unionId: string;
             /** 订单状态列表 */
-            statusList: POS.Constants.TradeOrderStatusEnum[];
+            statusList?: POS.Constants.TradeOrderStatusEnum[];
             /** 需要查询的块 */
             needBlocks: K;
         }
-        interface getUserResentCompleteOrder<K extends DTO.QueryDataBlock[]> {
+        interface getUserResentCompleteOrder<K> {
             /** unionId */
             unionId: string;
             /** 需要查询的块 */
@@ -134,35 +94,36 @@ export declare namespace Service {
             /** 查询数量 */
             pageSize: number;
         }
-        interface queryOrder<K extends DTO.QueryDataBlock[]> {
+        interface queryOrderInDepartureDate<K> {
             /** 开始出团日期 */
             startTime: number;
             /** 结束出团日期 */
             endTime: number;
             /** 订单状态列表 */
-            statusList: POS.Constants.TradeOrderStatusEnum[];
+            statusList?: POS.Constants.TradeOrderStatusEnum[];
             /** 二级类目列表 */
-            categoryTwoList: string[];
+            categoryTwoList?: string[];
+            needBlocks: K;
         }
         interface getNearestPaidOrder {
             /** unionId */
             unionId: string;
             /** 二级类目列表 */
-            categoryTwoList: string[];
+            categoryTwoList?: string[];
         }
-        interface querySubOrderListByRootOrderId<K extends DTO.QueryDataBlock[]> {
+        interface querySubOrderListByRootOrderId<K> {
             /** 主单id */
             rootOrderId: string;
             /** 订单状态列表 */
-            statusList: POS.Constants.TradeOrderStatusEnum[];
+            statusList?: POS.Constants.TradeOrderStatusEnum[];
             /** 需要查询的块 */
             needBlocks: K;
         }
-        interface queryOrderBySkuIdList<K extends DTO.QueryDataBlock[]> {
+        interface queryOrderBySkuIdList<K> {
             /** skuId列表 */
             skuIdList: string[];
             /** 订单状态列表 */
-            statusList: POS.Constants.TradeOrderStatusEnum[];
+            statusList?: POS.Constants.TradeOrderStatusEnum[];
             /** 需要查询的块 */
             needBlocks: K;
         }
@@ -200,29 +161,29 @@ export declare namespace Service {
         }
         interface queryPartyOrderInfo {
             /** 类目 */
-            categoryTwo: string;
+            categoryTwo?: string;
             /** 履约时间 */
-            fulfillAt: number;
+            fulfillAt?: number;
             /** 商品名称 */
-            itemName: string;
+            itemName?: string;
             /** 页面下标 */
             pageIndex: number;
             /** 页面条数 */
             pageSize: number;
             /** 订单状态 */
-            status: POS.Constants.TradeOrderStatusEnum;
+            status?: POS.Constants.TradeOrderStatusEnum;
         }
         interface getPartyOrderCount {
             /** 类目 */
-            categoryTwo: string;
+            categoryTwo?: string;
             /** 履约时间 */
-            fulfillAt: number;
+            fulfillAt?: number;
             /** 商品名称 */
-            itemName: string;
+            itemName?: string;
             /** 订单状态 */
-            status: POS.Constants.TradeOrderStatusEnum;
+            status?: POS.Constants.TradeOrderStatusEnum;
         }
-        interface queryOrderList<K extends DTO.QueryDataBlock[]> {
+        interface queryOrderList<K> {
             /** 条件 */
             conditions: {
                 /** 状态 */
@@ -246,13 +207,13 @@ export declare namespace Service {
                 /** 订单Id列表 */
                 tradeOrderIdList?: string[];
                 /** 出团日期范围 */
-                fulFillAtRange: [number, number];
+                fulFillAtRange?: [number, number];
                 /** 订单创建时间筛选 */
-                createdAtRange: [number, number];
+                createdAtRange?: [number, number];
                 /** 用户身份 */
                 userIdentity?: string;
                 /** 用户列表 */
-                unionIdList: string[];
+                unionIdList?: string[];
                 /** 门店列表 */
                 storeIdList?: string[];
                 /** 班车供应商 */
@@ -265,18 +226,18 @@ export declare namespace Service {
             /** 排序 */
             sort: {
                 /** 订单创建时间 */
-                createdAt: 'ASC' | 'DESC';
+                createdAt?: 'ASC' | 'DESC';
                 /** 订单支付时间 */
-                paidAt: 'ASC' | 'DESC';
+                paidAt?: 'ASC' | 'DESC';
                 /** 完结时间 */
-                completedAt: 'ASC' | 'DESC';
+                completedAt?: 'ASC' | 'DESC';
                 /** 履约时间 */
-                fulfillAt: 'ASC' | 'DESC';
+                fulfillAt?: 'ASC' | 'DESC';
             };
             /** 查询块 */
             needBlocks: K;
         }
-        interface queryStoreOrderList<K extends DTO.QueryDataBlock[]> {
+        interface queryStoreOrderList<K> {
             /** 条件 */
             conditions: {
                 /** 状态 */
@@ -288,9 +249,9 @@ export declare namespace Service {
                 /** 二级类目 */
                 categoryTwoList?: string[];
                 /** 出团日期范围 */
-                fulFillAtRange: [number, number];
+                fulFillAtRange?: [number, number];
                 /** 订单创建时间筛选 */
-                createdAtRange: [number, number];
+                createdAtRange?: [number, number];
                 /** 门店列表 */
                 storeIdList?: string[];
                 /** 页面条数 */
@@ -301,18 +262,24 @@ export declare namespace Service {
             /** 排序 */
             sort: {
                 /** 订单创建时间 */
-                createdAt: 'ASC' | 'DESC';
+                createdAt?: 'ASC' | 'DESC';
                 /** 订单支付时间 */
-                paidAt: 'ASC' | 'DESC';
+                paidAt?: 'ASC' | 'DESC';
                 /** 完结时间 */
-                completedAt: 'ASC' | 'DESC';
+                completedAt?: 'ASC' | 'DESC';
                 /** 履约时间 */
-                fulfillAt: 'ASC' | 'DESC';
+                fulfillAt?: 'ASC' | 'DESC';
             };
             /** 查询块 */
             needBlocks: K;
         }
         interface queryPeriodTradeOrderList {
+            /** 二级类目 */
+            categoryTwo: string;
+            /** 起始时间 */
+            startTime: number;
+            /** 结束时间 */
+            endTime: number;
         }
         interface queryPeriodTradeOrderOperatorList {
             /** 二级类目 */
@@ -350,9 +317,9 @@ export declare namespace Service {
             /** 二级类目 */
             categoryTwoList?: string[];
             /** 出团日期范围 */
-            fulFillAtRange: [number, number];
+            fulFillAtRange?: [number, number];
             /** 订单创建时间筛选 */
-            createdAtRange: [number, number];
+            createdAtRange?: [number, number];
             /** 门店列表 */
             storeIdList?: string[];
         }
@@ -378,13 +345,13 @@ export declare namespace Service {
             /** 订单Id列表 */
             tradeOrderIdList?: string[];
             /** 出团日期范围 */
-            fulFillAtRange: [number, number];
+            fulFillAtRange?: [number, number];
             /** 订单创建时间筛选 */
-            createdAtRange: [number, number];
+            createdAtRange?: [number, number];
             /** 用户身份 */
             userIdentity?: string;
             /** 用户列表 */
-            unionIdList: string[];
+            unionIdList?: string[];
             /** 门店列表 */
             storeIdList?: string[];
             /** 班车供应商 */
@@ -488,12 +455,12 @@ export declare namespace Service {
          * 根据订单id查询订单
          * @path /query/user/get-order-by-id
          */
-        getOrderById<K extends DTO.QueryDataBlock[]>(request: Request.getOrderById<K>): Promise<DTO.QueryDataRes<K>>;
+        getOrderById<K extends (keyof POS.Constants.QueryDataBlockTypeMap)[]>(request: Request.getOrderById<K>): Promise<POS.Constants.QueryDataRes<K>>;
         /**
          * 根据订单id列表查询订单
          * @path /query/user/query-order-by-id-list
          */
-        queryOrderByIdList<K extends DTO.QueryDataBlock[]>(request: Request.queryOrderByIdList<K>): Promise<DTO.QueryDataRes<K>[]>;
+        queryOrderByIdList<K extends (keyof POS.Constants.QueryDataBlockTypeMap)[]>(request: Request.queryOrderByIdList<K>): Promise<POS.Constants.QueryDataRes<K>[]>;
         /**
          * 查询用户订单数量
          * @returns 订单数量
@@ -509,12 +476,12 @@ export declare namespace Service {
          * 查询用户订单
          * @path /query/user/query-user-order
          */
-        queryUserOrder<K extends DTO.QueryDataBlock[]>(request: Request.queryUserOrder<K>): Promise<DTO.QueryDataRes<K>[]>;
+        queryUserOrder<K extends (keyof POS.Constants.QueryDataBlockTypeMap)[]>(request: Request.queryUserOrder<K>): Promise<POS.Constants.QueryDataRes<K>[]>;
         /**
          * 查询主单关联的子单列表
          * @path /query/user/query-sub-order-list-by-root-order-id
          */
-        querySubOrderListByRootOrderId<K extends DTO.QueryDataBlock[]>(request: Request.querySubOrderListByRootOrderId<K>): Promise<DTO.QueryDataRes<K>[]>;
+        querySubOrderListByRootOrderId<K extends (keyof POS.Constants.QueryDataBlockTypeMap)[]>(request: Request.querySubOrderListByRootOrderId<K>): Promise<POS.Constants.QueryDataRes<K>[]>;
         /**
          * 计算用户消费信息，查丛库
          * @returns 消费金额
@@ -539,7 +506,7 @@ export declare namespace Service {
          * 查询门店订单列表
          * @path /query/store/query-order-list
          */
-        queryOrderList<K extends DTO.QueryDataBlock[]>(request: Request.queryStoreOrderList<K>): Promise<DTO.QueryDataRes<K>[]>;
+        queryOrderList<K extends (keyof POS.Constants.QueryDataBlockTypeMap)[]>(request: Request.queryStoreOrderList<K>): Promise<POS.Constants.QueryDataRes<K>[]>;
         /**
          * 查询订单数量
          * @returns 订单数量
@@ -553,7 +520,7 @@ export declare namespace Service {
          * 查询订单列表
          * @path /query/web/query-order-list
          */
-        queryOrderList<K extends DTO.QueryDataBlock[]>(request: Request.queryOrderList<K>): Promise<DTO.QueryDataRes<K>[]>;
+        queryOrderList<K extends (keyof POS.Constants.QueryDataBlockTypeMap)[]>(request: Request.queryOrderList<K>): Promise<POS.Constants.QueryDataRes<K>[]>;
         /**
          * 查询订单数量
          * @returns 订单数量
@@ -576,14 +543,14 @@ export declare namespace Service {
         /**
          * 查询出团日期内的订单Id
          * @returns 订单Id列表
-         * @path /query/commodity/query-order
+         * @path /query/commodity/query-order-in-departure-date
          */
-        queryOrder<K extends DTO.QueryDataBlock[]>(request: Request.queryOrder<K>): Promise<DTO.QueryDataRes<K>[]>;
+        queryOrderInDepartureDate<K extends (keyof POS.Constants.QueryDataBlockTypeMap)[]>(request: Request.queryOrderInDepartureDate<K>): Promise<POS.Constants.QueryDataRes<K>[]>;
         /**
          * 根据skuId列表查询订单
          * @path /query/commodity/query-order-by-sku-id-list
          */
-        queryOrderBySkuIdList<K extends DTO.QueryDataBlock[]>(request: Request.queryOrderBySkuIdList<K>): Promise<DTO.QueryDataRes<K>[]>;
+        queryOrderBySkuIdList<K extends (keyof POS.Constants.QueryDataBlockTypeMap)[]>(request: Request.queryOrderBySkuIdList<K>): Promise<POS.Constants.QueryDataRes<K>[]>;
         /**
          * 获取行程单列表，按照履约时间升序
          * @path /query/commodity/query-itinerary-list

package/pos/modules/orderQuery/types.js

@@ -1,27 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Service = void 0;
-var Service;
-(function (Service) {
-    let DTO;
-    (function (DTO) {
-        /**  查询块枚举 */
-        let QueryDataBlock;
-        (function (QueryDataBlock) {
-            /** 订单id */
-            QueryDataBlock["_id"] = "_id";
-            /** 主要信息 */
-            QueryDataBlock["basicInfo"] = "basicInfo";
-            /** 标记信息 */
-            QueryDataBlock["attributes"] = "attributes";
-            /** 商品快照信息 */
-            QueryDataBlock["itemInfo"] = "itemInfo";
-            /** sku快照信息 */
-            QueryDataBlock["skuInfo"] = "skuInfo";
-            /** 支付信息 */
-            QueryDataBlock["paymentInfo"] = "paymentInfo";
-            /** 营销信息 */
-            QueryDataBlock["promotionInfo"] = "promotionInfo";
-        })(QueryDataBlock = DTO.QueryDataBlock || (DTO.QueryDataBlock = {}));
-    })(DTO = Service.DTO || (Service.DTO = {}));
-})(Service || (exports.Service = Service = {}));

package/pos/modules/orderQuery/user.d.ts

@@ -1,13 +1,14 @@
 import BaseService from '../service';
 import { Service } from './types';
+import { POS } from '../../../types';
 declare class QueryByUserService extends BaseService implements Service.QueryByUserController {
     protected prefixUrl: string;
-    getOrderById<K extends Service.DTO.QueryDataBlock[]>(request: Service.Request.getOrderById<K>): Promise<Service.DTO.QueryDataRes<K>>;
-    queryOrderByIdList<K extends Service.DTO.QueryDataBlock[]>(request: Service.Request.queryOrderByIdList<K>): Promise<Service.DTO.QueryDataRes<K>[]>;
+    getOrderById<K extends (keyof POS.Constants.QueryDataBlockTypeMap)[]>(request: Service.Request.getOrderById<K>): Promise<POS.Constants.QueryDataRes<K>>;
+    queryOrderByIdList<K extends (keyof POS.Constants.QueryDataBlockTypeMap)[]>(request: Service.Request.queryOrderByIdList<K>): Promise<POS.Constants.QueryDataRes<K>[]>;
+    queryUserOrder<K extends (keyof POS.Constants.QueryDataBlockTypeMap)[]>(request: Service.Request.queryUserOrder<K>): Promise<POS.Constants.QueryDataRes<K>[]>;
     getUserOrderCount(request: Service.Request.getUserOrderCount): Promise<number>;
     mgetUserOrderCountList(request: Service.Request.mgetUserOrderCountList): Promise<Service.Response.mgetUserOrderCountList>;
-    queryUserOrder<K extends Service.DTO.QueryDataBlock[]>(request: Service.Request.queryUserOrder<K>): Promise<Service.DTO.QueryDataRes<K>[]>;
-    querySubOrderListByRootOrderId<K extends Service.DTO.QueryDataBlock[]>(request: Service.Request.querySubOrderListByRootOrderId<K>): Promise<Service.DTO.QueryDataRes<K>[]>;
+    querySubOrderListByRootOrderId<K extends (keyof POS.Constants.QueryDataBlockTypeMap)[]>(request: Service.Request.querySubOrderListByRootOrderId<K>): Promise<POS.Constants.QueryDataRes<K>[]>;
     calculateUserConsumeInfo(request: Service.Request.calculateUserConsumeInfo): Promise<number>;
     queryUnionIdListByTimeRange(request: Service.Request.queryUnionIdListByTimeRange): Promise<string[]>;
     queryOrderMergeRecordByOrderId(request: Service.Request.queryOrderMergeRecordByOrderId): Promise<Service.Response.queryOrderMergeRecordByOrderId[]>;

package/pos/modules/orderQuery/user.js

@@ -16,15 +16,15 @@ class QueryByUserService extends service_1.default {
     queryOrderByIdList(request) {
         return (0, http_1.callApi)(this.getApiUrl(this.queryOrderByIdList), request);
     }
+    queryUserOrder(request) {
+        return (0, http_1.callApi)(this.getApiUrl(this.queryUserOrder), request);
+    }
     getUserOrderCount(request) {
         return (0, http_1.callApi)(this.getApiUrl(this.getUserOrderCount), request);
     }
     mgetUserOrderCountList(request) {
         return (0, http_1.callApi)(this.getApiUrl(this.mgetUserOrderCountList), request);
     }
-    queryUserOrder(request) {
-        return (0, http_1.callApi)(this.getApiUrl(this.queryUserOrder), request);
-    }
     querySubOrderListByRootOrderId(request) {
         return (0, http_1.callApi)(this.getApiUrl(this.querySubOrderListByRootOrderId), request);
     }

package/pos/modules/orderQuery/web.d.ts

@@ -1,8 +1,9 @@
 import BaseService from '../service';
 import { Service } from './types';
+import { POS } from '../../../types';
 declare class QueryByWebService extends BaseService implements Service.QueryByWebController {
     protected prefixUrl: string;
-    queryOrderList<K extends Service.DTO.QueryDataBlock[]>(request: Service.Request.queryOrderList<K>): Promise<Service.DTO.QueryDataRes<K>[]>;
+    queryOrderList<K extends (keyof POS.Constants.QueryDataBlockTypeMap)[]>(request: Service.Request.queryOrderList<K>): Promise<POS.Constants.QueryDataRes<K>[]>;
     getOrderCount(request: Service.Request.getOrderCount): Promise<number>;
 }
 declare const queryByWebService: QueryByWebService;

package/types.d.ts

@@ -155,6 +155,27 @@ export declare namespace POS {
             /** 返程 */
             RETURN = "RETURN"
         }
+        /**  订单查询结果和查询块的映射 */
+        interface QueryDataBlockTypeMap {
+            /** 订单Id */
+            _id: string;
+            /** 主要信息 */
+            basicInfo: POS.DTO.IPositiveOrder;
+            /** 标记信息 */
+            attributes: POS.DTO.IPositiveAttributes;
+            /** 商品快照信息 */
+            itemInfo: POS.DTO.IPositiveItemInfo[];
+            /** sku快照信息 */
+            skuInfo: POS.DTO.IPositiveSkuInfo[];
+            /** 支付信息 */
+            paymentInfo: POS.DTO.IPositivePaymentInfo[];
+            /** 营销信息 */
+            promotionInfo: POS.DTO.IPositivePromotionInfo[];
+        }
+        /**  订单查询结果 */
+        type QueryDataRes<K extends (keyof Constants.QueryDataBlockTypeMap)[]> = {
+            [key in K[number]]: Constants.QueryDataBlockTypeMap[key];
+        };
     }
     namespace DTO {
         /**
@@ -212,6 +233,13 @@ export declare namespace POS {
                 /** 小程序场景值 */
                 appScene: number;
             };
+            /** 联系人信息 */
+            contactInfo: {
+                /** 姓名 */
+                name: string;
+                /** 电话 */
+                mobile: string;
+            };
         }
         interface IPositiveAttributes {
             /** 订单ID */
@@ -415,6 +443,10 @@ export declare namespace POS {
                 volunteerMobile?: string;
                 /** 提示 */
                 tips?: string;
+                /** 行前备注 */
+                notice: string;
+                /** 提前预约(ktv,已废弃，需要兼容) */
+                bookingDays?: number;
             };
             /** SKU 所属商品 ID */
             itemId: string;
@@ -457,6 +489,7 @@ export declare namespace POS {
                 /** SKU 是否有班车 */
                 hasShuttleBus: number;
             };
+            remainQuantity: number;
         }
         interface IWxPaymentInfo {
             appId: string;
@@ -619,9 +652,9 @@ export declare namespace POS {
         }
         interface IPositiveTouristInfo {
             /** 订单 ID。 */
-            id: string;
-            /** 联系人 */
-            contactInfo: ContactInfo;
+            _id: string;
+            /** 联系人(待废弃) */
+            contactInfo?: ContactInfo;
             /** 出行人列表 */
             tourists: TouristInfo[];
             /** 行程信息。 */
@@ -635,9 +668,13 @@ export declare namespace POS {
             /** 房间信息。 */
             roomInfo: {
                 /** 房间单人床数量。 */
-                singleBed: number;
+                DOUBLE_BED: {
+                    count: number;
+                };
                 /** 房间双人床数量。 */
-                doubleBed: number;
+                SINGLE_BED: {
+                    count: number;
+                };
             };
             /** 定制餐食信息。 */
             customMealInfo: string;
@@ -722,13 +759,5 @@ export declare namespace POS {
             /** 附件文件的URL列表 */
             attachment: string[];
         }
-        interface IRawOrderStructure {
-            basicInfo: DTO.IPositiveOrder;
-            attributes?: DTO.IPositiveAttributes;
-            itemInfo?: DTO.IPositiveItemInfo[];
-            skuInfo?: DTO.IPositiveSkuInfo[];
-            paymentInfo?: DTO.IPositivePaymentInfo[];
-            promotionInfo?: DTO.IPositivePromotionInfo[];
-        }
     }
 }