@pisell/pisellos 2.2.220 → 2.2.221

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

@@ -61,6 +61,7 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
     /**
      * 获取订单列表
      */
+    /** @deprecated */
     getOrderListAsync(): Promise<PaymentOrder[]>;
     /**
      * 根据订单UUID获取支付订单（新方法）
@@ -160,10 +161,12 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
     /**
      * 确保支付模块所需的数据库表已创建
      */
+    /** @deprecated */
     private ensurePaymentTables;
     /**
      * 获取部分支付的订单
      */
+    /** @deprecated */
     getPartiallyPaidOrdersAsync(): Promise<PaymentOrder[]>;
     /**
      * 智能金额舍入

package/dist/modules/Payment/index.js

@@ -197,9 +197,8 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               this.logger = this.app.logger;
 
               // 确保支付模块所需的对象存储已创建
-              _context.next = 15;
-              return this.ensurePaymentTables();
-            case 15:
+              // await this.ensurePaymentTables();
+
               this.registerNetworkHandlers();
 
               // // 预连接数据库
@@ -207,7 +206,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
 
               console.log('[PaymentModule] 初始化完成');
               this.logInfo('PaymentModule initialized successfully');
-            case 18:
+            case 16:
             case "end":
               return _context.stop();
           }
@@ -376,6 +375,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     /**
      * 获取订单列表
      */
+    /** @deprecated */
     )
   }, {
     key: "getOrderListAsync",
@@ -1848,6 +1848,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     /**
      * 确保支付模块所需的数据库表已创建
      */
+    /** @deprecated */
     )
   }, {
     key: "ensurePaymentTables",
@@ -1893,6 +1894,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     /**
      * 获取部分支付的订单
      */
+    /** @deprecated */
     )
   }, {
     key: "getPartiallyPaidOrdersAsync",

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

@@ -1625,7 +1625,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               this.logInfo('mergeOrdersToStore-开始', {
                 freshOrderCount: freshOrders.length,
-                storeOrderCountBefore: this.store.list.length
+                storeOrderCountBefore: this.store.list.length,
+                source: source
               });
               this.logDuplicateOrders("".concat(source, ".beforeMerge"), this.store.list);
               normalizedFreshOrders = [];
@@ -1712,20 +1713,25 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               updateCount = Object.values(mergeActions).filter(function (v) {
                 return v === 'update';
               }).length;
+              this.logInfo('mergeOrdersToStore-合并完成', {
+                insertCount: insertCount,
+                updateCount: updateCount,
+                storeOrderCountAfter: this.store.list.length
+              });
               this.store.list = this.compactOrderListByIdentity(updatedList, "".concat(source, ".store")).list;
               this.syncOrdersMap();
-              _context16.next = 60;
+              _context16.next = 61;
               return this.patchOrdersInSQLite(patchedOrders, source, mergeActions);
-            case 60:
+            case 61:
               this.logInfo('mergeOrdersToStore-结束', {
                 uniqueFreshCount: uniqueFreshCount,
                 storeOrderCountAfter: this.store.list.length,
                 insertCount: insertCount,
                 updateCount: updateCount
               });
-              _context16.next = 63;
+              _context16.next = 64;
               return this.emitOrdersChanged(patchedOrders, source);
-            case 63:
+            case 64:
             case "end":
               return _context16.stop();
           }

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

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

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

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

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

@@ -305,6 +305,7 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      *
      * 删除本地 IndexDB 中超过指定天数且已同步到后端的订单数据
      */
+    /** @deprecated */
     private cleanupExpiredOrdersAsync;
     /**
      * 清除计算缓存

package/dist/solution/Checkout/index.js

@@ -117,20 +117,20 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               _context.next = 15;
               return this.initializeSubModules(core, options);
             case 15:
-              _context.next = 17;
-              return this.preloadPaymentMethods();
-            case 17:
-              _context.next = 19;
-              return this.cleanupExpiredOrdersAsync();
-            case 19:
+              // 预加载支付方式（利用缓存机制）
+              // await this.preloadPaymentMethods();
+
+              // 清理过期的已同步订单数据
+              // await this.cleanupExpiredOrdersAsync();
+
               console.log('[Checkout] 初始化完成');
-              _context.next = 22;
+              _context.next = 18;
               return this.core.effects.emit("".concat(this.name, ":onCheckoutInitialized"), {
                 timestamp: Date.now()
               });
-            case 22:
+            case 18:
               this.logInfo('CheckoutModule initialized successfully');
-            case 23:
+            case 19:
             case "end":
               return _context.stop();
           }
@@ -2868,6 +2868,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
      *
      * 删除本地 IndexDB 中超过指定天数且已同步到后端的订单数据
      */
