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

package/package.json

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

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

@@ -4,10 +4,11 @@ declare class OrderAbnormalFollowService extends BaseService implements Service.
     protected prefixUrl: string;
     upsertFollow(request: Service.Request.upsertFollow): Promise<void>;
     listByOrderIds(request: Service.Request.listByOrderIds): Promise<Service.Response.listByOrderIds>;
+    listActiveByFollowUnionIds(request: Service.Request.listActiveByFollowUnionIds): Promise<Service.Response.listActiveByFollowUnionIds>;
     markUserReminded(request: Service.Request.markUserReminded): Promise<boolean>;
     createHotelChangeFollow(request: Service.Request.createHotelChangeFollow): Promise<void>;
     updateHotelChangeNotifyStatus(request: Service.Request.updateHotelChangeNotifyStatus): Promise<void>;
-    softDelete(request: Service.Request.softDelete): Promise<void>;
+    softDelete(request: Service.Request.softDelete): Promise<boolean>;
     countByTypeInScope(request: Service.Request.countByTypeInScope): Promise<number>;
 }
 declare const orderAbnormalFollowService: OrderAbnormalFollowService;

package/pos/modules/orderAbnormalFollow/service.js

@@ -16,6 +16,9 @@ class OrderAbnormalFollowService extends service_1.default {
     listByOrderIds(request) {
         return (0, http_1.callApi)(this.getApiUrl(this.listByOrderIds), request);
     }
+    listActiveByFollowUnionIds(request) {
+        return (0, http_1.callApi)(this.getApiUrl(this.listActiveByFollowUnionIds), request);
+    }
     markUserReminded(request) {
         return (0, http_1.callApi)(this.getApiUrl(this.markUserReminded), request);
     }

package/pos/modules/orderAbnormalFollow/service.test.d.ts

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

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

@@ -0,0 +1,72 @@
+"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"));
+const mockedCallApi = http_1.callApi;
+describe('OrderAbnormalFollowService', () => {
+    beforeEach(() => {
+        mockedCallApi.mockReset();
+        mockedCallApi.mockResolvedValue(undefined);
+    });
+    it.each([
+        ['upsertFollow', { orderId: 'order-1', abnormalType: 'REJECTED' }, 'upsert-follow'],
+        ['listByOrderIds', { orderIds: ['order-1'] }, 'list-by-order-ids'],
+        [
+            'listActiveByFollowUnionIds',
+            { followUnionIds: ['sales-1'], pageIndex: 0, pageSize: 20 },
+            'list-active-by-follow-union-ids',
+        ],
+        [
+            'markUserReminded',
+            {
+                orderId: 'order-1',
+                abnormalType: 'HOTEL_ORDER_CHANGE',
+                followUnionId: 'sales-1',
+                changeFlowId: 'flow-1',
+            },
+            'mark-user-reminded',
+        ],
+        [
+            'createHotelChangeFollow',
+            {
+                orderId: 'order-1',
+                followUnionId: 'sales-1',
+                changeFlowId: 'flow-1',
+                changeType: 'CHANGE_RESCHEDULE_ROOM',
+                changeStatus: 'SUCCEED',
+                changeContent: '改期',
+                processedAt: 1,
+            },
+            'create-hotel-change-follow',
+        ],
+        [
+            'softDelete',
+            {
+                orderId: 'order-1',
+                abnormalType: 'HOTEL_ORDER_CHANGE',
+                followUnionId: 'sales-1',
+                changeFlowId: 'flow-1',
+            },
+            'soft-delete',
+        ],
+        ['countByTypeInScope', { followUnionIds: ['sales-1'], abnormalType: 'REJECTED' }, 'count-by-type-in-scope'],
+    ])('%s 映射到 abnormal-follow kebab URL 并原样序列化请求', (method, request, path) => __awaiter(void 0, void 0, void 0, function* () {
+        yield service_1.default[method](request);
+        expect(mockedCallApi).toHaveBeenCalledWith(expect.stringMatching(new RegExp(`/abnormal-follow/${path}$`)), request);
+    }));
+});

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

@@ -9,14 +9,26 @@ export declare namespace Service {
             status?: FollowStatus;
             followUnionId?: string;
             remindedAt?: number;
+            /** 酒店变更一单多卡时定位具体变更流；普通异常不传 */
+            changeFlowId?: string;
         }
         interface listByOrderIds {
             orderIds: string[];
         }
