@pisell/pisellos 2.2.94 → 2.2.95

package/dist/core/index.d.ts

@@ -29,6 +29,7 @@ declare class PisellOSCore implements PisellCore {
     getModuleExports<T = any>(name: string): T | null;
     hasModule(name: string): boolean;
     destroy(): Promise<void>;
+    setContext(ctx: Partial<BusinessContext>): void;
     /**
      * 验证上下文参数
      */

package/dist/core/index.js

@@ -403,6 +403,13 @@ var PisellOSCore = /*#__PURE__*/function () {
       }
       return destroy;
     }()
+  }, {
+    key: "setContext",
+    value: function setContext(ctx) {
+      this.context = _objectSpread(_objectSpread({}, this.context), ctx);
+      this.log("\u4E0A\u4E0B\u6587\u5DF2\u66F4\u65B0: ".concat(JSON.stringify(Object.keys(ctx))));
+    }
+
     /**
      * 验证上下文参数
      */

package/dist/modules/Customer/index.d.ts

@@ -9,6 +9,7 @@ export declare class CustomerModule extends BaseModule implements Module, Custom
     private cacheId;
     private openCache;
     private fatherModule;
+    private otherParams;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     /**

package/dist/modules/Customer/index.js

@@ -56,6 +56,7 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "cacheId", void 0);
     _defineProperty(_assertThisInitialized(_this), "openCache", false);
     _defineProperty(_assertThisInitialized(_this), "fatherModule", void 0);
+    _defineProperty(_assertThisInitialized(_this), "otherParams", {});
     return _this;
   }
   _createClass(CustomerModule, [{
@@ -70,6 +71,7 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
               this.core = core;
               this.store = options === null || options === void 0 ? void 0 : options.store;
               this.request = this.core.getPlugin('request');
+              this.otherParams = (options === null || options === void 0 ? void 0 : options.otherParams) || {};
 
               // 初始化状态
               if (Array.isArray(options === null || options === void 0 || (_options$initialState = options.initialState) === null || _options$initialState === void 0 ? void 0 : _options$initialState.customerList)) {
@@ -112,7 +114,7 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
               if (options !== null && options !== void 0 && (_options$otherParams2 = options.otherParams) !== null && _options$otherParams2 !== void 0 && _options$otherParams2.fatherModule) {
                 this.fatherModule = options.otherParams.fatherModule;
               }
-            case 13:
+            case 14:
             case "end":
               return _context.stop();
           }
@@ -132,7 +134,7 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
     key: "fetchCustomerListData",
     value: (function () {
       var _fetchCustomerListData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-        var _res$data, _res$data2;
+        var _this$otherParams, _res$data, _this$otherParams2, _customerList2, _res$data2;
         var params,
           url,
           _params$skip,
@@ -140,16 +142,21 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
           _params$num,
           num,
           search,
-          otherParams,
+          _otherParams,
           queryParams,
           res,
+          _customerList,
+          _customerList3,
           _args2 = arguments;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               params = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : {};
-              url = '/customer/select-list';
-              _params$skip = params.skip, skip = _params$skip === void 0 ? 1 : _params$skip, _params$num = params.num, num = _params$num === void 0 ? DEFAULT_PAGE_SIZE : _params$num, search = params.search, otherParams = _objectWithoutProperties(params, _excluded);
+              url = '/customer/select-list'; // 如果是加盟子店铺，则使用加盟商的客户列表接口
+              if ((_this$otherParams = this.otherParams) !== null && _this$otherParams !== void 0 && _this$otherParams.isFranchisee) {
+                url = '/franchisee/customer/select-list';
+              }
+              _params$skip = params.skip, skip = _params$skip === void 0 ? 1 : _params$skip, _params$num = params.num, num = _params$num === void 0 ? DEFAULT_PAGE_SIZE : _params$num, search = params.search, _otherParams = _objectWithoutProperties(params, _excluded);
               queryParams = _objectSpread(_objectSpread({
                 skip: skip,
                 num: num,
@@ -159,29 +166,38 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
                 search_wallet_pass_flag: 1
               }, search && {
                 search: search
-              }), otherParams);
-              _context2.next = 6;
+              }), _otherParams);
+              _context2.next = 7;
               return this.request.get(url, queryParams, {
                 cache: {
                   mode: RequestModeENUM.REMOTE_LOCAL,
                   type: "memory"
                 }
               });
-            case 6:
+            case 7:
               res = _context2.sent;
               if (!((res === null || res === void 0 ? void 0 : res.code) !== 200)) {
-                _context2.next = 9;
+                _context2.next = 10;
                 break;
               }
               throw new Error(res === null || res === void 0 ? void 0 : res.message);
-            case 9:
+            case 10:
+              // 如果是加盟子店铺，查询的接口返回的数据都是总店的客户数据，需要加上标识
+              _customerList = (res === null || res === void 0 || (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list) || [];
+              if ((_this$otherParams2 = this.otherParams) !== null && _this$otherParams2 !== void 0 && _this$otherParams2.isFranchisee && ((_customerList2 = _customerList) === null || _customerList2 === void 0 ? void 0 : _customerList2.length) > 0) {
+                _customerList = (_customerList3 = _customerList) === null || _customerList3 === void 0 ? void 0 : _customerList3.map(function (item) {
+                  return _objectSpread(_objectSpread({}, item || {}), {}, {
+                    is_franchisor_customer: 1 // 标识是总店的客户
+                  });
+                });
+              }
               return _context2.abrupt("return", {
-                customerList: (res === null || res === void 0 || (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list) || [],
+                customerList: _customerList,
                 total: (res === null || res === void 0 || (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.count) || 0,
                 page: skip,
                 pageSize: num
               });
-            case 10:
+            case 13:
             case "end":
               return _context2.stop();
           }

package/dist/modules/Order/index.d.ts

@@ -23,7 +23,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      */
     private logError;
     createOrder(params: CommitOrderParams['query']): {
-        type: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/dist/server/index.d.ts

@@ -167,7 +167,7 @@ declare class Server {
      */
     private handleUnsubscribeOrderQuery;
     /**
-     * 判断预约查询的 es_start_datetime_between 起始日期是否为今天
+     * 判断预约查询的 sales_time_between 起始日期是否为今天
      */
     private isBookingQueryForToday;
     /**
@@ -201,11 +201,16 @@ declare class Server {
     /**
      * 商品查询的核心计算逻辑（编排 Products、Menu、Schedule 模块）
      * 供 handleProductQuery 首次返回及 pubsub 变更推送复用
+     * @param context 查询上下文
+     * @param options 可选参数
+     * @param options.changedIds 变更的商品 IDs，用于增量更新价格缓存
      */
     private computeProductQueryResult;
     /**
      * 数据变更后，遍历所有订阅者重新计算查询结果并通过 callback 推送
      * 由 ProductsModule 的 onProductsSyncCompleted 事件触发
+     * @param options 可选参数
+     * @param options.changedIds 变更的商品 IDs，用于增量更新价格缓存
      */
     private recomputeAndNotifyProductQuery;
     /**

package/dist/server/index.js

@@ -29,7 +29,7 @@ import { perfMark } from "./utils/product";
 import { OrderModule } from "./modules/order";
 import { OrderHooks } from "./modules/order/types";
 import { filterOrders } from "./modules/order/utils/filterOrders";
-import { filterBookingsFromOrders, sortBookings, flattenOrdersToBookings } from "./modules/order/utils/filterBookings";
+import { filterBookingsFromOrders, sortBookings } from "./modules/order/utils/filterBookings";
 
 // 重新导出类型供外部使用
 
@@ -977,8 +977,10 @@ var Server = /*#__PURE__*/function () {
               });
             case 14:
               // 监听 ProductsModule 同步完成事件，重新计算并推送查询结果
-              this.core.effects.on(ProductsHooks.onProductsSyncCompleted, function () {
-                _this3.recomputeAndNotifyProductQuery();
+              this.core.effects.on(ProductsHooks.onProductsSyncCompleted, function (payload) {
+                _this3.recomputeAndNotifyProductQuery({
+                  changedIds: payload === null || payload === void 0 ? void 0 : payload.changedIds
+                });
               });
 
               // 订单 / 预约本地数据变更时，向订阅者推送最新列表
@@ -1380,10 +1382,10 @@ var Server = /*#__PURE__*/function () {
     key: "isBookingQueryForToday",
     value:
     /**
-     * 判断预约查询的 es_start_datetime_between 起始日期是否为今天
+     * 判断预约查询的 sales_time_between 起始日期是否为今天
      */
     function isBookingQueryForToday(data) {
-      var range = data === null || data === void 0 ? void 0 : data.es_start_datetime_between;
+      var range = data === null || data === void 0 ? void 0 : data.sales_time_between;
       if (!Array.isArray(range) || range.length < 1) return true;
       var startDateStr = String(range[0]).split('T')[0].split(' ')[0];
       var todayStr = dayjs().format('YYYY-MM-DD');
@@ -1420,6 +1422,7 @@ var Server = /*#__PURE__*/function () {
               _context17.prev = 3;
               _context17.next = 6;
               return this.app.request.get('/shop/order/sales', _objectSpread(_objectSpread({}, data), {}, {
+                form_record_ids: undefined,
                 with: ["all"]
               }), {
                 isShopApi: true
@@ -1427,15 +1430,15 @@ var Server = /*#__PURE__*/function () {
             case 6:
               response = _context17.sent;
               rawList = (_ref23 = (_response$data$list = response === null || response === void 0 || (_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.list) !== null && _response$data$list !== void 0 ? _response$data$list : response === null || response === void 0 ? void 0 : response.list) !== null && _ref23 !== void 0 ? _ref23 : [];
-              list = flattenOrdersToBookings(rawList);
+              list = filterBookingsFromOrders(rawList, data);
               this.logInfo('fetchBookingListFromAPI: API 返回并拆分完成', {
                 rawCount: rawList.length,
-                flattenedCount: list.length
+                flattenedCount: list.count
               });
               return _context17.abrupt("return", {
                 code: 200,
                 data: _objectSpread(_objectSpread({}, response.data), {}, {
-                  list: list
+                  list: (list === null || list === void 0 ? void 0 : list.list) || []
                 }),
                 message: '',
                 status: true
@@ -1586,15 +1589,18 @@ var Server = /*#__PURE__*/function () {
     /**
      * 商品查询的核心计算逻辑（编排 Products、Menu、Schedule 模块）
      * 供 handleProductQuery 首次返回及 pubsub 变更推送复用
+     * @param context 查询上下文
+     * @param options 可选参数
+     * @param options.changedIds 变更的商品 IDs，用于增量更新价格缓存
      */
     )
   }, {
     key: "computeProductQueryResult",
     value: (function () {
-      var _computeProductQueryResult = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(context) {
+      var _computeProductQueryResult = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(context, options) {
         var _menu_list_ids$length3,
           _this5 = this;
-        var tTotal, menu_list_ids, schedule_date, schedule_datetime, activeMenuList, tMenu, menuList, tPrice, allProductsWithPrice, tFilter, filteredProducts, tSort;
+        var tTotal, menu_list_ids, schedule_date, schedule_datetime, activeMenuList, tMenu, menuList, tPrice, allProductsWithPrice, tFilter, filteredProducts, tStatus, beforeStatusCount, tSort;
         return _regeneratorRuntime().wrap(function _callee20$(_context20) {
           while (1) switch (_context20.prev = _context20.next) {
             case 0:
@@ -1603,7 +1609,8 @@ var Server = /*#__PURE__*/function () {
               this.logInfo('computeProductQueryResult 开始', {
                 menuListIdsCount: (_menu_list_ids$length3 = menu_list_ids === null || menu_list_ids === void 0 ? void 0 : menu_list_ids.length) !== null && _menu_list_ids$length3 !== void 0 ? _menu_list_ids$length3 : 0,
                 schedule_datetime: schedule_datetime,
-                schedule_date: schedule_date
+                schedule_date: schedule_date,
+                changedIds: options === null || options === void 0 ? void 0 : options.changedIds
               });
               if (this.products) {
                 _context20.next = 6;
@@ -1661,6 +1668,8 @@ var Server = /*#__PURE__*/function () {
               _context20.next = 17;
               return this.products.getProductsWithPrice(schedule_date, {
                 scheduleModule: this.getSchedule()
+              }, {
+                changedIds: options === null || options === void 0 ? void 0 : options.changedIds
               });
             case 17:
               allProductsWithPrice = _context20.sent;
@@ -1673,6 +1682,15 @@ var Server = /*#__PURE__*/function () {
                 before: allProductsWithPrice.length,
                 after: filteredProducts.length
               });
+              tStatus = performance.now();
+              beforeStatusCount = filteredProducts.length;
+              filteredProducts = filteredProducts.filter(function (p) {
+                return ((p === null || p === void 0 ? void 0 : p.status) || "published") === 'published';
+              });
+              perfMark('computeQuery.filterByStatus', performance.now() - tStatus, {
+                before: beforeStatusCount,
+                after: filteredProducts.length
+              });
               tSort = performance.now();
               filteredProducts = filteredProducts.sort(function (a, b) {
                 var sortDiff = Number(b.sort) - Number(a.sort);
@@ -1701,13 +1719,13 @@ var Server = /*#__PURE__*/function () {
                 message: '',
                 status: true
               });
-            case 28:
+            case 32:
             case "end":
               return _context20.stop();
           }
         }, _callee20, this);
       }));
-      function computeProductQueryResult(_x23) {
+      function computeProductQueryResult(_x23, _x24) {
         return _computeProductQueryResult.apply(this, arguments);
       }
       return computeProductQueryResult;
@@ -1715,12 +1733,14 @@ var Server = /*#__PURE__*/function () {
     /**
      * 数据变更后，遍历所有订阅者重新计算查询结果并通过 callback 推送
      * 由 ProductsModule 的 onProductsSyncCompleted 事件触发
+     * @param options 可选参数
+     * @param options.changedIds 变更的商品 IDs，用于增量更新价格缓存
      */
     )
   }, {
     key: "recomputeAndNotifyProductQuery",
     value: (function () {
-      var _recomputeAndNotifyProductQuery = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21() {
+      var _recomputeAndNotifyProductQuery = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(options) {
         var _iterator3, _step3, _step3$value, subscriberId, subscriber, result, errorMessage;
         return _regeneratorRuntime().wrap(function _callee21$(_context21) {
           while (1) switch (_context21.prev = _context21.next) {
@@ -1732,7 +1752,8 @@ var Server = /*#__PURE__*/function () {
               return _context21.abrupt("return");
             case 2:
               this.logInfo('recomputeAndNotifyProductQuery: 开始推送', {
-                subscriberCount: this.productQuerySubscribers.size
+                subscriberCount: this.productQuerySubscribers.size,
+                changedIds: options === null || options === void 0 ? void 0 : options.changedIds
               });
               _iterator3 = _createForOfIteratorHelper(this.productQuerySubscribers.entries());
               _context21.prev = 4;
@@ -1745,7 +1766,9 @@ var Server = /*#__PURE__*/function () {
               _step3$value = _slicedToArray(_step3.value, 2), subscriberId = _step3$value[0], subscriber = _step3$value[1];
               _context21.prev = 8;
               _context21.next = 11;
-              return this.computeProductQueryResult(subscriber.context);
+              return this.computeProductQueryResult(subscriber.context, {
+                changedIds: options === null || options === void 0 ? void 0 : options.changedIds
+              });
             case 11:
               result = _context21.sent;
               subscriber.callback(result);
@@ -1782,7 +1805,7 @@ var Server = /*#__PURE__*/function () {
           }
         }, _callee21, this, [[4, 24, 27, 30], [8, 16]]);
       }));
-      function recomputeAndNotifyProductQuery() {
+      function recomputeAndNotifyProductQuery(_x25) {
         return _recomputeAndNotifyProductQuery.apply(this, arguments);
       }
       return recomputeAndNotifyProductQuery;

package/dist/server/modules/order/types.d.ts

@@ -438,7 +438,7 @@ export interface BookingFilters {
     payment_method?: string[];
     business_code?: string;
     appointment_status?: string[];
-    es_start_datetime_between?: string[];
+    sales_time_between?: string[];
     /**
      * 仅保留「预约开始时刻」大于等于该时间的条目。
      * 预约时刻由 start_date 与 start_time 拼接解析（与 order_by start_at 一致）。

package/dist/server/modules/order/utils/filterBookings.js

@@ -71,7 +71,7 @@ function prepareFilters(f) {
     customerIdStr: hasCustomerId ? String(f.customer_id) : '',
     hasBusinessCode: !!f.business_code,
     businessCode: f.business_code,
-    bookingTimeRange: parseDateRange(f.es_start_datetime_between),
+    bookingTimeRange: parseDateRange(f.sales_time_between),
     createdAtRange: parseDateRange(f.created_at_between),
     updatedAtRange: parseDateRange(f.updated_at_between),
     numberRange: parseNumberRange(f.number_between),

package/dist/server/modules/products/index.d.ts

@@ -53,14 +53,20 @@ export declare class ProductsModule extends BaseModule implements Module {
      * 缓存的是已经应用了价格的完整商品列表，避免重复转换
      * @param schedule_date 日期
      * @param extraContext 额外的上下文数据（可选，由 Server 层传入）
+     * @param options 可选参数
+     * @param options.changedIds 变更的商品 IDs，非空时仅对这些商品增量执行 prepare 并更新缓存
      * @returns 应用了价格的商品列表
      */
-    getProductsWithPrice(schedule_date: string, extraContext?: Partial<ProductFormatterContext>): Promise<ProductData[]>;
+    getProductsWithPrice(schedule_date: string, extraContext?: Partial<ProductFormatterContext>, options?: {
+        changedIds?: number[];
+    }): Promise<ProductData[]>;
     /**
      * 准备带价格的商品数据（通过格式化器流程处理）
      * @param schedule_date 日期
      * @param extraContext 额外的上下文数据（可选）
-     * @returns 完整处理后的商品列表
+     * @param options 可选参数
+     * @param options.productIds 指定商品 IDs，仅处理这些商品；不传则处理全量
+     * @returns 处理后的商品列表
      * @private
      */
     private prepareProductsWithPrice;
@@ -156,11 +162,6 @@ export declare class ProductsModule extends BaseModule implements Module {
      * 用于 pubsub 同步 create / update / batch_update 场景
      */
     refreshProducts(): Promise<ProductData[]>;
-    /**
-     * 局部更新指定商品的报价单价格
-     * 遍历所有已缓存的日期，为目标商品重新获取价格并覆盖到缓存中
-     */
-    updateProductPriceByIds(ids: number[]): Promise<void>;
     /**
      * 清空缓存
      */
@@ -202,15 +203,18 @@ export declare class ProductsModule extends BaseModule implements Module {
      *
      * product 模块：
      *   - operation === 'delete' → 本地删除
-     *   - 有 body（无 price change_types） → body 完整数据直接覆盖本地
-     *   - change_types 包含 price → SSE 增量拉取 + 刷新报价单价格缓存
-     *   - change_types 仅 stock → 跳过（暂不响应）
+     *   - change_types 包含 price → 仅收集变更 IDs（不拉商品数据）
+     *   - 有 body → body 完整数据直接覆盖本地
+     *   - 其他 → SSE 增量拉取
      *
-     * product_collection / product_category / product_quotation：
+     * product_collection / product_category：
      *   - 按 relation_product_ids SSE 拉取受影响商品
-     *   - product_quotation 额外刷新报价单价格缓存
      *
-     * 处理完成后 emit onProductsSyncCompleted 通知 Server 层
+     * product_quotation：
+     *   - 报价单变更影响范围大，直接清除价格缓存走全量重建
+     *
+     * 处理完成后 emit onProductsSyncCompleted（携带 changedIds），
+     * Server 层监听该事件后对变更商品增量执行 prepareProductsWithPrice 并更新缓存
      */
     private processProductSyncMessages;
     /**
@@ -221,7 +225,8 @@ export declare class ProductsModule extends BaseModule implements Module {
     /**
      * 将 body 完整数据直接覆盖到本地 store（不调用报价单接口）
      * 已存在的 → 直接替换；不存在的 → 追加
-     * 同时更新 Map 缓存、IndexDB，清空价格缓存，触发 onProductsChanged
+     * 同时更新 Map 缓存、IndexDB，触发 onProductsChanged
+     * 价格缓存由 processProductSyncMessages 末尾统一清除
      */
     private applyBodyUpdatesToStore;
     /**
@@ -230,16 +235,6 @@ export declare class ProductsModule extends BaseModule implements Module {
      * 同时更新 store.map、IndexDB，触发 onProductsChanged
      */
     private mergeProductsToStore;
-    /**
-     * 增量更新价格缓存中变更的商品
-     * 对每个已缓存的日期 key：替换/追加最新商品数据，重新拉取这些 ID 的价格并应用
-     */
-    private updatePriceCacheForProducts;
-    /**
-     * 全量重新拉取报价单价格并重建价格缓存
-     * 遍历当前已缓存的所有日期 key，对每个日期重新调用 loadProductsPrice
-     */
-    private refreshAllPriceCache;
     /**
      * 静默全量刷新：后台重新拉取全量 SSE 数据并更新本地
      * 拿到完整数据后一次性替换 store，清除价格缓存，触发 onProductsSyncCompleted