@pisell/pisellos 2.2.91 → 2.2.93

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/server/modules/products/index.js

@@ -1526,7 +1526,7 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
     key: "processProductSyncMessages",
     value: (function () {
       var _processProductSyncMessages = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
-        var messages, deleteIds, bodyUpdates, sseRefreshIds, priceRefreshIds, shouldClearPriceCache, _iterator7, _step7, msg, channelKey, _msg$relation_product, _msg$change_types, _msg$ids2, _msg$ids, ids, bodyId, _msg$relation_product2, _msg$relation_product3, uniqueDeleteIds, uniqueSSEIds, uniquePriceIds, freshProducts, allChangedIds, hasChanges;
+        var messages, deleteIds, bodyUpdates, sseRefreshIds, priceRefreshIds, shouldClearPriceCache, _iterator7, _step7, msg, channelKey, _msg$relation_product, _msg$change_types, _msg$ids2, _msg$ids, ids, bodyId, _bodyId, _msg$relation_product2, _msg$relation_product3, uniqueDeleteIds, uniqueSSEIds, uniquePriceIds, freshProducts, allChangedIds, hasChanges;
         return _regeneratorRuntime().wrap(function _callee17$(_context17) {
           while (1) switch (_context17.prev = _context17.next) {
             case 0:
@@ -1551,13 +1551,13 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
               _iterator7.s();
             case 13:
               if ((_step7 = _iterator7.n()).done) {
-                _context17.next = 35;
+                _context17.next = 36;
                 break;
               }
               msg = _step7.value;
               channelKey = msg._channelKey || msg.module || 'product';
               if (!(channelKey === 'product')) {
-                _context17.next = 32;
+                _context17.next = 33;
                 break;
               }
               if ((_msg$relation_product = msg.relation_product_ids) !== null && _msg$relation_product !== void 0 && _msg$relation_product.length) {
@@ -1569,33 +1569,37 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
                 break;
               }
               if ((_msg$ids = msg.ids) !== null && _msg$ids !== void 0 && _msg$ids.length) deleteIds.push.apply(deleteIds, _toConsumableArray(msg.ids));else if (msg.id) deleteIds.push(msg.id);
-              return _context17.abrupt("continue", 33);
+              return _context17.abrupt("continue", 34);
             case 21:
               if (!((_msg$change_types = msg.change_types) !== null && _msg$change_types !== void 0 && _msg$change_types.includes('price'))) {
-                _context17.next = 25;
+                _context17.next = 26;
                 break;
               }
               ids = msg.ids || (msg.id ? [msg.id] : []);
               priceRefreshIds.push.apply(priceRefreshIds, _toConsumableArray(ids));
-              return _context17.abrupt("continue", 33);
-            case 25:
+              if (msg.body) {
+                bodyId = msg.body.id;
+                if (bodyId) bodyUpdates.set(bodyId, msg.body);
+              }
+              return _context17.abrupt("continue", 34);
+            case 26:
               if (!msg.body) {
-                _context17.next = 29;
+                _context17.next = 30;
                 break;
               }
-              bodyId = msg.body.id || msg.id;
-              if (bodyId) bodyUpdates.set(bodyId, msg.body);
-              return _context17.abrupt("continue", 33);
-            case 29:
+              _bodyId = msg.body.id || msg.id;
+              if (_bodyId) bodyUpdates.set(_bodyId, msg.body);
+              return _context17.abrupt("continue", 34);
+            case 30:
               // 4. 其他情况（有 ids 无 body 无 change_types）→ SSE 拉取
               if ((_msg$ids2 = msg.ids) !== null && _msg$ids2 !== void 0 && _msg$ids2.length) {
                 sseRefreshIds.push.apply(sseRefreshIds, _toConsumableArray(msg.ids));
               } else if (msg.id) {
                 sseRefreshIds.push(msg.id);
               }
-              _context17.next = 33;
+              _context17.next = 34;
               break;
-            case 32:
+            case 33:
               if (channelKey === 'product_quotation') {
                 // 报价单变更影响范围大，标记清除全量价格缓存
                 shouldClearPriceCache = true;
@@ -1607,61 +1611,61 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
                   sseRefreshIds.push.apply(sseRefreshIds, _toConsumableArray(msg.relation_product_ids));
                 }
               }
-            case 33:
+            case 34:
               _context17.next = 13;
               break;
-            case 35:
-              _context17.next = 40;
+            case 36:
+              _context17.next = 41;
               break;
-            case 37:
-              _context17.prev = 37;
+            case 38:
+              _context17.prev = 38;
               _context17.t0 = _context17["catch"](11);
               _iterator7.e(_context17.t0);
-            case 40:
-              _context17.prev = 40;
+            case 41:
+              _context17.prev = 41;
               _iterator7.f();
-              return _context17.finish(40);
-            case 43:
+              return _context17.finish(41);
+            case 44:
               uniqueDeleteIds = _toConsumableArray(new Set(deleteIds));
               uniqueSSEIds = _toConsumableArray(new Set(sseRefreshIds));
               uniquePriceIds = _toConsumableArray(new Set(priceRefreshIds)); // 1. 处理删除
               if (!(uniqueDeleteIds.length > 0)) {
-                _context17.next = 49;
+                _context17.next = 50;
                 break;
               }
-              _context17.next = 49;
+              _context17.next = 50;
               return this.removeProductsByIds(uniqueDeleteIds);
-            case 49:
+            case 50:
               if (!(bodyUpdates.size > 0)) {
-                _context17.next = 52;
+                _context17.next = 53;
                 break;
               }
-              _context17.next = 52;
+              _context17.next = 53;
               return this.applyBodyUpdatesToStore(bodyUpdates);
-            case 52:
+            case 53:
               if (!(uniqueSSEIds.length > 0)) {
-                _context17.next = 60;
+                _context17.next = 61;
                 break;
               }
-              _context17.next = 55;
+              _context17.next = 56;
               return this.fetchProductsBySSE(uniqueSSEIds);
-            case 55:
+            case 56:
               freshProducts = _context17.sent;
               if (!(freshProducts.length > 0)) {
-                _context17.next = 59;
+                _context17.next = 60;
                 break;
               }
-              _context17.next = 59;
+              _context17.next = 60;
               return this.mergeProductsToStore(freshProducts);
-            case 59:
-              this.logInfo('processProductSyncMessages: SSE 增量更新完成', {
+            case 60:
+              this.logInfo('processProductSyncMessages: SSE 增量更新完成123', {
                 requestedCount: uniqueSSEIds.length,
                 receivedCount: freshProducts.length
               });
-            case 60:
+            case 61:
               // 收集所有非 delete 的变更 IDs（body + SSE + price），用于增量更新价格缓存
               allChangedIds = _toConsumableArray(new Set([].concat(_toConsumableArray(Array.from(bodyUpdates.keys())), _toConsumableArray(uniqueSSEIds), _toConsumableArray(uniquePriceIds))));
-              this.logInfo('processProductSyncMessages: 处理完成', {
+              this.logInfo('processProductSyncMessages: 处理完成123', {
                 deleteCount: uniqueDeleteIds.length,
                 bodyUpdateCount: bodyUpdates.size,
                 sseRefreshCount: uniqueSSEIds.length,
@@ -1671,25 +1675,25 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
               });
               hasChanges = uniqueDeleteIds.length > 0 || allChangedIds.length > 0 || shouldClearPriceCache;
               if (hasChanges) {
-                _context17.next = 66;
+                _context17.next = 67;
                 break;
               }
               this.logInfo('processProductSyncMessages: 没有变更，不触发 onProductsSyncCompleted');
               return _context17.abrupt("return");
-            case 66:
+            case 67:
               // 报价单变更 → 清除全量价格缓存，后续走全量重建
               if (shouldClearPriceCache) {
                 this.clearPriceCache();
               }
-              _context17.next = 69;
+              _context17.next = 70;
               return this.core.effects.emit(ProductsHooks.onProductsSyncCompleted, {
                 changedIds: allChangedIds
               });
-            case 69:
+            case 70:
             case "end":
               return _context17.stop();
           }
-        }, _callee17, this, [[11, 37, 40, 43]]);
+        }, _callee17, this, [[11, 38, 41, 44]]);
       }));
       function processProductSyncMessages() {
         return _processProductSyncMessages.apply(this, arguments);

package/dist/solution/BookingTicket/index.d.ts

@@ -131,7 +131,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/lib/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/lib/modules/Customer/index.js

@@ -46,12 +46,14 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
       searchParams: {}
     };
     this.openCache = false;