+        /** 按异常负责人查询仍有效的异常记录，用于异常工作台最小可见范围。 */
+        interface listActiveByFollowUnionIds {
+            followUnionIds: string[];
+            abnormalTypes?: AbnormalType[];
+            pageIndex: number;
+            pageSize: number;
+        }
         interface markUserReminded {
             orderId: string;
             abnormalType: AbnormalType.APPEND_FAILED | AbnormalType.UPCOMING | AbnormalType.HOTEL_ORDER_CHANGE;
-            followUnionId: string;
+            /** 异常负责人授权分支传入；既有常规订单权限分支可省略。 */
+            followUnionId?: string;
+            /** 酒店订单变更一单多卡时必须传入。 */
+            changeFlowId?: string;
         }
         interface createHotelChangeFollow {
             orderId: string;
@@ -43,6 +55,10 @@ export declare namespace Service {
         interface softDelete {
             orderId: string;
             abnormalType: AbnormalType;
+            /** 异常负责人授权分支传入；既有常规订单权限分支可省略。 */
+            followUnionId?: string;
+            /** 酒店订单变更一单多卡时必须传入。 */
+            changeFlowId?: string;
         }
         interface countByTypeInScope {
             followUnionIds: string[];
@@ -51,6 +67,7 @@ export declare namespace Service {
     }
     namespace Response {
         type listByOrderIds = DTO.IOrderAbnormalFollowRow[];
+        type listActiveByFollowUnionIds = DTO.IOrderAbnormalFollowRow[];
         type countByTypeInScope = number;
     }
     interface OrderAbnormalFollowController {
@@ -64,6 +81,11 @@ export declare namespace Service {
          * @path /abnormal-follow/list-by-order-ids
          */
         listByOrderIds(request: Request.listByOrderIds): Promise<Response.listByOrderIds>;
+        /**
+         * 按异常负责人查询仍有效的异常记录
+         * @path /abnormal-follow/list-active-by-follow-union-ids
+         */
+        listActiveByFollowUnionIds(request: Request.listActiveByFollowUnionIds): Promise<Response.listActiveByFollowUnionIds>;
         /**
          * 标记已提醒用户
          * @path /abnormal-follow/mark-user-reminded
@@ -79,7 +101,7 @@ export declare namespace Service {
          * 软删除跟进记录
          * @path /abnormal-follow/soft-delete
          */
-        softDelete(request: Request.softDelete): Promise<void>;
+        softDelete(request: Request.softDelete): Promise<boolean>;
         /**
          * 按范围统计异常跟进数量
          * @path /abnormal-follow/count-by-type-in-scope

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

@@ -14,6 +14,7 @@ declare class OrderCoreService extends BaseService implements Service.OrderCoreC
     supplierRejected(request: Service.Request.supplierRejected): Promise<void | Service.BatchDealResult>;
     supplierConfirmed(request: Service.Request.supplierConfirmed): Promise<void | Service.BatchDealResult>;
     supplierReconfirm(request: Service.Request.supplierReconfirm): Promise<void>;
+    acknowledgeAutoConfirmedOrder(request: Service.Request.acknowledgeAutoConfirmedOrder): Promise<void>;
     submittedToSupplier(request: Service.Request.submittedToSupplier): Promise<void>;
     sendOrderPaidNotification(request: Service.Request.sendOrderPaidNotification): Promise<void>;
     orderSettled(request: Service.Request.orderSettled): Promise<void>;

package/pos/modules/orderCore/service.js

@@ -43,6 +43,9 @@ class OrderCoreService extends service_1.default {
     supplierReconfirm(request) {
         return (0, http_1.callApi)(this.getApiUrl(this.supplierReconfirm), request);
     }
+    acknowledgeAutoConfirmedOrder(request) {
+        return (0, http_1.callApi)(this.getApiUrl(this.acknowledgeAutoConfirmedOrder), request);
+    }
     submittedToSupplier(request) {
         return (0, http_1.callApi)(this.getApiUrl(this.submittedToSupplier), request);
     }

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

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

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

@@ -0,0 +1,33 @@
+"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 });
+const mockCallApi = jest.fn();
+jest.mock('../../http', () => ({
+    callApi: (...args) => mockCallApi(...args),
+}));
+const service_1 = __importDefault(require("./service"));
+describe('OrderCoreService.acknowledgeAutoConfirmedOrder', () => {
+    beforeEach(() => {
+        mockCallApi.mockReset().mockResolvedValue(undefined);
+    });
+    it('只发送已知晓公开字段', () => __awaiter(void 0, void 0, void 0, function* () {
+        const request = {
+            tradeOrderId: 'order-1',
+            operator: 'supplier-user',
+        };
+        yield service_1.default.acknowledgeAutoConfirmedOrder(request);
+        expect(mockCallApi).toHaveBeenCalledWith(expect.stringMatching(/\/core\/acknowledge-auto-confirmed-order$/), request);
+        expect(mockCallApi.mock.calls[0][1]).not.toHaveProperty('operatorRole');
+    }));
+});

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

@@ -287,6 +287,12 @@ export declare namespace Service {
             /** 操作人角色 */
             operatorRole: PosConstants.TradeOperatorRoleEnum;
         }
+        interface acknowledgeAutoConfirmedOrder {
+            /** 订单id */
+            tradeOrderId: string;
+            /** 操作人 */
+            operator: string;
+        }
         interface sendOrderPaidNotification {
             /** 订单Id */
             tradeOrderId: string;
@@ -595,6 +601,11 @@ export declare namespace Service {
          * @path /core/supplier-reconfirm
          */
         supplierReconfirm(request: Request.supplierReconfirm): Promise<void>;
+        /**
+         * 确认已知晓自动接单订单
+         * @path /core/acknowledge-auto-confirmed-order
+         */
+        acknowledgeAutoConfirmedOrder(request: Request.acknowledgeAutoConfirmedOrder): Promise<void>;
         /**
          * 提交给供应商
          * @path /core/submitted-to-supplier

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

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

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

@@ -0,0 +1,77 @@
+"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 });
+const mockCallApi = jest.fn();
+jest.mock('../../http', () => ({
+    callApi: (...args) => mockCallApi(...args),
+}));
+const store_1 = __importDefault(require("./store"));
+const web_1 = __importDefault(require("./web"));
+const needBlocks = ['basicInfo'];
+function storeListRequest(isAutoConfirmedOrder, isSupplierAcknowledged) {
+    return {
+        conditions: Object.assign(Object.assign({ storeIdList: ['store-1'], supplierIds: ['supplier-1'], pageIndex: 0, pageSize: 10 }, (isAutoConfirmedOrder !== undefined ? { isAutoConfirmedOrder } : {})), (isSupplierAcknowledged !== undefined ? { isSupplierAcknowledged } : {})),
+        sort: {},
+        needBlocks,
+    };
+}
+function storeCountRequest(isAutoConfirmedOrder, isSupplierAcknowledged) {
+    return Object.assign(Object.assign({ storeIdList: ['store-1'], supplierIds: ['supplier-1'] }, (isAutoConfirmedOrder !== undefined ? { isAutoConfirmedOrder } : {})), (isSupplierAcknowledged !== undefined ? { isSupplierAcknowledged } : {}));
+}
+function statisticsRequest(isAutoConfirmedOrder, isSupplierAcknowledged) {
+    return {
+        conditions: Object.assign(Object.assign({}, (isAutoConfirmedOrder !== undefined ? { isAutoConfirmedOrder } : {})), (isSupplierAcknowledged !== undefined ? { isSupplierAcknowledged } : {})),
+        needBlocks,
+    };
+}
+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('未传新增字段时保持旧请求结构', () => __awaiter(void 0, void 0, void 0, function* () {
+        const listRequest = storeListRequest();
+        const countRequest = storeCountRequest();
+        const exportRequest = statisticsRequest();
+        yield store_1.default.queryOrderList(listRequest);
+        yield store_1.default.getOrderCount(countRequest);
+        yield web_1.default.queryOrderForStatistics(exportRequest);
+        for (const request of mockCallApi.mock.calls.map((call) => call[1])) {
+            expect(JSON.stringify(request)).not.toContain('isAutoConfirmedOrder');
+            expect(JSON.stringify(request)).not.toContain('isSupplierAcknowledged');
+        }
+    }));
+});

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

@@ -494,6 +494,10 @@ export declare namespace Service {
                 isNotFinishedNote?: boolean;
                 /** 是否排除已合并的订单 */
                 isExcludeMerged?: boolean;
+                /** 是否为自动接单订单 */
+                isAutoConfirmedOrder?: 0 | 1;
+                /** 供应商是否已知晓 */
+                isSupplierAcknowledged?: 0 | 1;
                 /** 下单人 ECS 门店 ID 列表（快照 ecsStoreId） */
                 ecsStoreIdList?: string[];
                 /** 是否无来源销售（fromUnionId 为空） */
@@ -565,6 +569,10 @@ export declare namespace Service {
                 isExcludeMerged?: boolean;
                 /** 是否仅查询主单（排除子单） */
                 isRootOrder?: boolean;
+                /** 是否为自动接单订单 */
+                isAutoConfirmedOrder?: 0 | 1;
+                /** 供应商是否已知晓 */
+                isSupplierAcknowledged?: 0 | 1;
                 /** 套餐 */
                 combo?: string;
             };
@@ -703,6 +711,10 @@ export declare namespace Service {
             isExcludeMerged?: boolean;
             /** 是否仅查询主单（排除子单） */
             isRootOrder?: boolean;
+            /** 是否为自动接单订单 */
+            isAutoConfirmedOrder?: 0 | 1;
+            /** 供应商是否已知晓 */
+            isSupplierAcknowledged?: 0 | 1;
             /** 套餐 */
             combo?: string;
             /** 拼团类型 */