@pisell/pisellos 2.2.151 → 2.2.153

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 | 1 | 2 | 5 | 4 | 3 | 6;
+        weekNum: 0 | 2 | 1 | 5 | 3 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

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

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

@@ -30,6 +30,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
         type?: 'form' | 'customer';
         [key: string]: any;
     }): void;
+    setOrderId(id?: number): void;
     calcDiscount(productList: Record<string, any>[], options?: SetDiscountSelectedParams): {
         productList: Record<string, any>[];
         discountList: Discount[];
@@ -56,7 +57,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     private bestDiscount;
     loadPrepareConfig(params: {
         customerId: number;
-        action?: 'create' | 'update';
+        action?: 'create' | 'edit';
         with_good_pass?: 0 | 1;
         with_discount_card?: 0 | 1;
     }): Promise<void>;

package/dist/solution/ShopDiscount/index.js

@@ -57,7 +57,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       currentBookingTime: "",
       filteredDiscountList: [],
       bookingSubject: undefined,
-      orderTotalAmount: 0
+      orderTotalAmount: 0,
+      orderId: undefined
     };
     return _this;
   }
@@ -307,6 +308,11 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     value: function setBookingSubject(bookingSubject) {
       this.store.bookingSubject = bookingSubject;
     }
+  }, {
+    key: "setOrderId",
+    value: function setOrderId(id) {
+      this.store.orderId = id;
+    }
 
     // 计算优惠券
   }, {
@@ -406,7 +412,10 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
             case 0:
               _context5.prev = 0;
               _context5.next = 3;
-              return (_this$store$discount3 = this.store.discount) === null || _this$store$discount3 === void 0 ? void 0 : _this$store$discount3.batchSearch(code, customerId);
+              return (_this$store$discount3 = this.store.discount) === null || _this$store$discount3 === void 0 ? void 0 : _this$store$discount3.batchSearch(code, {
+                customerId: customerId,
+                orderId: this.store.orderId
+              });
             case 3:
               _context5.t0 = _context5.sent;
               if (_context5.t0) {
@@ -742,24 +751,27 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadPrepareConfig",
     value: function () {
       var _loadPrepareConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(params) {
-        var _this$getCustomer2, _this$store$discount7, _this$getDiscountList, _this$store$discount8, _this$store$productLi2, customerId, goodPassList, scanDiscount, scanDiscountIds, newGoodPassList, newDiscountList, filteredDiscountList, _result3;
+        var _this$getCustomer2, _this$store$discount7, _this$getDiscountList, _this$store$discount8, _this$store$productLi2, orderId, customerId, goodPassList, scanDiscount, scanDiscountIds, newGoodPassList, newDiscountList, filteredDiscountList, _result3;
         return _regeneratorRuntime().wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
               _context9.prev = 0;
+              orderId = this.store.orderId;
               customerId = params.customerId || ((_this$getCustomer2 = this.getCustomer()) === null || _this$getCustomer2 === void 0 ? void 0 : _this$getCustomer2.id); // if (customerId === 1 || !customerId) {
               //   return
               // }
-              _context9.next = 4;
-              return (_this$store$discount7 = this.store.discount) === null || _this$store$discount7 === void 0 ? void 0 : _this$store$discount7.loadPrepareConfig({
+              _context9.next = 5;
+              return (_this$store$discount7 = this.store.discount) === null || _this$store$discount7 === void 0 ? void 0 : _this$store$discount7.loadPrepareConfig(_objectSpread({
                 customer_id: customerId,
-                action: 'create',
+                action: orderId ? 'edit' : 'create',
                 with_good_pass: 1,
                 with_discount_card: 1,
                 with_wallet_pass_holder: 1,
                 request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
-              });
-            case 4:
+              }, orderId ? {
+                order_id: orderId
+              } : {}));
+            case 5:
               goodPassList = _context9.sent;
               scanDiscount = (_this$getDiscountList = this.getDiscountList()) === null || _this$getDiscountList === void 0 ? void 0 : _this$getDiscountList.filter(function (item) {
                 return item.isScan;
@@ -772,35 +784,35 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               });
               newDiscountList = [].concat(_toConsumableArray(scanDiscount), _toConsumableArray(newGoodPassList || [])); // 存储原始优惠券列表
               this.store.originalDiscountList = newDiscountList;
-              _context9.next = 12;
+              _context9.next = 13;
               return (_this$store$discount8 = this.store.discount) === null || _this$store$discount8 === void 0 ? void 0 : _this$store$discount8.setOriginalDiscountList(newDiscountList);
-            case 12:
+            case 13:
               // 根据当前预约时间过滤优惠券列表
               filteredDiscountList = this.filterDiscountListByBookingTime(newDiscountList, this.store.currentBookingTime);
               this.store.filteredDiscountList = filteredDiscountList;
               this.setDiscountList(filteredDiscountList || []);
               if (!((_this$store$productLi2 = this.store.productList) !== null && _this$store$productLi2 !== void 0 && _this$store$productLi2.length)) {
-                _context9.next = 19;
+                _context9.next = 20;
                 break;
               }
               _result3 = this.calcDiscount(this.store.productList);
-              _context9.next = 19;
+              _context9.next = 20;
               return this.core.effects.emit("".concat(this.name, ":onLoadPrepareCalcResult"), _result3);
-            case 19:
-              _context9.next = 21;
+            case 20:
+              _context9.next = 22;
               return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), filteredDiscountList);
-            case 21:
-              _context9.next = 26;
+            case 22:
+              _context9.next = 27;
               break;
-            case 23:
-              _context9.prev = 23;
+            case 24:
+              _context9.prev = 24;
               _context9.t0 = _context9["catch"](0);
               console.error('[ShopDiscount] 加载准备配置出错:', _context9.t0);
-            case 26:
+            case 27:
             case "end":
               return _context9.stop();
           }
-        }, _callee9, this, [[0, 23]]);
+        }, _callee9, this, [[0, 24]]);
       }));
       function loadPrepareConfig(_x9) {
         return _loadPrepareConfig.apply(this, arguments);

package/dist/solution/ShopDiscount/types.d.ts

@@ -36,6 +36,7 @@ export interface ShopDiscountState {
         type?: 'form' | 'customer';
         [key: string]: any;
     };
+    orderId?: number;
 }
 export interface SetDiscountSelectedParams {
     discountId: number;

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

@@ -1,49 +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,
-  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/Discount/index.d.ts

@@ -17,14 +17,18 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
     setOriginalDiscountList(originalDiscountList: Discount[]): Promise<void>;
     getOriginalDiscountList(): Discount[];
     loadPrepareConfig(params: {
-        action?: 'create';
+        action?: 'create' | 'edit';
         with_good_pass: 0 | 1;
         with_discount_card: 0 | 1;
         customer_id: number;
         with_wallet_pass_holder: 0 | 1;
         request_timezone: string;
+        order_id?: number;
+    }): Promise<Discount[]>;
+    batchSearch(code: string, options?: {
+        customerId?: number;
+        orderId?: number;
     }): Promise<Discount[]>;
-    batchSearch(code: string, customerId?: number): Promise<Discount[]>;
     filterEnabledDiscountList(discountList: Discount[]): Discount[];
     private checkUsageCreditsLimit;
     uniqueByProductId(discountList: Discount[]): Discount[];

package/lib/modules/Discount/index.js

@@ -102,7 +102,8 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
     ) || [];
     return goodPassList;
   }
