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

package/package.json

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

package/pos/http.test.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -69,3 +92,11 @@ describe('callApi error envelope', () => {
         expect(error).toMatchObject({ code: 503 });
     }));
 });
+it('高龄拦截码与可供旧客户端展示的完整恢复文案透传', () => __awaiter(void 0, void 0, void 0, function* () {
+    const { SENIOR_CONFIRMATION_REQUIRED, SENIOR_CONFIRMATION_RECOVERY_MESSAGE } = yield Promise.resolve().then(() => __importStar(require('./modules/orderCore/seniorConfirmationRecovery')));
+    jest.spyOn(console, 'error').mockImplementation(() => undefined);
+    mockPost.mockRejectedValue({ message: 'Request failed', response: { status: 400, data: { message: SENIOR_CONFIRMATION_RECOVERY_MESSAGE, code: SENIOR_CONFIRMATION_REQUIRED } } });
+    const error = yield (0, http_1.callApi)('https://pos.test/core/accept', {}).catch(caught => caught);
+    expect(error).toMatchObject({ code: SENIOR_CONFIRMATION_REQUIRED, message: SENIOR_CONFIRMATION_RECOVERY_MESSAGE, statusCode: 400 });
+    jest.restoreAllMocks();
+}));

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

@@ -0,0 +1,2 @@
+export declare const SENIOR_CONFIRMATION_REQUIRED = "SENIOR_CONFIRMATION_REQUIRED";
+export declare const SENIOR_CONFIRMATION_RECOVERY_MESSAGE = "\u8BA2\u5355\u5DF2\u4ED8\u6B3E\uFF0C\u9700\u5B8C\u6210\u9AD8\u9F84\u51FA\u884C\u4EBA\u5065\u5EB7\u53CA\u514D\u8D23\u786E\u8BA4\u540E\u65B9\u53EF\u63A5\u5355\u3002\u8BF7\u5728\u8BA2\u5355\u8BE6\u60C5\u7EE7\u7EED\u786E\u8BA4\uFF1B\u5982\u65E0\u786E\u8BA4\u5165\u53E3\uFF0C\u8BF7\u66F4\u65B0\u6216\u91CD\u65B0\u6253\u5F00\u5C0F\u7A0B\u5E8F\uFF0C\u518D\u5230\u201C\u6211\u7684\u8BA2\u5355\u201D\u627E\u5230\u672C\u5355\u3002\u6682\u65F6\u65E0\u6CD5\u66F4\u65B0\u8BF7\u8054\u7CFB\u5BA2\u670D\uFF0C\u8BA2\u5355\u4FDD\u7559\u5F85\u786E\u8BA4\uFF0C\u8BF7\u52FF\u91CD\u590D\u4ED8\u6B3E\u3002";

package/pos/modules/orderCore/seniorConfirmationRecovery.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SENIOR_CONFIRMATION_RECOVERY_MESSAGE = exports.SENIOR_CONFIRMATION_REQUIRED = void 0;
+// Stable code; keep the message readable for clients that only display msg/message.
+exports.SENIOR_CONFIRMATION_REQUIRED = 'SENIOR_CONFIRMATION_REQUIRED';
+exports.SENIOR_CONFIRMATION_RECOVERY_MESSAGE = '订单已付款，需完成高龄出行人健康及免责确认后方可接单。请在订单详情继续确认；如无确认入口，请更新或重新打开小程序，再到“我的订单”找到本单。暂时无法更新请联系客服，订单保留待确认，请勿重复付款。';

package/pos/modules/orderCore/seniorDisclaimer.test.d.ts

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

package/pos/modules/orderCore/seniorDisclaimer.test.js

