@be-link/pos-cli-nodejs 1.0.233 → 1.0.235

package/package.json

@@ -1,8 +1,17 @@
 {
   "name": "@be-link/pos-cli-nodejs",
-  "version": "1.0.233",
+  "version": "1.0.235",
   "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/orderCore/service.test.js

@@ -17,6 +17,45 @@ jest.mock('../../http', () => ({
     callApi: (...args) => mockCallApi(...args),
 }));
 const service_1 = __importDefault(require("./service"));
+describe('OrderCoreService.sceneInfo advisorShare passthrough', () => {
+    beforeEach(() => {
+        mockCallApi.mockReset().mockResolvedValue({ tradeOrderId: 'order-1' });
+    });
+    const sceneInfo = {
+        scene1: '',
+        scene2: '',
+        appScene: 0,
+        advisorShare: { advisorId: '', cardId: 'card-1', shareAt: 0 },
+    };
+    it.each([
+        ['省略', undefined],
+        ['空对象', {}],
+        ['空字符串', { advisorId: '' }],
+        ['零时间戳', { shareAt: 0 }],
+        ['完整对象', { advisorId: 'advisor-1', cardId: 'card-1', shareAt: 123 }],
+    ])('orderCreate 透传 %s advisorShare', (_label, advisorShare) => __awaiter(void 0, void 0, void 0, function* () {
+        const request = {
+            basicInfo: {
+                sceneInfo: Object.assign({ scene1: '', scene2: '', appScene: 0 }, (advisorShare === undefined ? {} : { advisorShare })),
+            },
+        };
+        yield service_1.default.orderCreate(request);
+        expect(mockCallApi).toHaveBeenCalledWith(expect.stringMatching(/\/core\/order-create$/), request);
+        expect(mockCallApi.mock.calls[0][1].basicInfo.sceneInfo.advisorShare).toBe(advisorShare);
+    }));
+    it.each([
+        ['orderCreate', 'order-create', false],
+        ['storeOrderCreate', 'store-order-create', false],
+        ['orderCreateV2', 'order-create-v2', false],
+        ['depositOrderCreate', 'deposit-order-create', false],
+        ['depositOrderComplete', 'deposit-order-complete', true],
+    ])('%s 原样透传分享信息', (method, path, isComplete) => __awaiter(void 0, void 0, void 0, function* () {
+        const request = Object.assign({ basicInfo: { sceneInfo } }, (isComplete ? { depositOrderId: 'deposit-1' } : {}));
+        yield service_1.default[method](request);
+        expect(mockCallApi).toHaveBeenCalledWith(expect.stringMatching(new RegExp(`/core/${path}$`)), request);
+        expect(mockCallApi.mock.calls[0][1].basicInfo.sceneInfo.advisorShare).toBe(sceneInfo.advisorShare);
+    }));
+});
 describe('OrderCoreService.acknowledgeAutoConfirmedOrder', () => {
     beforeEach(() => {
         mockCallApi.mockReset().mockResolvedValue(undefined);

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

@@ -42,14 +42,7 @@ export declare namespace Service {
                 /** 实际支付 */
                 actuallyPaidFee: number;
                 /** 交易场景 */
-                sceneInfo: {
-                    /** 场景1 */
-                    scene1: string;
-                    /** 场景2 */
-                    scene2: string;
-                    /** app场景 */
-                    appScene: number;
-                };
+                sceneInfo: DTO.IOrderCreateSceneInfo;
                 /** 用户订单备注 */
                 orderNote?: string;
                 /** 来源人Id */
@@ -140,14 +133,7 @@ export declare namespace Service {
                 /** 实际支付 */
                 actuallyPaidFee: number;
                 /** 交易场景 */
-                sceneInfo: {
-                    /** 场景1 */
-                    scene1: string;
-                    /** 场景2 */
-                    scene2: string;
-                    /** app场景 */
-                    appScene: number;
-                };
+                sceneInfo: DTO.IOrderCreateSceneInfo;
                 /** 用户openId */
                 openId: string;
                 /** 来源人Id */
@@ -433,11 +419,7 @@ export declare namespace Service {
                 liveRoomId: string;
                 /** 实付金额（等于定金金额，单位：分） */
                 actuallyPaidFee: number;
-                sceneInfo?: {
-                    scene1: string;
-                    scene2: string;
-                    appScene: number;
-                };
+                sceneInfo?: DTO.IOrderCreateSceneInfo;
                 fromUnionId?: string;
                 fromUserRole?: string;
                 /** 预订人手机号 */

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

@@ -8,6 +8,24 @@ import { ItemInfoProxy } from './utils/posProxy/itemInfoProxy';
 import { SkuInfoProxy } from './utils/posProxy/skuInfoProxy';
 import { VenueInfoProxy } from './utils/posProxy/venueInfoProxy';
 import { ComboInfoProxy } from './utils/posProxy/comboInfoProxy';
+/** 顾问分享信息；字段可省略，允许空字符串，是否有有效旅顾归属由业务判定。 */
+export interface IAdvisorShareInfo {
+    advisorId?: string;
+    cardId?: string;
+    shareAt?: number;
+}
+/** 订单场景信息（查询结果允许历史订单缺少场景层级）。 */
+export interface IOrderSceneInfo {
+    scene1?: string;
+    scene2?: string;
+    appScene: number;
+    advisorShare?: IAdvisorShareInfo;
+}
+/** 创建订单时必须提供一级、二级场景。 */
+export interface IOrderCreateSceneInfo extends IOrderSceneInfo {
+    scene1: string;
+    scene2: string;
+}
 /**
  * 订单正向结构
  */
@@ -59,14 +77,7 @@ export interface IPositiveOrder {
     /** 快照:关联主单ID */
     rootOrderId: string;
     /** 快照:下单场景信息 */
-    sceneInfo: {
-        /** 一级场景 */
-        scene1?: string;
-        /** 二级场景 */
-        scene2?: string;
-        /** 小程序场景值 */
-        appScene: number;
-    };
+    sceneInfo: IOrderSceneInfo;
     /** 联系人信息 */
     contactInfo: {
         /** 姓名 */

package/types.test.js

@@ -8,6 +8,42 @@ const isAutoConfirmedOrder = 1;
 const isSupplierAcknowledged = 0;
 // @ts-expect-error 原始订单结构中的布尔属性统一映射为数值
 const invalidIsAutoConfirmedOrder = true;
+// These assignments and @ts-expect-error checks run through tsc/ts-jest, not just Jest assertions.
+const advisorShare = { advisorId: '', cardId: '', shareAt: 0 };
+const createScene = { scene1: '', scene2: '', appScene: 0, advisorShare };
+const createV2Scene = createScene;
+const depositScene = createScene;
+const completeScene = createScene;
+const storedScene = { appScene: 0, advisorShare: {} };
+const legacyScene = { scene1: '', scene2: '', appScene: 0 };
+const legacyStoredScene = { appScene: 0 };
+const optionalDepositScene = undefined;
+// @ts-expect-error Share timestamps must be numeric.
+const invalidShareAt = { shareAt: '123' };
+// @ts-expect-error null is not a supported share value.
+const invalidNullShare = { advisorId: null };
+// @ts-expect-error null is not a supported scene share value.
+const invalidSceneShare = { appScene: 0, advisorShare: null };
+// @ts-expect-error New order requests still require scene1.
+const invalidCreateScene = { scene2: '', appScene: 0 };
+// @ts-expect-error Deposit creation still requires scene2 if sceneInfo is present.
+const invalidDepositScene = { scene1: '', appScene: 0 };
+describe('订单场景类型', () => {
+    it('支持空串、部分分享信息与历史订单场景', () => {
+        expect(createV2Scene.advisorShare).toBe(advisorShare);
+        expect(depositScene.advisorShare).toBe(advisorShare);
+        expect(completeScene.advisorShare).toBe(advisorShare);
+        expect(storedScene.advisorShare).toEqual({});
+        expect(legacyScene.advisorShare).toBeUndefined();
+        expect(legacyStoredScene.scene1).toBeUndefined();
+        expect(optionalDepositScene).toBeUndefined();
+        expect(invalidShareAt.shareAt).toBe('123');
+        expect(invalidNullShare.advisorId).toBeNull();
+        expect(invalidSceneShare.advisorShare).toBeNull();
+        expect(invalidCreateScene.scene1).toBeUndefined();
+        expect(invalidDepositScene.scene2).toBeUndefined();
+    });
+});
 describe('订单属性类型', () => {
     it('IPositiveAttributes 声明布尔字段，IRawOrderStructure 映射为数值字段', () => {
         expect(positiveAttributes.isAutoConfirmedOrder).toBe(true);