@pisell/pisellos 2.2.219 → 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

@@ -1237,9 +1237,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }, {
         field: 'shop_order_number',
         value: record.shop_order_number
-      }, {
-        field: 'shop_full_order_number',
-        value: record.shop_full_order_number
       }];
       var entries = [];
       var _loop2 = function _loop2() {
@@ -1351,7 +1348,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               type: (_message$type = message.type) !== null && _message$type !== void 0 ? _message$type : null,
               pendingCount: _this12.pendingSyncMessages.length,
               throttleMs: throttleMs,
-              pubsubReceivedAt: new Date(pubsubReceivedAt).toISOString()
+              pubsubReceivedAt: new Date(pubsubReceivedAt).toISOString(),
+              fullMessage: JSON.stringify(message)
             });
             _this12.scheduleOrderSyncThrottle();
           }
@@ -1627,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 = [];
@@ -1714,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();
           }
@@ -1874,9 +1878,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var secondary = preferred === existing ? incoming : existing;
       var merged = _objectSpread(_objectSpread({}, secondary), preferred);
       var fieldsToPreserve = ['order_id', 'external_sale_number', 'order_number', 'shop_order_number', 'shop_full_order_number'];
+      var incomingPatchFields = ['payment_status', 'status', 'shipping_status', 'updated_at', 'summary', 'payments'];
       var mergedRecord = merged;
       var preferredRecord = preferred;
       var secondaryRecord = secondary;
+      var incomingRecord = incoming;
       for (var _i3 = 0, _fieldsToPreserve = fieldsToPreserve; _i3 < _fieldsToPreserve.length; _i3++) {
         var field = _fieldsToPreserve[_i3];
         if (!this.isBlankIdentityValue(preferredRecord[field])) {
@@ -1887,6 +1893,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           mergedRecord[field] = secondaryRecord[field];
         }
       }
+      for (var _i4 = 0, _incomingPatchFields = incomingPatchFields; _i4 < _incomingPatchFields.length; _i4++) {
+        var _field = _incomingPatchFields[_i4];
+        if (!Object.prototype.hasOwnProperty.call(incomingRecord, _field)) continue;
+        if (incomingRecord[_field] === undefined || incomingRecord[_field] === null) continue;
+        if (typeof incomingRecord[_field] === 'string' && incomingRecord[_field] === '') continue;
+        mergedRecord[_field] = cloneDeep(incomingRecord[_field]);
+      }
       if (!this.isPendingSyncOrder(preferred) || !this.isPendingSyncOrder(secondary)) {
         merged.need_sync = 0;
       }

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/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

@@ -694,8 +694,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       { field: "order_id", value: order.order_id },
       { field: "external_sale_number", value: record.external_sale_number },
       { field: "order_number", value: record.order_number },
-      { field: "shop_order_number", value: record.shop_order_number },
-      { field: "shop_full_order_number", value: record.shop_full_order_number }
+      { field: "shop_order_number", value: record.shop_order_number }
     ];
     const entries = [];
     for (const candidate of candidates) {
@@ -787,7 +786,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
             type: message.type ?? null,
             pendingCount: this.pendingSyncMessages.length,
             throttleMs,
-            pubsubReceivedAt: new Date(pubsubReceivedAt).toISOString()
+            pubsubReceivedAt: new Date(pubsubReceivedAt).toISOString(),
+            fullMessage: JSON.stringify(message)
           });
           this.scheduleOrderSyncThrottle();
         }
@@ -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);
@@ -1129,9 +1135,18 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       "shop_order_number",
       "shop_full_order_number"
     ];
+    const incomingPatchFields = [
+      "payment_status",
+      "status",
+      "shipping_status",
+      "updated_at",
+      "summary",
+      "payments"
+    ];
     const mergedRecord = merged;
     const preferredRecord = preferred;
     const secondaryRecord = secondary;
+    const incomingRecord = incoming;
     for (const field of fieldsToPreserve) {
       if (!this.isBlankIdentityValue(preferredRecord[field])) {
         mergedRecord[field] = preferredRecord[field];
@@ -1141,6 +1156,15 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         mergedRecord[field] = secondaryRecord[field];
       }
     }
+    for (const field of incomingPatchFields) {
+      if (!Object.prototype.hasOwnProperty.call(incomingRecord, field))
+        continue;
+      if (incomingRecord[field] === void 0 || incomingRecord[field] === null)
+        continue;
+      if (typeof incomingRecord[field] === "string" && incomingRecord[field] === "")
+        continue;
+      mergedRecord[field] = (0, import_lodash_es.cloneDeep)(incomingRecord[field]);
+    }
     if (!this.isPendingSyncOrder(preferred) || !this.isPendingSyncOrder(secondary)) {
       merged.need_sync = 0;
     }

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.219",
+  "version": "2.2.221",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",