+    /** @deprecated */
     )
   }, {
     key: "cleanupExpiredOrdersAsync",

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

@@ -0,0 +1,49 @@
+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,
+  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,
+  PromotionAdapter,
+  PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY
+});

package/lib/modules/Payment/index.d.ts

@@ -61,6 +61,7 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
     /**
      * 获取订单列表
      */
+    /** @deprecated */
     getOrderListAsync(): Promise<PaymentOrder[]>;
     /**
      * 根据订单UUID获取支付订单（新方法）
@@ -160,10 +161,12 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
     /**
      * 确保支付模块所需的数据库表已创建
      */
+    /** @deprecated */
     private ensurePaymentTables;
     /**
      * 获取部分支付的订单
      */
+    /** @deprecated */
     getPartiallyPaidOrdersAsync(): Promise<PaymentOrder[]>;
     /**
      * 智能金额舍入

package/lib/modules/Payment/index.js

@@ -123,7 +123,6 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
     this.app = appPlugin.getApp();
     this.dbManager = this.app.dbManager;
     this.logger = this.app.logger;
-    await this.ensurePaymentTables();
     this.registerNetworkHandlers();
     console.log("[PaymentModule] 初始化完成");
     this.logInfo("PaymentModule initialized successfully");
@@ -235,6 +234,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
   /**
    * 获取订单列表
    */
+  /** @deprecated */
   async getOrderListAsync() {
     try {
       return await this.dbManager.getAll("order");
@@ -992,6 +992,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
   /**
    * 确保支付模块所需的数据库表已创建
    */
+  /** @deprecated */
   async ensurePaymentTables() {
     try {
       await this.dbManager.getAll("pay_method");
@@ -1013,6 +1014,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
   /**
    * 获取部分支付的订单
    */
+  /** @deprecated */
   async getPartiallyPaidOrdersAsync() {
     try {
       const allOrders = await this.dbManager.getAll("order");

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

@@ -953,7 +953,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   async mergeOrdersToStore(freshOrders, source) {
     this.logInfo("mergeOrdersToStore-开始", {
       freshOrderCount: freshOrders.length,
-      storeOrderCountBefore: this.store.list.length
+      storeOrderCountBefore: this.store.list.length,
+      source
     });
     this.logDuplicateOrders(`${source}.beforeMerge`, this.store.list);
     const normalizedFreshOrders = [];
@@ -990,6 +991,11 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
     const insertCount = Object.values(mergeActions).filter((v) => v === "insert").length;
     const updateCount = Object.values(mergeActions).filter((v) => v === "update").length;
+    this.logInfo("mergeOrdersToStore-合并完成", {
+      insertCount,
+      updateCount,
+      storeOrderCountAfter: this.store.list.length
+    });
     this.store.list = this.compactOrderListByIdentity(updatedList, `${source}.store`).list;
     this.syncOrdersMap();
     await this.patchOrdersInSQLite(patchedOrders, source, mergeActions);

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

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

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

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

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

@@ -305,6 +305,7 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      *
      * 删除本地 IndexDB 中超过指定天数且已同步到后端的订单数据
      */
+    /** @deprecated */
     private cleanupExpiredOrdersAsync;
     /**
      * 清除计算缓存

package/lib/solution/Checkout/index.js

@@ -80,8 +80,6 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       currentCustomer: void 0
     };
     await this.initializeSubModules(core, options);
-    await this.preloadPaymentMethods();
-    await this.cleanupExpiredOrdersAsync();
     console.log("[Checkout] 初始化完成");
     await this.core.effects.emit(`${this.name}:onCheckoutInitialized`, {
       timestamp: Date.now()
@@ -1900,6 +1898,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
    *
    * 删除本地 IndexDB 中超过指定天数且已同步到后端的订单数据
    */
+  /** @deprecated */
   async cleanupExpiredOrdersAsync() {
     var _a, _b, _c;
     try {

package/package.json

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