@@ -0,0 +1,43 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+jest.mock('../../http', () => ({ callApi: jest.fn() }));
+const http_1 = require("../../http");
+const service_1 = __importDefault(require("./service"));
+it('确认记录两个接口保持完整请求和 kebab-case 路由', () => __awaiter(void 0, void 0, void 0, function* () {
+    const prepare = { version: 'V1', orderRequest: { tourismInfo: { touristIdList: ['senior'] } } };
+    yield service_1.default.prepareSeniorDisclaimer(prepare);
+    expect(http_1.callApi).toHaveBeenCalledWith(expect.stringMatching(/\/core\/prepare-senior-disclaimer$/), prepare);
+    const accept = { recordId: 'record-A', unionId: 'buyer-A' };
+    yield service_1.default.acceptSeniorDisclaimer(accept);
+    expect(http_1.callApi).toHaveBeenCalledWith(expect.stringMatching(/\/core\/accept-senior-disclaimer$/), accept);
+}));
+for (const [name, route] of [
+    ['getSeniorConfirmation', 'get-senior-confirmation'],
+    ['saveSeniorHealthDraft', 'save-senior-health-draft'],
+    ['markSeniorConfirmationRead', 'mark-senior-confirmation-read'],
+    ['acceptSeniorConfirmation', 'accept-senior-confirmation'],
+]) {
+    it(name + ' preserves request and route', () => __awaiter(void 0, void 0, void 0, function* () {
+        const request = { orderId: 'order-A', unionId: 'buyer-A', sessionId: 'session-A', touristId: 'person-A' };
+        yield service_1.default[name](request);
+        expect(http_1.callApi).toHaveBeenLastCalledWith(expect.stringMatching(new RegExp('/core/' + route + '$')), request);
+    }));
+}
+it('START的服务端正文及版本保持透传，不只保留token', () => __awaiter(void 0, void 0, void 0, function* () {
+    const reply = { readToken: 'reading-token', readText: '合成协议正文', documentVersion: 'approved-version' };
+    http_1.callApi.mockResolvedValue(reply);
+    const result = yield service_1.default.markSeniorConfirmationRead({ orderId: 'order-A', unionId: 'buyer-A', sessionId: 'session-A', touristId: 'person-A', kind: 'HEALTH', phase: 'START' });
+    expect(result).toEqual(reply);
+}));

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

