@pisell/pisellos 2.3.63 → 2.3.64

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

@@ -63,6 +63,8 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     scanPromotionCode(code: string, customerId?: number): Promise<BaseSalesScanCodeResult>;
     private hydrateOrderCustomerFromScanDiscounts;
     private getDiscountCustomerId;
+    resolveCustomerById(customerId: string | number): Promise<ICustomer | null>;
+    /** 兼容既有优惠码扫码逻辑。 */
     private resolveCustomerByDiscountCustomerId;
     private findCustomerById;
     private normalizeCustomer;

package/dist/solution/BookingTicket/index.js

@@ -688,11 +688,11 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
       return null;
     }
   }, {
-    key: "resolveCustomerByDiscountCustomerId",
+    key: "resolveCustomerById",
     value: function () {
-      var _resolveCustomerByDiscountCustomerId = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(customerId) {
+      var _resolveCustomerById = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(customerId) {
         var _result$list;
-        var localCustomers, localCustomer, normalizedLocalCustomer, result, remoteCustomer;
+        var localCustomers, localCustomer, normalizedLocalCustomer, result, remoteCustomer, detailCustomer;
         return _regeneratorRuntime().wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
@@ -714,18 +714,42 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
             case 7:
               result = _context9.sent;
               remoteCustomer = this.findCustomerById((result === null || result === void 0 ? void 0 : result.list) || [], customerId) || (result === null || result === void 0 || (_result$list = result.list) === null || _result$list === void 0 ? void 0 : _result$list[0]) || null;
-              return _context9.abrupt("return", remoteCustomer ? this.normalizeCustomer(remoteCustomer) : null);
-            case 10:
+              if (!remoteCustomer) {
+                _context9.next = 11;
+                break;
+              }
+              return _context9.abrupt("return", this.normalizeCustomer(remoteCustomer));
+            case 11:
+              _context9.prev = 11;
+              _context9.next = 14;
+              return this.store.customer.queryCustomerDetail(customerId);
+            case 14:
+              detailCustomer = _context9.sent;
+              return _context9.abrupt("return", detailCustomer ? this.normalizeCustomer(detailCustomer) : null);
+            case 18:
+              _context9.prev = 18;
+              _context9.t0 = _context9["catch"](11);
+              console.warn('[BookingTicket] resolveCustomerById detail request failed', {
+                customerId: customerId,
+                error: _context9.t0
+              });
+              return _context9.abrupt("return", null);
+            case 22:
             case "end":
               return _context9.stop();
           }
-        }, _callee9, this);
+        }, _callee9, this, [[11, 18]]);
       }));
