@be-link/pos-cli-nodejs 1.0.204 → 1.0.207

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@be-link/pos-cli-nodejs",
-  "version": "1.0.204",
+  "version": "1.0.207",
   "description": "正向订单服务Nodejs客户端",
   "main": "index.js",
   "repository": {
@@ -22,26 +22,27 @@
     "@commitlint/config-conventional": "^18.4.3",
     "@types/inquirer": "^9.0.7",
     "@types/jest": "29.5.6",
+    "@types/lodash": "4.14.202",
     "@types/node": "^20.8.9",
     "@types/uuid": "^9.0.6",
     "husky": "^8.0.3",
     "inquirer": "8.2.6",
     "jest": "29.7.0",
+    "shx": "^0.4.0",
     "standard-version": "^9.5.0",
     "ts-jest": "29.1.1",
     "ts-node": "^10.9.2",
     "typedoc": "0.25.2",
     "typedoc-plugin-missing-exports": "2.1.0",
-    "typescript": "5.2.2",
-    "@types/lodash": "4.14.202"
+    "typescript": "5.2.2"
   },
   "dependencies": {
+    "@be-link/cs-cli-nodejs": "0.1.100",
     "axios": "0.27.2",
     "axios-retry": "^4.0.0",
+    "lodash": "4.17.21",
     "uuid": "^9.0.1",
-    "vitality-meta": "1.0.236",
-    "@be-link/cs-cli-nodejs": "0.1.100",
-    "lodash": "4.17.21"
+    "vitality-meta": "1.0.236"
   },
   "scripts": {
     "build": "rm -rf ./dist && tsc && cp package.json README.md ./dist/",

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

@@ -18,6 +18,12 @@ declare class OrderFulfillService extends BaseService implements Service.orderFu
     multiSendSmsToTourist(request: Service.Request.multiSendSmsToTourist): Promise<void>;
     modifyOrderMealInfo(request: Service.Request.modifyOrderMealInfo): Promise<void>;
     queryShuttleInfoByOrderId(request: Service.Request.queryShuttleInfoByOrderId): Promise<Service.Response.queryShuttleInfoByOrderId>;
+    searchShuttleOrderList(request: Service.Request.searchShuttleOrderList): Promise<Service.Response.searchShuttleOrderList>;
+    queryShuttleRecordTimeline(request: Service.Request.queryShuttleRecordTimeline): Promise<Service.Response.queryShuttleRecordTimeline>;
+    confirmShuttleRecord(request: Service.Request.confirmShuttleRecord): Promise<Service.Response.confirmShuttleRecord>;
+    queryShuttleFormDetail(request: Service.Request.queryShuttleFormDetail): Promise<Service.Response.queryShuttleFormDetail>;
+    recognizeShuttleText(request: Service.Request.recognizeShuttleText): Promise<Service.Response.recognizeShuttleText>;
+    submitShuttleRecord(request: Service.Request.submitShuttleRecord): Promise<Service.Response.submitShuttleRecord>;
     batchUpsertItineraryInfo(request: Service.Request.batchUpsertItineraryInfo): Promise<void>;
     importPreCheck(request: Service.Request.importPreCheck): Promise<Service.Response.importPreCheck>;
     importSeatNumber(request: Service.Request.importPreCheck): Promise<void>;

package/pos/modules/orderFulfill/service.js

@@ -55,6 +55,24 @@ class OrderFulfillService extends service_1.default {
     queryShuttleInfoByOrderId(request) {
         return (0, http_1.callApi)(this.getApiUrl(this.queryShuttleInfoByOrderId), request);
     }
+    searchShuttleOrderList(request) {
+        return (0, http_1.callApi)(this.getApiUrl(this.searchShuttleOrderList), request);
+    }
+    queryShuttleRecordTimeline(request) {
+        return (0, http_1.callApi)(this.getApiUrl(this.queryShuttleRecordTimeline), request);
+    }
+    confirmShuttleRecord(request) {
+        return (0, http_1.callApi)(this.getApiUrl(this.confirmShuttleRecord), request);
+    }
+    queryShuttleFormDetail(request) {
+        return (0, http_1.callApi)(this.getApiUrl(this.queryShuttleFormDetail), request);
+    }
+    recognizeShuttleText(request) {
+        return (0, http_1.callApi)(this.getApiUrl(this.recognizeShuttleText), request);
+    }
+    submitShuttleRecord(request) {
+        return (0, http_1.callApi)(this.getApiUrl(this.submitShuttleRecord), request);
+    }
     batchUpsertItineraryInfo(request) {
         return (0, http_1.callApi)(this.getApiUrl(this.batchUpsertItineraryInfo), request);
     }

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

@@ -100,6 +100,56 @@ export declare namespace Service {
             /** 订单id */
             tradeOrderId: string;
         }
+        interface searchShuttleOrderList {
+            bookerName?: string;
+            bookerPhone?: string;
+            hotelName?: string;
+            orderId?: string;
+            supplierGroupName?: string;
+            departureDate?: string;
+            returnDate?: string;
+            tab?: string;
+            pageNum?: number;
+            pageSize?: number;
+        }
+        interface queryShuttleRecordTimeline {
+            orderId: string;
+        }
+        interface confirmShuttleRecord {
+            operateUser?: {
+                name?: string;
+            };
+            items: {
+                orderId: string;
+                recordId: string;
+                type: PosConstants.ShuttleTypeEnum;
+                carNo?: string;
+                station?: string;
+                pickupTime?: string;
+                driverPhone?: string;
+                seatNumbers?: number[];
+                remark?: string;
+            }[];
+        }
+        interface queryShuttleFormDetail {
+            orderId: string;
+            type: PosConstants.ShuttleTypeEnum;
+        }
+        interface recognizeShuttleText {
+            orderId: string;
+            type: PosConstants.ShuttleTypeEnum;
+            content: string;
+        }
+        interface submitShuttleRecord {
+            orderId: string;
+            type: PosConstants.ShuttleTypeEnum;
+            carNo: string;
+            station: string;
+            pickupTime: string;
+            driverPhone: string;
+            seatNumbers: number[];
+            remark?: string;
+        }
         interface mgetShuttleInfoByOrderIdList {
             /** 订单id */
             orderIdList: string[];
@@ -163,6 +213,10 @@ export declare namespace Service {
             tradeOrderId: string;
             /** 班车供应商id */
             shuttleBusId?: string;
+            /** 班车备注 */
+            remark?: string;
+            /** 运营操作人姓名（D35：从云函数顶层 operateUser.name 取） */
+            operatorName?: string;
         }
         interface changeOrderSku {
             /** 订单Id */
@@ -199,6 +253,12 @@ export declare namespace Service {
             seatNumbers: number[];
             /** 关联订单ID */
             tradeOrderId: string;
+            /** 班车备注 */
+            remark?: string;
+            /** 班车类型 */
+            type?: PosConstants.ShuttleTypeEnum;
+            /** 运营操作人姓名（D35：从云函数顶层 operateUser.name 取） */
+            operatorName?: string;
         }
         interface updateTradeOrderRoomCount {
             /** 订单号 */
@@ -332,6 +392,12 @@ export declare namespace Service {
             DEPARTURE?: DTO.IShuttleInfo;
             RETURN?: DTO.IShuttleInfo;
         }
+        type searchShuttleOrderList = any;
+        type queryShuttleRecordTimeline = any;
+        type confirmShuttleRecord = any;
+        type queryShuttleFormDetail = any;
+        type recognizeShuttleText = any;
+        type submitShuttleRecord = any;
         interface mgetShuttleInfoByOrderIdList {
             [orderId: string]: {
                 DEPARTURE: DTO.IShuttleInfo;
@@ -382,6 +448,12 @@ export declare namespace Service {
          * @path /fulfill/query-shuttle-info-by-order-id
          */
         queryShuttleInfoByOrderId(request: Request.queryShuttleInfoByOrderId): Promise<Response.queryShuttleInfoByOrderId>;
+        searchShuttleOrderList(request: Request.searchShuttleOrderList): Promise<Response.searchShuttleOrderList>;
+        queryShuttleRecordTimeline(request: Request.queryShuttleRecordTimeline): Promise<Response.queryShuttleRecordTimeline>;
+        confirmShuttleRecord(request: Request.confirmShuttleRecord): Promise<Response.confirmShuttleRecord>;
+        queryShuttleFormDetail(request: Request.queryShuttleFormDetail): Promise<Response.queryShuttleFormDetail>;
+        recognizeShuttleText(request: Request.recognizeShuttleText): Promise<Response.recognizeShuttleText>;
+        submitShuttleRecord(request: Request.submitShuttleRecord): Promise<Response.submitShuttleRecord>;
         /**
          * 根据订单IdList查询班车信息
          * @path /fulfill/mget-shuttle-info-by-order-id-list

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

@@ -8,6 +8,7 @@ declare class OrderJobService extends BaseService implements Service.OrderJobCon
     jobAutoCloseUnpaidOrder(): Promise<void>;
     jobAutoRefundExpiredDepositOrder(): Promise<void>;
     jobCreateHotelNotifyTask(): Promise<void>;
+    jobCreateShuttleNotifyTask(request?: Service.Request.jobCreateShuttleNotifyTask): Promise<Record<string, any>>;
     jobCreateFarmHouseNotifyTask(): Promise<void>;
     jobCreateOneSecondPartyNotifyTask(): Promise<void>;
     jobCreateTongChengJuNotifyTask(): Promise<void>;

package/pos/modules/orderJob/service.js

@@ -28,6 +28,9 @@ class OrderJobService extends service_1.default {
     jobCreateHotelNotifyTask() {
         return (0, http_1.callApi)(this.getApiUrl(this.jobCreateHotelNotifyTask));
     }
+    jobCreateShuttleNotifyTask(request) {
+        return (0, http_1.callApi)(this.getApiUrl(this.jobCreateShuttleNotifyTask), request);
+    }
     jobCreateFarmHouseNotifyTask() {
         return (0, http_1.callApi)(this.getApiUrl(this.jobCreateFarmHouseNotifyTask));
     }

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

@@ -1,4 +1,10 @@
 export declare namespace Service {
+    namespace Request {
+        interface jobCreateShuttleNotifyTask {
+            orderIds?: string[];
+            scene?: 'T-1-11:00' | 'T-1-15:00' | 'manual';
+        }
+    }
     interface OrderJobController {
         /** 自动完结订单 */
         jobAutoCompleteOrder(): Promise<void>;
@@ -10,6 +16,8 @@ export declare namespace Service {
         jobAutoRefundExpiredDepositOrder(): Promise<void>;
         /** 每天两点创建企微群发任务(酒店订单) */
         jobCreateHotelNotifyTask(): Promise<void>;
+        /** 班车 T-1 提醒任务 */
+        jobCreateShuttleNotifyTask(request?: Request.jobCreateShuttleNotifyTask): Promise<Record<string, any>>;
         /** 每天两点创建企微群发任务(农家乐订单) */
         jobCreateFarmHouseNotifyTask(): Promise<void>;
         /** 每天两点创建企微群发任务(一日聚订单) */

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

@@ -7,7 +7,6 @@ declare class OrderNoteService extends BaseService implements Service.OrderNoteC
     queryUnFinishedNoteOrderIdList(): Promise<string[]>;
     aiBuildNoteInfo(request: Service.Request.aiBuildNoteInfo): Promise<string>;
     changeNoteStatus(request: Service.Request.changeNoteStatus): Promise<void>;
-    queryNoteById(request: Service.Request.queryNoteById): Promise<Service.Response.queryNoteById>;
 }
 declare const orderNoteService: OrderNoteService;
 export default orderNoteService;

package/pos/modules/orderNote/service.js

@@ -25,9 +25,6 @@ class OrderNoteService extends service_1.default {
     changeNoteStatus(request) {
         return (0, http_1.callApi)(this.getApiUrl(this.changeNoteStatus), request);
     }
-    queryNoteById(request) {
-        return (0, http_1.callApi)(this.getApiUrl(this.queryNoteById), request);
-    }
 }
 const orderNoteService = new OrderNoteService();
 exports.default = orderNoteService;

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

@@ -40,14 +40,9 @@ export declare namespace Service {
             /** 修改人类型 */
             modifyOperatorRole: PosConstants.ModifyOperatorRoleEnum;
         }
-        interface queryNoteById {
-            /** 备注Id */
-            noteId: string;
-        }
     }
     namespace Response {
         type queryNoteByOrderIdList = DTO.IPositiveNoteInfo[];
-        type queryNoteById = DTO.IPositiveNoteInfo | null;
     }
     interface OrderNoteController {
         /**
@@ -77,11 +72,5 @@ export declare namespace Service {
          * @path /note/change-note-status
          */
         changeNoteStatus(request: Request.changeNoteStatus): Promise<void>;
-        /**
-         * 根据备注id查询单条备注
-         * @returns 备注，不存在时为 null
-         * @path /note/query-note-by-id
-         */
-        queryNoteById(request: Request.queryNoteById): Promise<Response.queryNoteById>;
     }
 }

package/types.d.ts

@@ -873,6 +873,17 @@ export interface IShuttleInfo {
         /** 结算价 */
         settlementPrice: number;
     };
+    /** 班车状态 */
+    status?: number;
+    /** 定时提醒记录 */
+    notifyRecords?: {
+        time: number;
+        chatId: string;
+        chatName: string;
+        scene: string;
+    }[];
+    /** 班车备注 */
+    remark?: string;
 }
 export interface IPositiveNoteInfo {
     /** 备注Id */