@be-link/pos-cli-nodejs 1.0.232 → 1.0.234

package/package.json

@@ -1,8 +1,17 @@
 {
   "name": "@be-link/pos-cli-nodejs",
-  "version": "1.0.232",
+  "version": "1.0.234",
   "description": "正向订单服务Nodejs客户端",
   "main": "index.js",
+  "scripts": {
+    "build": "rm -rf ./dist && tsc && cp package.json README.md ./dist/",
+    "test": "npx jest",
+    "gen-doc": "npx typedoc --options typedoc.json",
+    "update:major": "standard-version --release-as major",
+    "update:minor": "standard-version  --release-as minor",
+    "update:patch": "standard-version  --release-as patch",
+    "update:beta": "standard-version --prerelease beta"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/snowmountain-top/pos-cli-nodejs.git"
@@ -43,14 +52,5 @@
     "lodash": "4.17.21",
     "uuid": "^9.0.1",
     "vitality-meta": "1.0.240"
-  },
-  "scripts": {
-    "build": "rm -rf ./dist && tsc && cp package.json README.md ./dist/",
-    "test": "npx jest",
-    "gen-doc": "npx typedoc --options typedoc.json",
-    "update:major": "standard-version --release-as major",
-    "update:minor": "standard-version  --release-as minor",
-    "update:patch": "standard-version  --release-as patch",
-    "update:beta": "standard-version --prerelease beta"
   }
-}
+}

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

@@ -26,6 +26,10 @@ declare class OrderJobService extends BaseService implements Service.OrderJobCon
     jobNotifySupplierTomorrowOrder(): Promise<void>;
     jobNotifySupplierInvoiceOrder(): Promise<void>;
     jobNotifySupplierInvoiceDay(): Promise<void>;
+    jobNotifyPendingSupplierPaid24h(request?: Service.Request.jobNotifyPendingSupplierPaid24h): Promise<Record<string, number>>;
+    jobNotifyPendingSupplierT1(request: Service.Request.jobNotifyPendingSupplierT1): Promise<Record<string, number>>;
+    jobNotifyPendingInvoiceDay5(request?: Service.Request.jobNotifyPendingInvoiceDay5): Promise<Record<string, number>>;
+    jobNotifyRejectedUncontacted72h(request?: Service.Request.jobNotifyRejectedUncontacted72h): Promise<Record<string, number>>;
     jobNotifyFeishuOfConfirmBus(): Promise<void>;
     jobPushTourSupplierForConfirmOrder(): Promise<void>;
     jobCompensateOrderPaid(): Promise<void>;

package/pos/modules/orderJob/service.js