-  async batchSearch(code, customerId) {
+  async batchSearch(code, options) {
+    const { customerId, orderId } = options || {};
     const result = await this.request.get(`/machinecode/batch-search`, {
       code,
       translate_flag: 1,
@@ -112,6 +113,7 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
       with: ["extensionData", "customScheduleSnapshot", "holder.detail"],
       order_behavior_count: 1,
       order_behavior_count_customer_id: customerId || 1,
+      ...orderId ? { order_behavior_count_order_id: orderId } : {},
       request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
     });
     const resultDiscountList = this.filterEnabledDiscountList((result == null ? void 0 : result.data) || []) || [];

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

@@ -171,7 +171,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private logSubmitBackendRejected;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/lib/modules/Order/index.js

@@ -195,7 +195,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   }
   async scanCode(code, customerId) {
     var _a, _b, _c, _d, _e;
-    const resultDiscountList = await ((_a = this.store.discount) == null ? void 0 : _a.batchSearch(code, customerId)) || [];
+    const resultDiscountList = await ((_a = this.store.discount) == null ? void 0 : _a.batchSearch(code, { customerId })) || [];
     const rulesModule = this.store.rules;
     if (!rulesModule) {
       return {

package/lib/server/index.d.ts

@@ -115,6 +115,12 @@ declare class Server {
      * 不影响当前界面展示，适用于切回前台、定时刷新等场景
      */
     refreshProductsInBackground(): Promise<void>;
+    /**
+     * 后台静默刷新订单数据
+     * 重新拉取全量 SSE 接口，更新本地数据后触发 onOrdersSyncCompleted
+     * 不影响当前界面展示，适用于切回前台、定时刷新等场景
+     */
+    refreshOrdersInBackground(): Promise<void>;
     /**
      * 清空所有server模块的IndexedDB缓存
      * @returns Promise<void>

package/lib/server/index.js

@@ -1008,6 +1008,32 @@ var Server = class {
       });
     }
   }
+  /**
+   * 后台静默刷新订单数据
+   * 重新拉取全量 SSE 接口，更新本地数据后触发 onOrdersSyncCompleted
+   * 不影响当前界面展示，适用于切回前台、定时刷新等场景
+   */
+  async refreshOrdersInBackground() {
+    if (!this.order) {
+      this.logWarning("refreshOrdersInBackground: Order 模块未注册");
+      return;
+    }
+    this.logInfo("refreshOrdersInBackground 开始");
+    const startTime = Date.now();
+    try {
+      await this.order.silentRefresh();
+      const duration = Date.now() - startTime;
+      this.logInfo("refreshOrdersInBackground 完成", { duration: `${duration}ms` });
+    } catch (error) {
+      const duration = Date.now() - startTime;
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      console.error("[Server] refreshOrdersInBackground 失败:", error);
+      this.logError("refreshOrdersInBackground 失败", {
+        duration: `${duration}ms`,
+        error: errorMessage
+      });
+    }
+  }
   /**
    * 清空所有server模块的IndexedDB缓存
    * @returns Promise<void>

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

@@ -40,6 +40,12 @@ export declare class OrderModule extends BaseModule implements Module {
     getOrderByOrderId(orderId: OrderId): OrderData | undefined;
     getLocalOrderByOrderId(orderId: OrderId): Promise<OrderData | null>;
     loadOrdersByServer(): Promise<OrderData[]>;
+    /**
+     * 静默全量刷新：后台重新拉取全量 SSE 订单数据并更新本地
+     * 拿到完整数据后一次性替换 store，触发订单变更与同步完成事件
+     * @returns 刷新后的订单列表
+     */
+    silentRefresh(): Promise<OrderData[]>;
     getOrdersByResourceId(resourceId: string | number): OrderData[];
     /**
      * 仅覆盖本地已存在的订单；不存在则直接跳过，不落库、不 emit。

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

@@ -234,6 +234,38 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     await this.core.effects.emit(import_types.OrderHooks.onOrdersLoaded, orderList);
     return orderList;
   }
+  /**
+   * 静默全量刷新：后台重新拉取全量 SSE 订单数据并更新本地
+   * 拿到完整数据后一次性替换 store，触发订单变更与同步完成事件
+   * @returns 刷新后的订单列表
+   */
+  async silentRefresh() {
+    const startTime = Date.now();
+    this.logInfo("silentRefresh 开始");
+    try {
+      const orders = await this.loadOrdersByServer();
+      if (orders.length > 0) {
+        this.store.list = (0, import_lodash_es.cloneDeep)(orders);
+        this.syncOrdersMap();
+        this.core.effects.emit(import_types.OrderHooks.onOrdersChanged, this.store.list);
+        await this.core.effects.emit(import_types.OrderHooks.onOrdersSyncCompleted, null);
+        this.logInfo("silentRefresh 完成", {
+          orderCount: orders.length,
+          duration: `${Date.now() - startTime}ms`
+        });
+      } else {
+        this.logInfo("silentRefresh: 服务器未返回数据");
+      }
+      return this.store.list;
+    } catch (error) {
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      this.logError("silentRefresh 失败", {
+        duration: `${Date.now() - startTime}ms`,
+        error: errorMessage
+      });
+      return this.store.list;
+    }
+  }
   getOrdersByResourceId(resourceId) {
     const ids = this.resourceIdIndex.get(String(resourceId)) || [];
     return ids.map((id) => this.store.map.get(id)).filter((order) => !!order);

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 | 1 | 2 | 5 | 4 | 3 | 6;
+        weekNum: 0 | 2 | 1 | 5 | 3 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

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

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

@@ -30,6 +30,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
         type?: 'form' | 'customer';
         [key: string]: any;
     }): void;
+    setOrderId(id?: number): void;
     calcDiscount(productList: Record<string, any>[], options?: SetDiscountSelectedParams): {
         productList: Record<string, any>[];
         discountList: Discount[];
@@ -56,7 +57,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     private bestDiscount;
     loadPrepareConfig(params: {
         customerId: number;
-        action?: 'create' | 'update';
+        action?: 'create' | 'edit';
         with_good_pass?: 0 | 1;
         with_discount_card?: 0 | 1;
     }): Promise<void>;

package/lib/solution/ShopDiscount/index.js

@@ -57,7 +57,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       currentBookingTime: "",
       filteredDiscountList: [],
       bookingSubject: void 0,
-      orderTotalAmount: 0
+      orderTotalAmount: 0,
+      orderId: void 0
     };
   }
   // =========== 生命周期方法 ===========
@@ -205,6 +206,9 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   setBookingSubject(bookingSubject) {
     this.store.bookingSubject = bookingSubject;
   }
+  setOrderId(id) {
+    this.store.orderId = id;
+  }
   // 计算优惠券
   calcDiscount(productList, options) {
     var _a;
@@ -270,7 +274,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   async scanCode(code, customerId) {
     var _a, _b, _c;
     try {
-      const resultDiscountList = await ((_a = this.store.discount) == null ? void 0 : _a.batchSearch(code, customerId)) || [];
+      const resultDiscountList = await ((_a = this.store.discount) == null ? void 0 : _a.batchSearch(code, { customerId, orderId: this.store.orderId })) || [];
       const rulesModule = this.store.rules;
       if (!rulesModule) {
         return {
@@ -497,14 +501,16 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   async loadPrepareConfig(params) {
     var _a, _b, _c, _d, _e;
     try {
+      const orderId = this.store.orderId;
       const customerId = params.customerId || ((_a = this.getCustomer()) == null ? void 0 : _a.id);
       const goodPassList = await ((_b = this.store.discount) == null ? void 0 : _b.loadPrepareConfig({
         customer_id: customerId,
-        action: "create",
+        action: orderId ? "edit" : "create",
         with_good_pass: 1,
         with_discount_card: 1,
         with_wallet_pass_holder: 1,
-        request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
+        request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+        ...orderId ? { order_id: orderId } : {}
       }));
       const scanDiscount = (_c = this.getDiscountList()) == null ? void 0 : _c.filter(
         (item) => item.isScan

package/lib/solution/ShopDiscount/types.d.ts

@@ -36,6 +36,7 @@ export interface ShopDiscountState {
         type?: 'form' | 'customer';
         [key: string]: any;
     };
+    orderId?: number;
 }
 export interface SetDiscountSelectedParams {
     discountId: number;

package/package.json

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