@@ -1,8 +1,18 @@
-import { Service } from './types';
+import { Service, SeniorDisclaimerPreparation, SeniorConfirmationState } from './types';
 import BaseService from '../service';
 import { IPositiveOrderInvoice } from '../../../types';
 declare class OrderCoreService extends BaseService implements Service.OrderCoreController {
     protected prefixUrl: string;
+    getSeniorConfirmation(request: Service.Request.getSeniorConfirmation): Promise<SeniorConfirmationState>;
+    saveSeniorHealthDraft(request: Service.Request.saveSeniorHealthDraft): Promise<void>;
+    markSeniorConfirmationRead(request: Service.Request.markSeniorConfirmationRead): Promise<{
+        readToken: string;
+    }>;
+    acceptSeniorConfirmation(request: Service.Request.acceptSeniorConfirmation): Promise<void>;
+    prepareSeniorDisclaimer(request: Service.Request.prepareSeniorDisclaimer): Promise<SeniorDisclaimerPreparation>;
+    acceptSeniorDisclaimer(request: Service.Request.acceptSeniorDisclaimer): Promise<{
+        recordId: string;
+    }>;
     orderFulfill(request: Service.Request.orderFulfill): Promise<void>;
     updateOrderInvoice(request: IPositiveOrderInvoice): Promise<string>;
     orderCreateInvoice(request: IPositiveOrderInvoice): Promise<IPositiveOrderInvoice>;

package/pos/modules/orderCore/service.js

@@ -10,6 +10,24 @@ class OrderCoreService extends service_1.default {
         super(...arguments);
         this.prefixUrl = '/core';
     }
+    getSeniorConfirmation(request) {
+        return (0, http_1.callApi)(this.getApiUrl(this.getSeniorConfirmation), request);
+    }
+    saveSeniorHealthDraft(request) {
+        return (0, http_1.callApi)(this.getApiUrl(this.saveSeniorHealthDraft), request);
+    }
+    markSeniorConfirmationRead(request) {
+        return (0, http_1.callApi)(this.getApiUrl(this.markSeniorConfirmationRead), request);
+    }
+    acceptSeniorConfirmation(request) {
+        return (0, http_1.callApi)(this.getApiUrl(this.acceptSeniorConfirmation), request);
+    }
+    prepareSeniorDisclaimer(request) {
+        return (0, http_1.callApi)(this.getApiUrl(this.prepareSeniorDisclaimer), request);
+    }
+    acceptSeniorDisclaimer(request) {
+        return (0, http_1.callApi)(this.getApiUrl(this.acceptSeniorDisclaimer), request);
+    }
     orderFulfill(request) {
         return (0, http_1.callApi)(this.getApiUrl(this.orderFulfill), request);
     }

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

@@ -1,8 +1,121 @@
 import * as PosConstants from 'vitality-meta/enums/pos';
 import * as DTO from '../../../types';
 export type RescheduleSource = 'WEB' | 'BIZ_FLOW' | 'ORDER_CHANGE';
+export interface SeniorDisclaimerTourist {
+    id: string;
+    name: string;
+    age: number;
+    maskedIdCard: string;
+}
+export interface SeniorDisclaimerPreparation {
+    required: boolean;
+    accepted?: boolean;
+    recordId?: string;
+    title?: string;
+    content?: string;
+    contentHash?: string;
+    agreementVersion?: string;
+    minimumReadSeconds?: number;
+    tourists?: SeniorDisclaimerTourist[];
+    departureDate?: string;
+    itemName?: string;
+}
+export interface SeniorHealthAnswers {
+    emergencyContact: {
+        name: string;
+        relationship: string;
+        phone: string;
+        nonTraveler: boolean;
+    };
+    diseaseGroup1: string[];
+    diseaseGroup2: string[];
+    allergyDetails: string;
+    otherDetails: string;
+    recentDiscomfort: string;
+    regularMedication: string;
+    mobility: string;
+    canAdapt: string;
+}
+export interface SeniorConfirmationPerson extends SeniorDisclaimerTourist {
+    gender: string;
+    mobile: string;
+    birthday: string;
+}
+export interface SeniorHealthProgress {
+    touristId: string;
+    answers: SeniorHealthAnswers | null;
+    confirmedAt: number | null;
+    disclaimerConfirmedAt: number | null;
+    disclaimerText?: string;
+}
+export interface SeniorConfirmationState {
+    required: boolean;
+    paid: boolean;
+    completed: boolean;
+    orderId: string;
+    sessionId?: string;
+    stateLabel?: string;
+    itemName?: string;
+    departureDate?: string;
+    returnDate?: string;
+    tourists?: SeniorConfirmationPerson[];
+    healthRecords?: SeniorHealthProgress[];
+    relationships?: Record<string, string>;
+    documents?: {
+        version: string;
+        notice: string;
+        confirmationText: string;
+        healthConfirmationText: string;
+        healthText: string;
+        disclaimerText: string;
+        diseaseGroups: Array<Array<{
+            id: string;
+            label: string;
+        }>>;
+        questions: Array<{
+            key: string;
+            label: string;
+            options: Array<{
+                value: string;
+                label: string;
+            }>;
+        }>;
+    };
+}
 export declare namespace Service {
     namespace Request {
+        interface getSeniorConfirmation {
+            orderId: string;
+            unionId: string;
+        }
+        interface saveSeniorHealthDraft extends getSeniorConfirmation {
+            sessionId: string;
+            touristId: string;
+            answers: SeniorHealthAnswers;
+        }
+        interface markSeniorConfirmationRead extends getSeniorConfirmation {
+            sessionId: string;
+            kind: 'HEALTH' | 'DISCLAIMER';
+            touristId: string;
+            phase: 'START' | 'BOTTOM';
+            readToken?: string;
+            answers?: SeniorHealthAnswers;
+            relationships?: Record<string, string>;
+        }
+        interface acceptSeniorConfirmation extends getSeniorConfirmation {
+            sessionId: string;
+            kind: 'HEALTH' | 'DISCLAIMER';
+            touristId: string;
+            readToken: string;
+        }
+        interface prepareSeniorDisclaimer {
+            version: 'V1' | 'V2';
+            orderRequest: orderCreate | orderCreateV2;
+        }
+        interface acceptSeniorDisclaimer {
+            recordId: string;
+            unionId: string;
+        }
         interface createOrderInvoice {
             /** 快照:订单ID */
             tradeOrderId?: string;
@@ -33,6 +146,7 @@ export declare namespace Service {
             };
         }
         interface orderCreate {
+            seniorDisclaimerRecordId?: string;
             /** 基础信息 */
             basicInfo: {
                 /** 用户id */
@@ -126,6 +240,7 @@ export declare namespace Service {
             storeAdjustmentReason?: string;
         }
         interface orderCreateV2 {
+            seniorDisclaimerRecordId?: string;
             /** 基础信息 */
             basicInfo: {
                 /** 用户id */
@@ -534,6 +649,18 @@ export declare namespace Service {
         }[];
     }
     interface OrderCoreController {
+        getSeniorConfirmation(request: Request.getSeniorConfirmation): Promise<SeniorConfirmationState>;
+        saveSeniorHealthDraft(request: Request.saveSeniorHealthDraft): Promise<void>;
+        markSeniorConfirmationRead(request: Request.markSeniorConfirmationRead): Promise<{
+            readToken: string;
+            readText?: string;
+            documentVersion?: string;
+        }>;
+        acceptSeniorConfirmation(request: Request.acceptSeniorConfirmation): Promise<void>;
+        prepareSeniorDisclaimer(request: Request.prepareSeniorDisclaimer): Promise<SeniorDisclaimerPreparation>;
+        acceptSeniorDisclaimer(request: Request.acceptSeniorDisclaimer): Promise<{
+            recordId: string;
+        }>;
         /**
          * 订单发票修改
          * @path /core/update-order-invoice

package/pos/modules/orderQuery/settlement.test.d.ts

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

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

@@ -0,0 +1,43 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+jest.mock('../../http', () => ({ callApi: jest.fn() }));
+const http_1 = require("../../http");
+const pos_1 = require("vitality-meta/enums/pos");
+const user_1 = __importDefault(require("./user"));
+const mockedCallApi = http_1.callApi;
+describe('getOrderSettlementFacts', () => {
+    beforeEach(() => mockedCallApi.mockReset());
+    it.each([0, 2])('返回原始结算事实，保留 %s 份且不要求 attributes block', (remainQuantity) => __awaiter(void 0, void 0, void 0, function* () {
+        const facts = {
+            orderId: 'order-1',
+            status: pos_1.TradeOrderStatusEnum.SUCCEED,
+            remainQuantity,
+        };
+        mockedCallApi.mockResolvedValue(facts);
+        const request = { id: 'order-1' };
+        yield expect(user_1.default.getOrderSettlementFacts(request)).resolves.toBe(facts);
+        expect(mockedCallApi).toHaveBeenCalledWith(expect.stringMatching(/\/query\/user\/get-order-settlement-facts$/), request);
+    }));
+    it('未完结状态原样返回，由消费者决定重试', () => __awaiter(void 0, void 0, void 0, function* () {
+        const facts = { orderId: 'order-1', status: pos_1.TradeOrderStatusEnum.FULFILLING, remainQuantity: 1 };
+        mockedCallApi.mockResolvedValue(facts);
+        yield expect(user_1.default.getOrderSettlementFacts({ id: 'order-1' })).resolves.toEqual(facts);
+    }));
+    it('查询失败不使用零份数或缓存结果兜底', () => __awaiter(void 0, void 0, void 0, function* () {
+        const error = new Error('upstream unavailable');
+        mockedCallApi.mockRejectedValue(error);
+        yield expect(user_1.default.getOrderSettlementFacts({ id: 'order-1' })).rejects.toBe(error);
+    }));
+});

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

@@ -3,6 +3,10 @@ import * as DTO from '../../../types';
 /** QueryByWeb 命名空间 */
 export declare namespace Service {
     namespace Request {
+        interface getOrderSettlementFacts {
+            /** 订单id */
+            id: string;
+        }
         interface getOrderById<K> {
             /** 订单id */
             id: string;
@@ -965,6 +969,13 @@ export declare namespace Service {
         }
     }
     namespace Response {
+        /** 查询时主库同一快照中的状态与主 ITEM 剩余份数，不是完结时快照。 */
+        interface getOrderSettlementFacts {
+            orderId: string;
+            status: PosConstants.TradeOrderStatusEnum;
+            /** 首个匹配主 ITEM 的剩余份数；无主 ITEM SKU 时取首个匹配商品行，零为有效值。 */
+            remainQuantity: number;
+        }
         interface mgetUserOrderCountList {
             /** 用户id: 数量 */
             [unionId: string]: number;
@@ -1296,6 +1307,12 @@ export declare namespace Service {
     }
     /**  用户维度查询 */
     interface QueryByUserController {
+        /**
+         * 查询当前主库结算事实，绕过缓存。调用方仅在 SUCCEED 时入账，入账后不因退款调整。
+         * 未完结订单原样返回状态；不存在或份数缺失/非法时抛错，不以零兜底。
+         * @path /query/user/get-order-settlement-facts
+         */
+        getOrderSettlementFacts(request: Request.getOrderSettlementFacts): Promise<Response.getOrderSettlementFacts>;
         /**
          * list开票记录
          * @returns 开票记录

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

@@ -3,6 +3,7 @@ import { Service } from './types';
 import * as DTO from '../../../types';
 declare class QueryByUserService extends BaseService implements Service.QueryByUserController {
     protected prefixUrl: string;
+    getOrderSettlementFacts(request: Service.Request.getOrderSettlementFacts): Promise<Service.Response.getOrderSettlementFacts>;
     listOrderInvoiceCount(request: Service.Request.getOrderInvoiceRequest): Promise<number>;
     listOrderInvoice(request: Service.Request.getOrderInvoiceRequest): Promise<DTO.IPositiveOrderInvoice[]>;
     getOrderInvoiceByOrderId(request: any): Promise<DTO.IPositiveOrderInvoice>;

package/pos/modules/orderQuery/user.js

@@ -20,6 +20,9 @@ class QueryByUserService extends service_1.default {
         super(...arguments);
         this.prefixUrl = '/query/user';
     }
+    getOrderSettlementFacts(request) {
+        return (0, http_1.callApi)(this.getApiUrl(this.getOrderSettlementFacts), request);
+    }
     listOrderInvoiceCount(request) {
         return (0, http_1.callApi)(this.getApiUrl(this.listOrderInvoiceCount), request);
     }