@@ -82,6 +82,18 @@ class OrderJobService extends service_1.default {
     jobNotifySupplierInvoiceDay() {
         return (0, http_1.callApi)(this.getApiUrl(this.jobNotifySupplierInvoiceDay));
     }
+    jobNotifyPendingSupplierPaid24h(request) {
+        return (0, http_1.callApi)(this.getApiUrl(this.jobNotifyPendingSupplierPaid24h), request);
+    }
+    jobNotifyPendingSupplierT1(request) {
+        return (0, http_1.callApi)(this.getApiUrl(this.jobNotifyPendingSupplierT1), request);
+    }
+    jobNotifyPendingInvoiceDay5(request) {
+        return (0, http_1.callApi)(this.getApiUrl(this.jobNotifyPendingInvoiceDay5), request);
+    }
+    jobNotifyRejectedUncontacted72h(request) {
+        return (0, http_1.callApi)(this.getApiUrl(this.jobNotifyRejectedUncontacted72h), request);
+    }
     jobNotifyFeishuOfConfirmBus() {
         return (0, http_1.callApi)(this.getApiUrl(this.jobNotifyFeishuOfConfirmBus));
     }

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

@@ -4,6 +4,24 @@ export declare namespace Service {
             orderIds?: string[];
             scene?: 'T-1-10:00' | 'T-1-15:00' | 'manual';
         }
+        interface jobNotifyPendingSupplierPaid24h {
+            now?: number;
+            lookbackHours?: number;
+            dryRun?: boolean;
+        }
+        interface jobNotifyPendingSupplierT1 {
+            now?: number;
+            bizTypes: Array<'TOUR' | 'PARTY_HOTEL' | 'ONE_SECOND_PARTY'>;
+            dryRun?: boolean;
+        }
+        interface jobNotifyPendingInvoiceDay5 {
+            now?: number;
+            dryRun?: boolean;
+        }
+        interface jobNotifyRejectedUncontacted72h {
+            now?: number;
+            dryRun?: boolean;
+        }
     }
     interface OrderJobController {
         /** 自动完结订单 */
@@ -54,6 +72,14 @@ export declare namespace Service {
         jobNotifySupplierInvoiceOrder(): Promise<void>;
         /** 每天通知超过5天未处理的发票 */
         jobNotifySupplierInvoiceDay(): Promise<void>;
+        /** 每10分钟补扫支付满24小时仍待接单 */
+        jobNotifyPendingSupplierPaid24h(request?: Request.jobNotifyPendingSupplierPaid24h): Promise<Record<string, number>>;
+        /** 出行前一天仍待接单 */
+        jobNotifyPendingSupplierT1(request: Request.jobNotifyPendingSupplierT1): Promise<Record<string, number>>;
+        /** 申请发票第5天仍未开票 */
+        jobNotifyPendingInvoiceDay5(request?: Request.jobNotifyPendingInvoiceDay5): Promise<Record<string, number>>;
+        /** 拒单满72小时且销售未联系用户 */
+        jobNotifyRejectedUncontacted72h(request?: Request.jobNotifyRejectedUncontacted72h): Promise<Record<string, number>>;
         /** 每天早上10点，出团前5天飞书通知客服再次确认班车 */
         jobNotifyFeishuOfConfirmBus(): Promise<void>;
         /** 从8点开始每隔3小时催促供应商接单 */

package/pos/modules/orderQuery/service.test.js

@@ -39,28 +39,22 @@ describe('自动接单订单查询契约', () => {
     beforeEach(() => {
         mockCallApi.mockReset().mockResolvedValue([]);
     });
-    it.each([0, 1])('list/count/statistics 透传属性值 %s', (value) => __awaiter(void 0, void 0, void 0, function* () {
-        yield store_1.default.queryOrderList(storeListRequest(value, value));
-        yield store_1.default.getOrderCount(storeCountRequest(value, value));
-        yield web_1.default.queryOrderForStatistics(statisticsRequest(value, value));
-        expect(mockCallApi.mock.calls.map((call) => call[1])).toEqual([
-            expect.objectContaining({
-                conditions: expect.objectContaining({
-                    isAutoConfirmedOrder: value,
-                    isSupplierAcknowledged: value,
-                }),
-            }),
-            expect.objectContaining({
-                isAutoConfirmedOrder: value,
-                isSupplierAcknowledged: value,
-            }),
-            expect.objectContaining({
-                conditions: expect.objectContaining({
-                    isAutoConfirmedOrder: value,
-                    isSupplierAcknowledged: value,
-                }),
-            }),
-        ]);
+    it.each([
+        [0, 0],
+        [0, 1],
+        [1, 0],
+        [1, 1],
+    ])('list/count/statistics 透传属性值 (%s, %s)', (isAutoConfirmedOrder, isSupplierAcknowledged) => __awaiter(void 0, void 0, void 0, function* () {
+        yield store_1.default.queryOrderList(storeListRequest(isAutoConfirmedOrder, isSupplierAcknowledged));
+        yield store_1.default.getOrderCount(storeCountRequest(isAutoConfirmedOrder, isSupplierAcknowledged));
+        yield web_1.default.queryOrderForStatistics(statisticsRequest(isAutoConfirmedOrder, isSupplierAcknowledged));
+        const [listRequest, countRequest, statisticsRequestValue] = mockCallApi.mock.calls.map((call) => call[1]);
+        expect(listRequest.conditions.isAutoConfirmedOrder).toBe(isAutoConfirmedOrder);
+        expect(listRequest.conditions.isSupplierAcknowledged).toBe(isSupplierAcknowledged);
+        expect(countRequest.isAutoConfirmedOrder).toBe(isAutoConfirmedOrder);
+        expect(countRequest.isSupplierAcknowledged).toBe(isSupplierAcknowledged);
+        expect(statisticsRequestValue.conditions.isAutoConfirmedOrder).toBe(isAutoConfirmedOrder);
+        expect(statisticsRequestValue.conditions.isSupplierAcknowledged).toBe(isSupplierAcknowledged);
     }));
     it('未传新增字段时保持旧请求结构', () => __awaiter(void 0, void 0, void 0, function* () {
         const listRequest = storeListRequest();

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

@@ -30,8 +30,10 @@ export declare namespace Service {
         interface getOrderInvoiceRequest {
             /** 开票状态 */
             invoiceStatus?: string;
-            /** 创建时间 */
+            /** 创建时间（旧累计查询上限） */
             createdAt?: number;
+            /** 创建时间左闭右开范围 */
+            createdAtRange?: [number, number];
             /** 开票方 */
             invoiceBase?: string;
             page?: number;

package/types.d.ts

@@ -132,6 +132,10 @@ export interface IPositiveAttributes {
     isMigratedItemOrder: boolean;
     /** 是否为同程视频号订单 */
     isTongchengVideoAccountOrder: boolean;
+    /** 是否为自动接单订单 */
+    isAutoConfirmedOrder?: boolean;
+    /** 供应商是否已知晓 */
+    isSupplierAcknowledged?: boolean;
     /** 跟团游不成团状态 GroupFormationStatusEnum：null 非不成团 / PENDING / RESCHEDULING / RESOLVED */
     isGroupFormationFailed: string | null;
     /** 不成团操作时间（毫秒时间戳，仅存于 attributes JSON） */

package/types.test.d.ts

@@ -0,0 +1 @@
+export {};

package/types.test.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const positiveAttributes = {
+    isAutoConfirmedOrder: true,
+    isSupplierAcknowledged: false,
+};
+const isAutoConfirmedOrder = 1;
+const isSupplierAcknowledged = 0;
+// @ts-expect-error 原始订单结构中的布尔属性统一映射为数值
+const invalidIsAutoConfirmedOrder = true;
+describe('订单属性类型', () => {
+    it('IPositiveAttributes 声明布尔字段，IRawOrderStructure 映射为数值字段', () => {
+        expect(positiveAttributes.isAutoConfirmedOrder).toBe(true);
+        expect(positiveAttributes.isSupplierAcknowledged).toBe(false);
+        expect(isAutoConfirmedOrder).toBe(1);
+        expect(isSupplierAcknowledged).toBe(0);
+        expect(invalidIsAutoConfirmedOrder).toBe(true);
+    });
+});