-      function resolveCustomerByDiscountCustomerId(_x6) {
-        return _resolveCustomerByDiscountCustomerId.apply(this, arguments);
+      function resolveCustomerById(_x6) {
+        return _resolveCustomerById.apply(this, arguments);
       }
-      return resolveCustomerByDiscountCustomerId;
-    }()
+      return resolveCustomerById;
+    }() /** 兼容既有优惠码扫码逻辑。 */
+  }, {
+    key: "resolveCustomerByDiscountCustomerId",
+    value: function resolveCustomerByDiscountCustomerId(customerId) {
+      return this.resolveCustomerById(customerId);
+    }
   }, {
     key: "findCustomerById",
     value: function findCustomerById() {

package/lib/core/index.js

@@ -50,7 +50,6 @@ var PisellOSCore = class {
       this.serverOptions = options.server;
     }
     this.initialize(options);
-    console.log("constructor1234");
   }
   initialize(options) {
     if (options == null ? void 0 : options.plugins) {

package/lib/model/strategy/adapter/promotion/index.js

@@ -1,51 +0,0 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/model/strategy/adapter/promotion/index.ts
-var promotion_exports = {};
-__export(promotion_exports, {
-  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
-  ITEM_REWARD_STRATEGY: () => import_examples.ITEM_REWARD_STRATEGY,
-  PromotionAdapter: () => import_adapter.PromotionAdapter,
-  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
-  default: () => import_adapter2.default
-});
-module.exports = __toCommonJS(promotion_exports);
-var import_evaluator = require("./evaluator");
-var import_adapter = require("./adapter");
-var import_adapter2 = __toESM(require("./adapter"));
-var import_examples = require("./examples");
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  BUY_X_GET_Y_FREE_STRATEGY,
-  ITEM_REWARD_STRATEGY,
-  PromotionAdapter,
-  PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY
-});

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

@@ -415,7 +415,6 @@ var WalletPassEvaluator = class {
    * 计算适用商品的总金额和数量
    */
   calculateApplicableProducts(products, applicableProductIds, deductTaxAndFee) {
-    console.log(products, "products1234");
     let total = 0;
     let count = 0;
     if (applicableProductIds !== null && applicableProductIds.length === 0) {

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

@@ -166,7 +166,6 @@ var getApplicableProducts = (voucher, productsData) => {
   return productsData.filter((p) => applicableProductIds.includes(p.product_id));
 };
 function processVouchers(applicableVouchers, orderTotalAmount, products) {
-  console.log(products, "products123");
   const productsCopy = expandProductsWithBundleItems(products, true);
   let remainingOrderAmount = new import_decimal.default(orderTotalAmount);
   const getItemPassUsage = (usageMap, walletPassProductId, lineKey) => {

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

@@ -202,6 +202,8 @@ function buildCacheItemFromOrderLine(input) {
   const productTitle = resolveProductTitle(product, booking, sourceProduct);
   const productCover = resolveProductCover(product, booking, sourceProduct);
   const productOptionString = (0, import_orderLineDisplay.buildProductOptionStringFromOrderLine)(product);
+  const hasBundle = Array.isArray(product.product_bundle) && product.product_bundle.length > 0;
+  const bundleEdit = product.bundle_edit ?? (hasBundle ? 0 : void 0);
   const other = {
     product_variant_id: product.product_variant_id ?? 0,
     option: (0, import_utils.getProductSkuOptions)(product),
@@ -234,6 +236,7 @@ function buildCacheItemFromOrderLine(input) {
       product.discount_list,
       (_c = product.metadata) == null ? void 0 : _c.product_discount_reason
     ) || void 0,
+    ...bundleEdit !== void 0 ? { bundle_edit: bundleEdit } : {},
     ...productOptionString ? { product_option_string: productOptionString } : {}
   };
   const manualDiscount = (product.discount_list || []).find((d) => (d == null ? void 0 : d.type) === "product");

package/lib/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 查询参数

package/lib/modules/Customer/index.js

@@ -201,6 +201,17 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
       pageSize
     };
   }
+  /**
+   * 查询单个客户详情，不写入 customerList / pagination 状态。
+   */
+  async queryCustomerDetail(id) {
+    var _a;
+    const result = await this.request.get(`/customer/info/${id}`, {
+      with_trashed: 1
+    });
+    const customer = ((_a = result == null ? void 0 : result.data) == null ? void 0 : _a.customer) || (result == null ? void 0 : result.data) || (result == null ? void 0 : result.customer) || null;
+    return customer && typeof customer === "object" ? customer : null;
+  }
   /**
    * 获取客户列表
    * @param params 查询参数

package/lib/modules/Customer/types.d.ts

@@ -112,6 +112,8 @@ export interface CustomerModuleAPI {
     getCustomerList: (params?: ShopGetCustomerListParams) => Promise<ICustomerListResponse>;
     /** 查询客户列表但不更新列表分页状态 */
     queryCustomerList: (params?: ShopGetCustomerListParams) => Promise<ICustomerListResponse>;
+    /** 查询单个客户详情但不修改客户列表状态 */
+    queryCustomerDetail: (id: string | number) => Promise<ShopCustomer | null>;
     /** 设置客户列表 */
     setCustomerList: (customers: ShopCustomer[], total?: number) => void;
     /** 设置当前选择的客户 */

package/lib/modules/Order/index.js

@@ -4746,8 +4746,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     delete row[`product_${"option"}_item`];
     if (!Array.isArray(row.product_bundle))
       row.product_bundle = [];
-    if (!row.metadata || typeof row.metadata !== "object")
-      row.metadata = {};
+    row.metadata = row.metadata && typeof row.metadata === "object" ? { ...row.metadata } : {};
+    delete row.bundle_edit;
+    delete row.metadata.bundle_edit;
     if (row.booking_uid && !row.metadata.booking_uid) {
       row.metadata.booking_uid = row.booking_uid;
     }

package/lib/modules/Order/utils.js

@@ -801,6 +801,8 @@ function normalizeSubmitProduct(product) {
   delete productRest[`product_${"option"}_item`];
   const rawMetadata = submitProduct.metadata || {};
   const bookingUid = rawMetadata.booking_uid;
+  const hasProductBundle = Array.isArray(submitProduct.product_bundle) && submitProduct.product_bundle.length > 0;
+  const bundleEdit = submitProduct.bundle_edit ?? rawMetadata.bundle_edit ?? (hasProductBundle ? 0 : void 0);
   const cleanMetadata = {};
   if (rawMetadata.unique_identification_number) {
     cleanMetadata.unique_identification_number = rawMetadata.unique_identification_number;
@@ -843,6 +845,7 @@ function normalizeSubmitProduct(product) {
   return {
     ...productRest,
     ...bookingUid ? { booking_uid: bookingUid } : {},
+    ...bundleEdit !== void 0 ? { bundle_edit: bundleEdit } : {},
     product_quantity: toBundleNumber(num ?? submitProduct.product_quantity, 1),
     product_sku: productSku,
     discount_list: collectSubmitProductDiscountList(submitProduct),

package/lib/modules/Payment/walletpass.js

@@ -543,7 +543,6 @@ var WalletPassPaymentImpl = class {
         vouchers: allList
       });
       const { recommended, transformList, noApplicableVoucher, recommendedAmount } = res;
-      console.log(res, "resres12");
       this.walletRecommendList = recommended;
       this.walletInitData = {
         transformList,

package/lib/server/index.js

@@ -4094,7 +4094,7 @@ var Server = class {
     var _a, _b, _c, _d, _e;
     if (((_b = (_a = this.core.context) == null ? void 0 : _a.getPlatform) == null ? void 0 : _b.call(_a)) !== "android")
       return true;
-    return ((_e = (_d = (_c = this.app) == null ? void 0 : _c.storage) == null ? void 0 : _d.getStorage) == null ? void 0 : _e.call(_d, AUTO_PRINT_STORAGE_KEY)) === "true";
+    return ((_e = (_d = (_c = this.app) == null ? void 0 : _c.storage) == null ? void 0 : _d.getStorage) == null ? void 0 : _e.call(_d, AUTO_PRINT_STORAGE_KEY)) !== "false";
   }
   shouldBuildSmallTicketData(order) {
     if (!order || typeof order !== "object")

package/lib/server/modules/order/index.d.ts

@@ -274,6 +274,7 @@ export declare class OrderModule extends BaseModule implements Module {
      * // => 'S-1001'
      */
     private getOrderStorageKey;
+    private getPersistedOrderStorageKey;
     private getOrderIdentityMatchKeys;
     private doOrdersShareIdentity;
     private findOrderIndexByIdentity;

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

@@ -39,6 +39,7 @@ var import_orderCollectionIdentity = require("../../../modules/Order/utils/order
 var import_types = require("./types");
 var import_payment_utils = require("../../../modules/Order/payment-utils");
 var INDEXDB_STORE_NAME = "orders";
+var ORDER_STORAGE_KEY_FIELD = "__order_storage_key";
 var ORDER_LAST_FULL_FETCH_AT_STORAGE_KEY = "server_order_last_full_fetch_at";
 var ORDER_SYNC_THROTTLE_MS_STORAGE_KEY = "order_sync_throttle_ms";
 var DEFAULT_ORDER_SYNC_THROTTLE_MS = 2e3;
@@ -1533,6 +1534,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const patchedOrders = [];
     const remoteProductMembershipChanges = [];
     const forceWriteStorageKeys = /* @__PURE__ */ new Set();
+    const storageKeyMigrations = [];
     const mergeActions = {};
     const existingProductsHaveStableIdentity = this.store.list.map(
       (order) => this.doProductsHaveStableMembershipIdentity(
@@ -1557,6 +1559,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       const mergeKey = storageKey || (fresh.order_id !== void 0 && fresh.order_id !== null ? this.getIdKey(fresh.order_id) : "");
       if (matchIndex >= 0) {
         const existingOrder = updatedList[matchIndex];
+        const previousStorageKey = this.getPersistedOrderStorageKey(existingOrder);
         if (this.isPendingSyncOrder(existingOrder) && this.isRemoteEchoMergeSource(source)) {
           this.logInfo("mergeOrdersToStore-跳过 pending 订单远端覆盖", {
             source,
@@ -1618,6 +1621,14 @@ var OrderModule = class extends import_BaseModule.BaseModule {
             }
           }
         }
+        const nextStorageKey = this.getOrderStorageKey(mergedOrder);
+        if (previousStorageKey && nextStorageKey && previousStorageKey !== nextStorageKey) {
+          storageKeyMigrations.push({
+            orderId: mergedOrder.order_id ?? existingOrder.order_id ?? fresh.order_id ?? null,
+            from: previousStorageKey,
+            to: nextStorageKey
+          });
+        }
         updatedList[adjustedMatchIndex] = mergedOrder;
         existingProductsHaveStableIdentity[adjustedMatchIndex] = mergedProductsHaveStableIdentity;
         if (membershipChange) {
@@ -1655,7 +1666,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       patchedOrders,
       source,
       mergeActions,
-      {},
+      { storageKeyMigrations },
       forceWriteStorageKeys
     );
     this.logInfo("mergeOrdersToStore-结束", {
@@ -1860,6 +1871,13 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
     return "";
   }
+  getPersistedOrderStorageKey(order) {
+    const persistedStorageKey = order == null ? void 0 : order[ORDER_STORAGE_KEY_FIELD];
+    if (persistedStorageKey !== void 0 && persistedStorageKey !== null && persistedStorageKey !== "") {
+      return String(persistedStorageKey);
+    }
+    return this.getOrderStorageKey(order);
+  }
   getOrderIdentityMatchKeys(order) {
     return this.getOrderIdentityEntries(order).map((entry) => `${entry.field}:${entry.key}`);
   }
@@ -2290,7 +2308,18 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         throw new Error("订单 SQLite 数据库未初始化");
       return;
     }
-    const ordersSnapshot = (0, import_lodash_es.cloneDeep)(orders).map((order) => this.normalizeOrderCollectionsForIngress(order, `${source}.sqliteIngress`)).filter((order) => this.getOrderStorageKey(order));
+    const migrationTargetStorageKeys = new Set(
+      (options.storageKeyMigrations || []).map((migration) => migration.to)
+    );
+    const ordersSnapshot = (0, import_lodash_es.cloneDeep)(orders).map((order) => this.normalizeOrderCollectionsForIngress(order, `${source}.sqliteIngress`)).map((order) => {
+      const storageKey = this.getOrderStorageKey(order);
+      if (!storageKey || !migrationTargetStorageKeys.has(storageKey))
+        return order;
+      return {
+        ...order,
+        [ORDER_STORAGE_KEY_FIELD]: storageKey
+      };
+    }).filter((order) => this.getOrderStorageKey(order));
     if (ordersSnapshot.length === 0) {
       return;
     }
@@ -2307,6 +2336,17 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if (compactedToWrite.length === 0) {
       return;
     }
+    const writtenStorageKeys = new Set(
+      compactedToWrite.map((order) => this.getOrderStorageKey(order)).filter(Boolean)
+    );
+    const storageKeyMigrations = /* @__PURE__ */ new Map();
+    for (const migration of options.storageKeyMigrations || []) {
+      if (!writtenStorageKeys.has(migration.to))
+        continue;
+      if (writtenStorageKeys.has(migration.from))
+        continue;
+      storageKeyMigrations.set(migration.from, migration);
+    }
     try {
       await this.runInOrderSQLiteSaveQueue(async () => {
         let writeMethod = "none";
@@ -2330,6 +2370,30 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           throw new Error("订单 SQLite 数据库不支持写入");
         }
         this.recordRecentSqliteWrite(source, compactedToWrite);
+        if (writeMethod !== "none") {
+          for (const migration of storageKeyMigrations.values()) {
+            try {
+              await this.dbManager.delete(INDEXDB_STORE_NAME, migration.from);
+              this.recentSqliteWriteByStorageKey.delete(migration.from);
+              for (const order of orders) {
+                if (this.getOrderStorageKey(order) !== migration.to)
+                  continue;
+                const orderRecord = order;
+                if (String(orderRecord[ORDER_STORAGE_KEY_FIELD] ?? "") !== migration.from)
+                  continue;
+                orderRecord[ORDER_STORAGE_KEY_FIELD] = migration.to;
+              }
+            } catch (error) {
+              this.logError("删除订单旧 SQLite storage key 失败", {
+                source,
+                order_id: migration.orderId,
+                oldStorageKey: migration.from,
+                newStorageKey: migration.to,
+                error: error instanceof Error ? error.message : String(error)
+              });
+            }
+          }
+        }
         this.logInfo("patchOrdersInSQLite-完成", {
           source,
           count: compactedToWrite.length,

package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -230,6 +230,7 @@ function transformBaseProductToOrderProduct(params) {
     },
     product_bundle: productBundle,
     discount_list: manualDiscountList,
+    ...payload.bundle_edit !== void 0 ? { bundle_edit: payload.bundle_edit } : {},
     // 折后行价由 normalizeOrderProduct 按 main + bundle 合成；手动改价时 bundle 已为分摊后单价
     selling_price: lineCompositeTotal,
     original_price: lineOriginalPrice,

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

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -63,6 +63,8 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     scanPromotionCode(code: string, customerId?: number): Promise<BaseSalesScanCodeResult>;
     private hydrateOrderCustomerFromScanDiscounts;
     private getDiscountCustomerId;
+    resolveCustomerById(customerId: string | number): Promise<ICustomer | null>;
+    /** 兼容既有优惠码扫码逻辑。 */
     private resolveCustomerByDiscountCustomerId;
     private findCustomerById;
     private normalizeCustomer;

package/lib/solution/BookingTicket/index.js

@@ -396,7 +396,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     }
     return null;
   }
-  async resolveCustomerByDiscountCustomerId(customerId) {
+  async resolveCustomerById(customerId) {
     var _a;
     const localCustomers = this.store.customer.getCustomers();
     const localCustomer = this.findCustomerById(localCustomers, customerId);
@@ -410,7 +410,23 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
       num: 1
     });
     const remoteCustomer = this.findCustomerById((result == null ? void 0 : result.list) || [], customerId) || ((_a = result == null ? void 0 : result.list) == null ? void 0 : _a[0]) || null;
-    return remoteCustomer ? this.normalizeCustomer(remoteCustomer) : null;
+    if (remoteCustomer) {
+      return this.normalizeCustomer(remoteCustomer);
+    }
+    try {
+      const detailCustomer = await this.store.customer.queryCustomerDetail(customerId);
+      return detailCustomer ? this.normalizeCustomer(detailCustomer) : null;
+    } catch (error) {
+      console.warn(
+        "[BookingTicket] resolveCustomerById detail request failed",
+        { customerId, error }
+      );
+      return null;
+    }
+  }
+  /** 兼容既有优惠码扫码逻辑。 */
+  resolveCustomerByDiscountCustomerId(customerId) {
+    return this.resolveCustomerById(customerId);
   }
   findCustomerById(customers = [], customerId) {
     return customers.find((customer) => {

package/package.json

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