+    this.otherParams = {};
   }
   async initialize(core, options) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     this.core = core;
     this.store = options == null ? void 0 : options.store;
     this.request = this.core.getPlugin("request");
+    this.otherParams = (options == null ? void 0 : options.otherParams) || {};
     if (Array.isArray((_a = options == null ? void 0 : options.initialState) == null ? void 0 : _a.customerList)) {
       const customerList = (0, import_lodash_es.cloneDeep)(options.initialState.customerList || []);
       this.store.customerList = customerList;
@@ -95,9 +97,12 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
    * @returns API响应数据
    */
   async fetchCustomerListData(params = {}) {
-    var _a, _b;
-    const url = "/customer/select-list";
-    const { skip = 1, num = import_constants.DEFAULT_PAGE_SIZE, search, ...otherParams } = params;
+    var _a, _b, _c, _d;
+    let url = "/customer/select-list";
+    if ((_a = this.otherParams) == null ? void 0 : _a.isFranchisee) {
+      url = "/franchisee/customer/select-list";
+    }
+    const { skip = 1, num = import_constants.DEFAULT_PAGE_SIZE, search, ..._otherParams } = params;
     const queryParams = {
       skip,
       num,
@@ -106,7 +111,7 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
       search_wallet_flag: 1,
       search_wallet_pass_flag: 1,
       ...search && { search },
-      ...otherParams
+      ..._otherParams
     };
     const res = await this.request.get(url, queryParams, {
       cache: {
@@ -117,9 +122,19 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
     if ((res == null ? void 0 : res.code) !== 200) {
       throw new Error(res == null ? void 0 : res.message);
     }
+    let _customerList = ((_b = res == null ? void 0 : res.data) == null ? void 0 : _b.list) || [];
+    if (((_c = this.otherParams) == null ? void 0 : _c.isFranchisee) && (_customerList == null ? void 0 : _customerList.length) > 0) {
+      _customerList = _customerList == null ? void 0 : _customerList.map((item) => {
+        return {
+          ...item || {},
+          is_franchisor_customer: 1
+          // 标识是总店的客户
+        };
+      });
+    }
     return {
-      customerList: ((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.list) || [],
-      total: ((_b = res == null ? void 0 : res.data) == null ? void 0 : _b.count) || 0,
+      customerList: _customerList,
+      total: ((_d = res == null ? void 0 : res.data) == null ? void 0 : _d.count) || 0,
       page: skip,
       pageSize: num
     };

package/lib/server/modules/products/index.js

@@ -954,6 +954,11 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
         if ((_c = msg.change_types) == null ? void 0 : _c.includes("price")) {
           const ids = msg.ids || (msg.id ? [msg.id] : []);
           priceRefreshIds.push(...ids);
+          if (msg.body) {
+            const bodyId = msg.body.id;
+            if (bodyId)
+              bodyUpdates.set(bodyId, msg.body);
+          }
           continue;
         }
         if (msg.body) {
@@ -992,7 +997,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
       if (freshProducts.length > 0) {
         await this.mergeProductsToStore(freshProducts);
       }
-      this.logInfo("processProductSyncMessages: SSE 增量更新完成", {
+      this.logInfo("processProductSyncMessages: SSE 增量更新完成123", {
         requestedCount: uniqueSSEIds.length,
         receivedCount: freshProducts.length
       });
@@ -1002,7 +1007,7 @@ var ProductsModule = class extends import_BaseModule.BaseModule {
       ...uniqueSSEIds,
       ...uniquePriceIds
     ])];
-    this.logInfo("processProductSyncMessages: 处理完成", {
+    this.logInfo("processProductSyncMessages: 处理完成123", {
       deleteCount: uniqueDeleteIds.length,
       bodyUpdateCount: bodyUpdates.size,
       sseRefreshCount: uniqueSSEIds.length,

package/lib/solution/BookingTicket/index.d.ts

@@ -131,7 +131,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.2.91",
+  "version": "2.2.93",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",