@pisell/pisellos 2.3.62 → 2.3.64

package/dist/core/index.d.ts

@@ -12,15 +12,8 @@ declare class PisellOSCore implements PisellCore {
     context: BusinessContext;
     server: any;
     serverOptions?: ServerOptions;
-    private serverModulePromise?;
     constructor(options?: PisellOSOptions);
     private initialize;
-    /**
-     * 仅预加载 Server 模块代码，不创建实例、不注册模块、不请求业务数据。
-     * 导入失败会清空 Promise，正式 initializeServer 时仍可重新尝试。
-     */
-    preloadServerModule(): Promise<void>;
-    private loadServerModule;
     /**
      * 初始化 Server（公开方法，需要外部显式调用并等待）
      * Server 配置从构造函数传入的 options.server 中获取

package/dist/core/index.js

@@ -24,6 +24,8 @@ import { EffectsManager } from "../effects";
  * pisell OS 核心实现
  */
 var PisellOSCore = /*#__PURE__*/function () {
+  // 保存 Server 配置
+
   function PisellOSCore(options) {
     _classCallCheck(this, PisellOSCore);
     _defineProperty(this, "plugins", new Map());
@@ -35,8 +37,6 @@ var PisellOSCore = /*#__PURE__*/function () {
     _defineProperty(this, "server", void 0);
     // Server 实例
     _defineProperty(this, "serverOptions", void 0);
-    // 保存 Server 配置
-    _defineProperty(this, "serverModulePromise", void 0);
     this.debug = (options === null || options === void 0 ? void 0 : options.debug) || false;
     this.context = (options === null || options === void 0 ? void 0 : options.context) || {};
 
@@ -45,7 +45,6 @@ var PisellOSCore = /*#__PURE__*/function () {
       this.serverOptions = options.server;
     }
     this.initialize(options);
-    console.log('constructor123456');
   }
   _createClass(PisellOSCore, [{
     key: "initialize",
@@ -64,49 +63,6 @@ var PisellOSCore = /*#__PURE__*/function () {
       this.log('[PisellOS] 核心初始化完成');
     }
 
-    /**
-     * 仅预加载 Server 模块代码，不创建实例、不注册模块、不请求业务数据。
-     * 导入失败会清空 Promise，正式 initializeServer 时仍可重新尝试。
-     */
-  }, {
-    key: "preloadServerModule",
-    value: (function () {
-      var _preloadServerModule = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              if (!(this.server || !this.serverOptions)) {
-                _context.next = 2;
-                break;
-              }
-              return _context.abrupt("return");
-            case 2:
-              _context.next = 4;
-              return this.loadServerModule();
-            case 4:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee, this);
-      }));
-      function preloadServerModule() {
-        return _preloadServerModule.apply(this, arguments);
-      }
-      return preloadServerModule;
-    }())
-  }, {
-    key: "loadServerModule",
-    value: function loadServerModule() {
-      var _this2 = this;
-      if (!this.serverModulePromise) {
-        this.serverModulePromise = import("../server").catch(function (error) {
-          _this2.serverModulePromise = undefined;
-          throw error;
-        });
-      }
-      return this.serverModulePromise;
-    }
-
     /**
      * 初始化 Server（公开方法，需要外部显式调用并等待）
      * Server 配置从构造函数传入的 options.server 中获取
@@ -114,57 +70,57 @@ var PisellOSCore = /*#__PURE__*/function () {
   }, {
     key: "initializeServer",
     value: (function () {
-      var _initializeServer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(options) {
+      var _initializeServer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(options) {
         var ServerModule, Server;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
             case 0:
               if (!this.server) {
-                _context2.next = 3;
+                _context.next = 3;
                 break;
               }
               this.log('Server 已经初始化，跳过重复初始化', 'warn');
-              return _context2.abrupt("return");
+              return _context.abrupt("return");
             case 3:
               if (this.serverOptions) {
-                _context2.next = 6;
+                _context.next = 6;
                 break;
               }
               this.log('未提供 Server 配置，无法初始化', 'warn');
-              return _context2.abrupt("return");
+              return _context.abrupt("return");
             case 6:
-              _context2.prev = 6;
-              _context2.next = 9;
-              return this.loadServerModule();
+              _context.prev = 6;
+              _context.next = 9;
+              return import("../server");
             case 9:
-              ServerModule = _context2.sent;
+              ServerModule = _context.sent;
               Server = ServerModule.default; // 创建 Server 实例
               this.server = new Server(this);
               this.log('Server 实例已创建');
 
               // 初始化模块并预加载数据
               if (!this.serverOptions.modules) {
-                _context2.next = 16;
+                _context.next = 16;
                 break;
               }
-              _context2.next = 16;
+              _context.next = 16;
               return this.server.initialize(this.serverOptions.modules, this.serverOptions.autoInitData !== false, options);
             case 16:
               console.log('[PisellOS] ✅ Server 初始化完成，所有数据已预加载');
               this.log('[PisellOS] Server 初始化完成');
-              _context2.next = 25;
+              _context.next = 25;
               break;
             case 20:
-              _context2.prev = 20;
-              _context2.t0 = _context2["catch"](6);
-              console.error('[PisellOS] ❌ Server 初始化失败:', _context2.t0);
-              this.log("Server \u521D\u59CB\u5316\u5931\u8D25: ".concat(_context2.t0), 'error');
-              throw _context2.t0;
+              _context.prev = 20;
+              _context.t0 = _context["catch"](6);
+              console.error('[PisellOS] ❌ Server 初始化失败:', _context.t0);
+              this.log("Server \u521D\u59CB\u5316\u5931\u8D25: ".concat(_context.t0), 'error');
+              throw _context.t0;
             case 25:
             case "end":
-              return _context2.stop();
+              return _context.stop();
           }
-        }, _callee2, this, [[6, 20]]);
+        }, _callee, this, [[6, 20]]);
       }));
       function initializeServer(_x) {
         return _initializeServer.apply(this, arguments);
@@ -197,7 +153,7 @@ var PisellOSCore = /*#__PURE__*/function () {
   }, {
     key: "registerPlugin",
     value: function registerPlugin(plugin, options) {
-      var _this3 = this;
+      var _this2 = this;
       if (this.plugins.has(plugin.name)) {
         this.log("\u63D2\u4EF6 ".concat(plugin.name, " \u5DF2\u7ECF\u6CE8\u518C\u8FC7\uFF0C\u5C06\u88AB\u8986\u76D6"), 'warn');
       }
@@ -225,7 +181,7 @@ var PisellOSCore = /*#__PURE__*/function () {
         var result = plugin.initialize();
         if (result instanceof Promise) {
           result.catch(function (err) {
-            _this3.log("\u63D2\u4EF6 ".concat(plugin.name, " \u521D\u59CB\u5316\u5931\u8D25: ").concat(err.message), 'error');
+            _this2.log("\u63D2\u4EF6 ".concat(plugin.name, " \u521D\u59CB\u5316\u5931\u8D25: ").concat(err.message), 'error');
             throw err;
           });
         }
@@ -251,7 +207,7 @@ var PisellOSCore = /*#__PURE__*/function () {
   }, {
     key: "registerModule",
     value: function registerModule(module, options) {
-      var _this4 = this;
+      var _this3 = this;
       if (this.modules.has(module.name)) {
         this.log("\u6A21\u5757 ".concat(module.name, " \u5DF2\u7ECF\u6CE8\u518C\u8FC7\uFF0C\u5C06\u88AB\u8986\u76D6"), 'warn');
       }
@@ -294,7 +250,7 @@ var PisellOSCore = /*#__PURE__*/function () {
       // 预先给模块初始化值系统
       var _createStore = createStore((options === null || options === void 0 ? void 0 : options.initialState) || {}, module.name, function (path, value) {
           console.log('core 检测到模块值更新', module.name, path, value);
-          _this4.effects.emit("".concat(module.name, ":changed"), {
+          _this3.effects.emit("".concat(module.name, ":changed"), {
             path: path,
             value: value
           });
@@ -309,7 +265,7 @@ var PisellOSCore = /*#__PURE__*/function () {
         }, options));
         if (result instanceof Promise) {
           result.catch(function (err) {
-            _this4.log("\u6A21\u5757 ".concat(module.name, " \u521D\u59CB\u5316\u5931\u8D25: ").concat(err.message), 'error');
+            _this3.log("\u6A21\u5757 ".concat(module.name, " \u521D\u59CB\u5316\u5931\u8D25: ").concat(err.message), 'error');
             throw err;
           });
         }
@@ -354,100 +310,100 @@ var PisellOSCore = /*#__PURE__*/function () {
   }, {
     key: "destroy",
     value: function () {
-      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
         var _iterator4, _step4, _step4$value, name, module, _iterator5, _step5, _step5$value, _name, plugin;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
             case 0:
               // 先销毁模块
               _iterator4 = _createForOfIteratorHelper(this.modules.entries());
-              _context3.prev = 1;
+              _context2.prev = 1;
               _iterator4.s();
             case 3:
               if ((_step4 = _iterator4.n()).done) {
-                _context3.next = 17;
+                _context2.next = 17;
                 break;
               }
               _step4$value = _slicedToArray(_step4.value, 2), name = _step4$value[0], module = _step4$value[1];
               if (!module.destroy) {
-                _context3.next = 15;
+                _context2.next = 15;
                 break;
               }
-              _context3.prev = 6;
-              _context3.next = 9;
+              _context2.prev = 6;
+              _context2.next = 9;
               return Promise.resolve(module.destroy());
             case 9:
               this.log("\u6A21\u5757 ".concat(name, " \u5DF2\u9500\u6BC1"));
-              _context3.next = 15;
+              _context2.next = 15;
               break;
             case 12:
-              _context3.prev = 12;
-              _context3.t0 = _context3["catch"](6);
-              this.log("\u9500\u6BC1\u6A21\u5757 ".concat(name, " \u65F6\u51FA\u9519: ").concat(_context3.t0), 'error');
+              _context2.prev = 12;
+              _context2.t0 = _context2["catch"](6);
+              this.log("\u9500\u6BC1\u6A21\u5757 ".concat(name, " \u65F6\u51FA\u9519: ").concat(_context2.t0), 'error');
             case 15:
-              _context3.next = 3;
+              _context2.next = 3;
               break;
             case 17:
-              _context3.next = 22;
+              _context2.next = 22;
               break;
             case 19:
-              _context3.prev = 19;
-              _context3.t1 = _context3["catch"](1);
-              _iterator4.e(_context3.t1);
+              _context2.prev = 19;
+              _context2.t1 = _context2["catch"](1);
+              _iterator4.e(_context2.t1);
             case 22:
-              _context3.prev = 22;
+              _context2.prev = 22;
               _iterator4.f();
-              return _context3.finish(22);
+              return _context2.finish(22);
             case 25:
               this.modules.clear();
 
               // 再销毁插件
               _iterator5 = _createForOfIteratorHelper(this.plugins.entries());
-              _context3.prev = 27;
+              _context2.prev = 27;
               _iterator5.s();
             case 29:
               if ((_step5 = _iterator5.n()).done) {
-                _context3.next = 43;
+                _context2.next = 43;
                 break;
               }
               _step5$value = _slicedToArray(_step5.value, 2), _name = _step5$value[0], plugin = _step5$value[1];
               if (!plugin.destroy) {
-                _context3.next = 41;
+                _context2.next = 41;
                 break;
               }
-              _context3.prev = 32;
-              _context3.next = 35;
+              _context2.prev = 32;
+              _context2.next = 35;
               return Promise.resolve(plugin.destroy());
             case 35:
               this.log("\u63D2\u4EF6 ".concat(_name, " \u5DF2\u9500\u6BC1"));
-              _context3.next = 41;
+              _context2.next = 41;
               break;
             case 38:
-              _context3.prev = 38;
-              _context3.t2 = _context3["catch"](32);
-              this.log("\u9500\u6BC1\u63D2\u4EF6 ".concat(_name, " \u65F6\u51FA\u9519: ").concat(_context3.t2), 'error');
+              _context2.prev = 38;
+              _context2.t2 = _context2["catch"](32);
+              this.log("\u9500\u6BC1\u63D2\u4EF6 ".concat(_name, " \u65F6\u51FA\u9519: ").concat(_context2.t2), 'error');
             case 41:
-              _context3.next = 29;
+              _context2.next = 29;
               break;
             case 43:
-              _context3.next = 48;
+              _context2.next = 48;
               break;
             case 45:
-              _context3.prev = 45;
-              _context3.t3 = _context3["catch"](27);
-              _iterator5.e(_context3.t3);
+              _context2.prev = 45;
+              _context2.t3 = _context2["catch"](27);
+              _iterator5.e(_context2.t3);
             case 48:
-              _context3.prev = 48;
+              _context2.prev = 48;
               _iterator5.f();
-              return _context3.finish(48);
+              return _context2.finish(48);
             case 51:
               this.plugins.clear();
               this.log('PisellOS 核心已销毁');
             case 53:
             case "end":
-              return _context3.stop();
+              return _context2.stop();
           }
-        }, _callee3, this, [[1, 19, 22, 25], [6, 12], [27, 45, 48, 51], [32, 38]]);
+        }, _callee2, this, [[1, 19, 22, 25], [6, 12], [27, 45, 48, 51], [32, 38]]);
       }));
       function destroy() {
         return _destroy.apply(this, arguments);

package/dist/model/strategy/adapter/walletPass/evaluator.js

@@ -505,7 +505,6 @@ export var WalletPassEvaluator = /*#__PURE__*/function () {
   }, {
     key: "calculateApplicableProducts",
     value: function calculateApplicableProducts(products, applicableProductIds, deductTaxAndFee) {
-      console.log(products, 'products1234');
       var total = 0;
       var count = 0;
 

package/dist/model/strategy/adapter/walletPass/utils.js

@@ -189,8 +189,6 @@ var getApplicableProducts = function getApplicableProducts(voucher, productsData
  * @returns 返回推荐券列表和全部列表，每个券包含 _available_max_amount 和 _unified_available_status
  */
 export function processVouchers(applicableVouchers, orderTotalAmount, products) {
-  console.log(products, 'products123');
-
   // 拆分商品数据，同时维护含税和不含税两个金额池
   // remainingAmountWithTax: 含税费的剩余可抵扣金额
   // remainingAmountPure: 纯商品金额（不含税费）的剩余可抵扣金额

package/dist/modules/BookingContext/utils/buildCacheItemFromOrderLine.js

@@ -192,7 +192,7 @@ function synthesizeProductResourceFromBooking(booking) {
  * 调用方须传入与该行关联的 booking（通常 bookings[].product_uid === product.metadata.unique_identification_number）。
  */
 export function buildCacheItemFromOrderLine(input) {
-  var _product$product_id, _product$selling_pric, _product$original_pri, _booking$metadata$hol, _booking$metadata2, _product$product_vari, _product$num, _ref11, _product$note, _booking$detail2, _product$metadata, _product$metadata2, _ref12, _extension_type, _booking$product2, _booking$product3, _price, _product$product_sku, _product$order_detail, _ref13, _booking$id;
+  var _product$product_id, _product$selling_pric, _product$original_pri, _booking$metadata$hol, _booking$metadata2, _product$bundle_edit, _product$product_vari, _product$num, _ref11, _product$note, _booking$detail2, _product$metadata, _product$metadata2, _ref12, _extension_type, _booking$product2, _booking$product3, _price, _product$product_sku, _product$order_detail, _ref13, _booking$id;
   var product = input.product,
     booking = input.booking,
     sourceProduct = input.sourceProduct;
@@ -210,12 +210,14 @@ export function buildCacheItemFromOrderLine(input) {
   var productTitle = resolveProductTitle(product, booking, sourceProduct);
   var productCover = resolveProductCover(product, booking, sourceProduct);
   var productOptionString = buildProductOptionStringFromOrderLine(product);
+  var hasBundle = Array.isArray(product.product_bundle) && product.product_bundle.length > 0;
+  var bundleEdit = (_product$bundle_edit = product.bundle_edit) !== null && _product$bundle_edit !== void 0 ? _product$bundle_edit : hasBundle ? 0 : undefined;
   var other = {
     product_variant_id: (_product$product_vari = product.product_variant_id) !== null && _product$product_vari !== void 0 ? _product$product_vari : 0,
     option: getProductSkuOptions(product),
     bundle: mapOrderBundleToOtherBundle(Array.isArray(product.product_bundle) ? product.product_bundle : [])
   };
-  var extend = _objectSpread({
+  var extend = _objectSpread(_objectSpread({
     start_date: startDate ? dayjs(startDate) : undefined,
     end_date: endDate ? dayjs(endDate) : undefined,
     startDate: startDate ? dayjs(startDate) : undefined,
@@ -237,7 +239,9 @@ export function buildCacheItemFromOrderLine(input) {
     other: other,
     like_status: booking.like_status || 'common',
     discount_reason: resolveManualDiscountMessage(product.discount_list, (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.product_discount_reason) || undefined
-  }, productOptionString ? {
+  }, bundleEdit !== undefined ? {
+    bundle_edit: bundleEdit
+  } : {}), productOptionString ? {
     product_option_string: productOptionString
   } : {});
   var manualDiscount = (product.discount_list || []).find(function (d) {

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

@@ -44,6 +44,10 @@ export declare class CustomerModule extends BaseModule implements Module, Custom
      * 用于按 ID 补齐客户等内部查询，避免把临时的 num/searchParams 污染到滚动列表。
      */
     queryCustomerList(params?: ShopGetCustomerListParams): Promise<ICustomerListResponse>;
+    /**
+     * 查询单个客户详情，不写入 customerList / pagination 状态。
+     */
+    queryCustomerDetail(id: string | number): Promise<ShopCustomer | null>;
     /**
      * 获取客户列表
      * @param params 查询参数