@pisell/pisellos 2.1.39 → 2.1.41

package/lib/solution/BookingByStep/index.js

@@ -116,7 +116,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       }
     });
     this.store.schedule.loadAllSchedule();
-    this.core.effects.emit(import_types.BookingByStepHooks.onInited, {});
+    this.core.effects.emit(`${this.name}:onInited`, {});
   }
   // 初始化step
   initStep(stepList) {
@@ -1921,7 +1921,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   checkMaxDurationCapacity() {
     var _a, _b;
-    const cartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
+    const cartItems = this.store.cart.getItems().filter((item) => !(0, import_utils5.isNormalProduct)(item._productOrigin));
     if (cartItems.length === 0)
       return { success: true, minAvailableCount: 0 };
     const itemsWithTime = [];
@@ -2183,7 +2183,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     account
   }) {
     var _a, _b;
-    const cartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
+    const cartItems = this.store.cart.getItems().filter((item) => !(0, import_utils5.isNormalProduct)(item._productOrigin));
     const currentCartItem = this.convertProductToCartItem({ product, date, account });
     cartItems.push(currentCartItem);
     if (cartItems.length === 0)

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

@@ -22,6 +22,10 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * @returns 商品列表
      */
     loadProducts(params?: ILoadProductsParams): Promise<any>;
+    /**
+     * 初始化外设扫码结果监听
+     */
+    initPeripheralsListener(): void;
     /**
      * 获取商品列表（不加载到模块中）
      * @returns 商品列表
@@ -111,7 +115,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/lib/solution/BookingTicket/index.js

@@ -99,7 +99,7 @@ var BookingTicketImpl = class extends import_BaseModule.BaseModule {
         throw new Error(`模块 ${step} 不存在`);
       }
     });
-    this.core.effects.emit(import_types.BookingTicketHooks.onInited, {});
+    this.core.effects.emit(`${this.name}:onInited`, {});
   }
   /**
    * 获取商品列表
@@ -115,13 +115,19 @@ var BookingTicketImpl = class extends import_BaseModule.BaseModule {
         ...params,
         cacheId: this.cacheId
       });
-      this.core.effects.emit(import_types.BookingTicketHooks.onProductsLoaded, result);
+      this.core.effects.emit(`${this.name}:onProductsLoaded`, result);
       return result;
     } catch (error) {
       console.error("Failed to load products:", error);
       throw error;
     }
   }
+  /**
+   * 初始化外设扫码结果监听
+   */
+  initPeripheralsListener() {
+    this.scan.initPeripheralsListener();
+  }
   /**
    * 获取商品列表（不加载到模块中）
    * @returns 商品列表
@@ -149,7 +155,7 @@ var BookingTicketImpl = class extends import_BaseModule.BaseModule {
    */
   setActiveCustomer(customer) {
     this.store.customer.setSelectedCustomer(customer);
-    this.core.effects.emit(import_types.BookingTicketHooks.onCustomerSelected, {
+    this.core.effects.emit(`${this.name}:onCustomerSelected`, {
       customer
     });
   }
@@ -168,7 +174,7 @@ var BookingTicketImpl = class extends import_BaseModule.BaseModule {
     const customer = this.store.customer.getCustomerById(customerId);
     if (customer) {
       this.store.customer.setSelectedCustomer(customer);
-      this.core.effects.emit(import_types.BookingTicketHooks.onCustomerSelected, {
+      this.core.effects.emit(`${this.name}:onCustomerSelected`, {
         customer
       });
     }
@@ -248,7 +254,7 @@ var BookingTicketImpl = class extends import_BaseModule.BaseModule {
   async loadMoreCustomers() {
     try {
       const result = await this.store.customer.loadMoreCustomers();
-      this.core.effects.emit(import_types.BookingTicketHooks.onCustomerListUpdate, result);
+      this.core.effects.emit(`${this.name}:onCustomerListUpdate`, result);
       return result;
     } catch (error) {
       console.error("Failed to load more customers:", error);
@@ -263,7 +269,7 @@ var BookingTicketImpl = class extends import_BaseModule.BaseModule {
   async resetAndLoadCustomers(params = {}) {
     try {
       const result = await this.store.customer.resetAndLoadCustomers(params);
-      this.core.effects.emit(import_types.BookingTicketHooks.onCustomerListReset, result);
+      this.core.effects.emit(`${this.name}:onCustomerListReset`, result);
       return result;
     } catch (error) {
       console.error("Failed to reset and load customers:", error);

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

@@ -18,6 +18,10 @@ export default class Scan {
     private watchKey;
     private listenerConfig;
     constructor(solution: BookingTicketImpl, watchKey: string);
+    /**
+     * 初始化外设扫码结果监听
+     */
+    initPeripheralsListener(): void;
     /**
      * 处理扫码事件
      * @param eventKey 事件key

package/lib/solution/BookingTicket/utils/scan/index.js

@@ -37,9 +37,15 @@ var import_task = __toESM(require("../../../../utils/task"));
 var Scan = class {
   constructor(solution, watchKey) {
     this.listenerConfig = /* @__PURE__ */ new Map();
-    var _a, _b, _c, _d, _e;
     this.solution = solution;
     this.watchKey = watchKey;
+    this.initPeripheralsListener();
+  }
+  /**
+   * 初始化外设扫码结果监听
+   */
+  initPeripheralsListener() {
+    var _a, _b, _c, _d, _e;
     (_e = (_d = (_c = (_b = (_a = this.solution) == null ? void 0 : _a.window) == null ? void 0 : _b.interaction) == null ? void 0 : _c.utils) == null ? void 0 : _d.mountFunction) == null ? void 0 : _e.call(
       _d,
       "global",

package/lib/solution/BuyTickets/index.js

@@ -24,7 +24,6 @@ __export(BuyTickets_exports, {
 });
 module.exports = __toCommonJS(BuyTickets_exports);
 var import_modules = require("../../modules/");
-var import_types = require("./types");
 var import_BaseModule = require("../../modules/BaseModule");
 __reExport(BuyTickets_exports, require("./types"), module.exports);
 var BuyTicketsImpl = class extends import_BaseModule.BaseModule {
@@ -49,7 +48,7 @@ var BuyTicketsImpl = class extends import_BaseModule.BaseModule {
     if (this.otherParams.prodctIds) {
       await this.loadProductsByIds(this.otherParams.prodctIds);
     }
-    await this.core.effects.emit(import_types.BuyTicketsHooks.onInited, {});
+    await this.core.effects.emit(`${this.name}:onInited`, {});
   }
   // 通过 ids 获取产品，在当前解决方案下，获取到的就是主商品
   async loadProductsByIds(ids) {
@@ -69,13 +68,13 @@ var BuyTicketsImpl = class extends import_BaseModule.BaseModule {
       }
     });
     this.store.mainProducts = mainProducts;
-    await this.core.effects.emit(import_types.BuyTicketsHooks.onMainProductsLoaded, {});
+    await this.core.effects.emit(`${this.name}:onMainProductsLoaded`, {});
   }
   // 通过 ids 获取产品，在当前解决方案下，获取到的就是其他商品
   async loadProductsByCategory(categoryId) {
   }
   async destroy() {
-    await this.core.effects.emit(import_types.BuyTicketsHooks.onDestroy, {});
+    await this.core.effects.emit(`${this.name}:onDestroy`, {});
     console.log("[BuyTickets] 已销毁");
   }
   // 获取当前绑定的所有商品
@@ -83,7 +82,7 @@ var BuyTicketsImpl = class extends import_BaseModule.BaseModule {
     var _a;
     const mainData = await this.store.mainProducts.getProducts() || [];
     const otherData = await ((_a = this.store.otherProducts) == null ? void 0 : _a.getProducts()) || [];
-    await this.core.effects.emit(import_types.BuyTicketsHooks.OnGetProducts, [
+    await this.core.effects.emit(`${this.name}:onGetProducts`, [
       ...mainData,
       ...otherData
     ]);
@@ -102,7 +101,7 @@ var BuyTicketsImpl = class extends import_BaseModule.BaseModule {
   }
   // 商品列表页提交
   async listSubmit(data) {
-    const res = await this.core.effects.emit(import_types.BuyTicketsHooks.onListSubmit, {
+    const res = await this.core.effects.emit(`${this.name}:onListSubmit`, {
       ...data,
       products: this.getProducts()
     });
@@ -116,14 +115,14 @@ var BuyTicketsImpl = class extends import_BaseModule.BaseModule {
   }
   // 购物车提交
   async cartSubmit(data) {
-    await this.core.effects.emit(import_types.BuyTicketsHooks.onCartSubmit, {
+    await this.core.effects.emit(`${this.name}:onCartSubmit`, {
       ...data,
       products: this.getProducts()
     });
   }
   // 结算提交
   async checkoutSubmit(data) {
-    await this.core.effects.emit(import_types.BuyTicketsHooks.onCheckoutSubmit, {
+    await this.core.effects.emit(`${this.name}:onCheckoutSubmit`, {
       ...data,
       products: this.getProducts()
     });

package/lib/solution/Checkout/index.js

@@ -81,7 +81,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
     await this.preloadPaymentMethods();
     await this.cleanupExpiredOrdersAsync();
     console.log("[Checkout] 初始化完成");
-    await this.core.effects.emit(import_types.CheckoutHooks.OnCheckoutInitialized, {
+    await this.core.effects.emit(`${this.name}:onCheckoutInitialized`, {
       timestamp: Date.now()
     });
     this.logInfo("CheckoutModule initialized successfully");
@@ -265,7 +265,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
     this.logInfo("initWalletData currentOrder found", {
       currentOrder: this.store.currentOrder
     });
-    await this.core.effects.emit(import_types.CheckoutHooks.OnWalletDataInitialized, {
+    await this.core.effects.emit(`${this.name}:onWalletDataInitialized`, {
       orderUuid: (_g = this.store.currentOrder) == null ? void 0 : _g.uuid,
       customerId: walletBusinessData.customer_id,
       walletBusinessData: {
@@ -397,7 +397,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         }
       });
       this.store.currentOrder = paymentOrder;
-      this.core.effects.emit(import_types.CheckoutHooks.OnOrderCreated, {
+      this.core.effects.emit(`${this.name}:onOrderCreated`, {
         order: paymentOrder,
         timestamp: Date.now()
       });
@@ -427,7 +427,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         import_types.CheckoutErrorType.OrderCreationFailed
       );
       this.logError("本地订单创建失败:", error);
-      this.core.effects.emit(import_types.CheckoutHooks.OnOrderCreationFailed, {
+      this.core.effects.emit(`${this.name}:onOrderCreationFailed`, {
         error: this.store.lastError,
         timestamp: Date.now()
       });
@@ -528,7 +528,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         totalAmount: updated.total_amount,
         expectAmount: updated.expect_amount
       });
-      await this.core.effects.emit(import_types.CheckoutHooks.OnOrderCreated, {
+      await this.core.effects.emit(`${this.name}:onOrderCreated`, {
         order: updated,
         timestamp: Date.now()
       });
@@ -594,7 +594,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         );
       }
       this.payment.wallet.clearAllCache();
-      await this.core.effects.emit(import_types.CheckoutHooks.OnCheckoutCompleted, {
+      await this.core.effects.emit(`${this.name}:onCheckoutCompleted`, {
         orderId: order.id,
         timestamp: Date.now()
       });
@@ -705,7 +705,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       );
       if (updatedOrder) {
         this.store.currentOrder = updatedOrder;
-        await this.core.effects.emit(import_types.CheckoutHooks.OnOrderCreated, {
+        await this.core.effects.emit(`${this.name}:onOrderCreated`, {
           order: updatedOrder,
           timestamp: Date.now()
         });
@@ -746,7 +746,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         newAmount: formattedAmount
       });
       this.store.stateAmount = formattedAmount;
-      await this.core.effects.emit(import_types.CheckoutHooks.OnStateAmountChanged, {
+      await this.core.effects.emit(`${this.name}:onStateAmountChanged`, {
         oldAmount,
         newAmount: formattedAmount,
         timestamp: Date.now()
@@ -898,7 +898,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           }
         }
       }
-      this.core.effects.emit(import_types.CheckoutHooks.OnPaymentItemAdded, {
+      this.core.effects.emit(`${this.name}:onPaymentItemAdded`, {
         orderUuid: this.store.currentOrder.uuid,
         paymentMethodCode: paymentItem.code,
         paymentMethodName: paymentItem.name,
@@ -975,7 +975,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         this.store.currentOrder = updatedOrder;
       }
       await this.updateStateAmountToRemaining(false);
-      await this.core.effects.emit(import_types.CheckoutHooks.OnPaymentStarted, {
+      await this.core.effects.emit(`${this.name}:onPaymentStarted`, {
         orderUuid: this.store.currentOrder.uuid,
         paymentMethodCode: paymentItem.code,
         amount: `-${paymentItem.amount}`,
@@ -1070,7 +1070,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         this.store.currentOrder = updatedOrder;
       }
       await this.updateStateAmountToRemaining(false);
-      await this.core.effects.emit(import_types.CheckoutHooks.OnPaymentStarted, {
+      await this.core.effects.emit(`${this.name}:onPaymentStarted`, {
         orderUuid: this.store.currentOrder.uuid,
         paymentMethodCode: "VOUCHER_BATCH",
         amount: voucherPaymentItems.reduce((sum, item) => sum + parseFloat(String(item.amount)), 0).toFixed(2),
@@ -1132,7 +1132,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       }
       this.clearCalculationCache();
       this.updateStateAmountToRemaining(false);
-      await this.core.effects.emit(import_types.CheckoutHooks.OnOrderCreated, {
+      await this.core.effects.emit(`${this.name}:onOrderCreated`, {
         order: this.store.currentOrder,
         timestamp: Date.now()
       });
@@ -1224,7 +1224,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       }
       this.clearCalculationCache();
       this.updateStateAmountToRemaining(false);
-      await this.core.effects.emit(import_types.CheckoutHooks.OnOrderCreated, {
+      await this.core.effects.emit(`${this.name}:onOrderCreated`, {
         order: this.store.currentOrder,
         timestamp: Date.now()
       });
@@ -1411,7 +1411,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       this.store.currentCustomer = void 0;
       this.payment.wallet.clearAllCache();
       this.logInfo("订单状态清理完成，currentOrder已释放");
-      await this.core.effects.emit(import_types.CheckoutHooks.OnOrderCancelled, {
+      await this.core.effects.emit(`${this.name}:onOrderCancelled`, {
         orderUuid: currentOrderUuid,
         orderId: currentOrderId,
         cancelReason,
@@ -1528,7 +1528,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           );
         }
       }
-      await this.core.effects.emit(import_types.CheckoutHooks.OnOrderNoteChanged, {
+      await this.core.effects.emit(`${this.name}:onOrderNoteChanged`, {
         orderUuid: (_b = this.store.currentOrder) == null ? void 0 : _b.uuid,
         oldNote,
         newNote: note,
@@ -1553,7 +1553,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
   async handleError(error, type) {
     const checkoutError = error instanceof Error && "type" in error ? error : (0, import_utils.createCheckoutError)(type, error.message, error);
     this.store.lastError = checkoutError;
-    await this.core.effects.emit(import_types.CheckoutHooks.OnError, {
+    await this.core.effects.emit(`${this.name}:onError`, {
       error: checkoutError,
       context: {},
       timestamp: Date.now()
@@ -1566,7 +1566,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
   async handlePaymentSuccess(data) {
     var _a;
     await this.updateStateAmountToRemaining();
-    await this.core.effects.emit(import_types.CheckoutHooks.OnPaymentSuccess, {
+    await this.core.effects.emit(`${this.name}:onPaymentSuccess`, {
       orderUuid: data.orderUuid,
       paymentMethodCode: "",
       amount: ((_a = this.store.currentOrder) == null ? void 0 : _a.total_amount) || "0",
@@ -1587,7 +1587,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       error instanceof Error ? error : new Error(String(error)),
       import_types.CheckoutErrorType.PaymentFailed
     );
-    await this.core.effects.emit(import_types.CheckoutHooks.OnPaymentFailed, {
+    await this.core.effects.emit(`${this.name}:onPaymentFailed`, {
       orderUuid: data.orderUuid,
       paymentMethodCode: "",
       amount: ((_a = this.store.currentOrder) == null ? void 0 : _a.total_amount) || "0",
@@ -1823,7 +1823,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
   }
   /**
    * 计算已支付金额（从 Payment 模块获取最新数据）
-   * 
+   *
    * 注意：此方法保持独立性，可以单独调用。
    * 在 updateStateAmountToRemaining 等批量操作中会使用缓存优化。
    */
@@ -1875,7 +1875,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
   }
   /**
    * 计算剩余未支付金额（从 Payment 模块获取最新数据）
-   * 
+   *
    * 注意：此方法保持独立性，可以单独调用。
    * 在 updateStateAmountToRemaining 等批量操作中会使用缓存优化。
    */
@@ -1895,7 +1895,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
   }
   /**
    * 计算剩余未支付金额（排除定金计算，始终使用订单总金额）
-   * 
+   *
    * 注意：此方法保持独立性，可以单独调用。
    * 在 updateStateAmountToRemaining 等批量操作中会使用缓存优化。
    */
@@ -1923,7 +1923,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       const currentBalanceDueAmount = this.store.balanceDueAmount;
       if (remainingAmount !== currentBalanceDueAmount) {
         this.store.balanceDueAmount = remainingAmount;
-        await this.core.effects.emit(import_types.CheckoutHooks.OnBalanceDueAmountChanged, {
+        await this.core.effects.emit(`${this.name}:onBalanceDueAmountChanged`, {
           oldAmount: currentBalanceDueAmount,
           newAmount: remainingAmount,
           timestamp: Date.now(),
@@ -1945,7 +1945,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
   }
   /**
    * 更新 stateAmount 为当前剩余未支付金额
-   * 
+   *
    * 优化版本：批量获取数据，避免重复查询数据库
    */
   async updateStateAmountToRemaining(checkOrder = true) {
@@ -2047,7 +2047,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
   }
   /**
    * 检查订单支付是否完成（优化版，复用已获取的数据）
-   * 
+   *
    * @param paymentItems 已获取的支付项数据
    * @param remainingAmount 已计算的剩余金额
    */
@@ -2117,7 +2117,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
    * 检查订单支付是否完成
    *
    * 当剩余待付款金额 <= 0 时，触发订单支付完成事件
-   * 
+   *
    * 注意：此方法保持独立性，可以单独调用。
    * 在 updateStateAmountToRemaining 中会使用优化版本。
    */
@@ -2176,7 +2176,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
             this.logInfo("所有支付项均为代金券类型，跳过订单同步");
           }
         }
-        await this.core.effects.emit(import_types.CheckoutHooks.OnOrderPaymentCompleted, {
+        await this.core.effects.emit(`${this.name}:onOrderPaymentCompleted`, {
           orderUuid: this.store.currentOrder.uuid,
           orderId: this.store.currentOrder.order_id,
           totalAmount,
@@ -2325,7 +2325,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       }
     }
     const startTime = Date.now();
-    await this.core.effects.emit(import_types.CheckoutHooks.OnOrderSubmitStart, {
+    await this.core.effects.emit(`${this.name}:onOrderSubmitStart`, {
       orderUuid: this.store.currentOrder.uuid,
       operation: isUpdateOperation ? "update" : "create",
       isManual,
@@ -2348,7 +2348,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       submitSuccess = false;
       submitError = error instanceof Error ? error.message : String(error);
       this.logError("下单接口调用失败:", submitError);
-      await this.core.effects.emit(import_types.CheckoutHooks.OnOrderSyncFailed, {
+      await this.core.effects.emit(`${this.name}:onOrderSyncFailed`, {
         orderUuid: this.store.currentOrder.uuid,
         operation: isUpdateOperation ? "update" : "create",
         isManual,
@@ -2359,7 +2359,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       });
       throw error;
     } finally {
-      await this.core.effects.emit(import_types.CheckoutHooks.OnOrderSubmitEnd, {
+      await this.core.effects.emit(`${this.name}:onOrderSubmitEnd`, {
         success: submitSuccess,
         orderUuid: this.store.currentOrder.uuid,
         operation: isUpdateOperation ? "update" : "create",
@@ -2374,7 +2374,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
     const isSuccessResponse = responseStatus === true || responseStatus === 200 || responseStatus === "success" || responseStatus === 1 && (checkoutResponse == null ? void 0 : checkoutResponse.code) === 200;
     if (!isSuccessResponse) {
       const errorMessage = (checkoutResponse == null ? void 0 : checkoutResponse.message) || "订单同步失败，后端返回非成功状态";
-      await this.core.effects.emit(import_types.CheckoutHooks.OnOrderSyncFailed, {
+      await this.core.effects.emit(`${this.name}:onOrderSyncFailed`, {
         orderUuid: this.store.currentOrder.uuid,
         operation: isUpdateOperation ? "update" : "create",
         isManual,
@@ -2459,7 +2459,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
     }
     this.store.isOrderSynced = true;
     this.clearCalculationCache();
-    await this.core.effects.emit(import_types.CheckoutHooks.OnOrderSynced, {
+    await this.core.effects.emit(`${this.name}:onOrderSynced`, {
       orderUuid: this.store.currentOrder.uuid,
       realOrderId,
       virtualOrderId: this.store.currentOrder.order_id,
@@ -2526,7 +2526,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           if (this.store.localOrderData) {
             this.store.localOrderData.shop_note = note;
           }
-          await this.core.effects.emit(import_types.CheckoutHooks.OnOrderNoteChanged, {
+          await this.core.effects.emit(`${this.name}:onOrderNoteChanged`, {
             orderUuid: this.store.currentOrder.uuid,
             oldNote: previousNote,
             newNote: note,
@@ -2674,7 +2674,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
    * 重置 store 状态
    *
    * 在创建新订单前调用，确保状态完全干净
-   * 
+   *
    * 🚀 性能优化：改为同步方法，事件发射不阻塞主流程
    */
   resetStoreState() {
@@ -2698,7 +2698,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       console.log("[Checkout] Store 状态重置完成");
       if (prevOrderInfo) {
         setTimeout(() => {
-          this.core.effects.emit(import_types.CheckoutHooks.OnOrderCleared, {
+          this.core.effects.emit(`${this.name}:onOrderCleared`, {
             previousOrder: prevOrderInfo,
             timestamp: Date.now()
           });

package/lib/solution/RegisterAndLogin/config.js

@@ -276,7 +276,7 @@ var onlineStoreConfig = {
     url: "/auth/apple/login",
     method: "POST",
     transformParams: (params) => ({
-      token: params.token
+      code: params.code
     })
   }
 };
@@ -526,7 +526,7 @@ var defaultConfig = {
     url: "/auth/apple/login",
     method: "POST",
     transformParams: (params) => ({
-      token: params.token
+      code: params.code
     })
   }
 };

package/lib/solution/RegisterAndLogin/index.js

@@ -1459,7 +1459,8 @@ var RegisterAndLoginImpl = class extends import_BaseModule.BaseModule {
               });
               console.log("[RegisterAndLogin] 调用后端 appleLogin 接口");
               const result = await this.apiCaller.call("appleLogin", {
-                token: authorizationCode || identityToken
+                code: identityToken || authorizationCode,
+                login_channel: this.channel
               });
               console.log("[RegisterAndLogin] appleLogin 接口返回成功", {
                 hasResult: Boolean(result)

package/lib/solution/ShopDiscount/index.js

@@ -34,7 +34,6 @@ __export(ShopDiscount_exports, {
 });
 module.exports = __toCommonJS(ShopDiscount_exports);
 var import_BaseModule = require("../../modules/BaseModule");
-var import_types = require("./types");
 var import_Discount = require("../../modules/Discount");
 var import_Rules = require("../../modules/Rules");
 var import_decimal = __toESM(require("decimal.js"));
@@ -73,7 +72,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     (_a = this.store.discount) == null ? void 0 : _a.destroy();
     (_b = this.store.rules) == null ? void 0 : _b.destroy();
     this.core.effects.offByModuleDestroy(this.name);
-    await this.core.effects.emit(import_types.ShopDiscountHooks.onDestroy, {});
+    await this.core.effects.emit(`${this.name}:onDestroy`, {});
     console.log("[ShopDiscount] 已销毁");
   }
   async clear() {
@@ -123,8 +122,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     this.store.rules = rules;
   }
   registerEventListeners() {
-    this.core.effects.on(
-      import_types.ShopDiscountHooks.onCustomerChange,
+    this.core.effects.only(
+      `${this.name}:onCustomerChange`,
       (customer) => {
         var _a;
         if (((_a = this.options.otherParams) == null ? void 0 : _a.cacheId) && this.getDiscountList().length) {
@@ -146,7 +145,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     if (((_a = this.store.customer) == null ? void 0 : _a.id) !== customer.id) {
       this.store.customer = customer;
       await this.core.effects.emit(
-        import_types.ShopDiscountHooks.onCustomerChange,
+        `${this.name}:onCustomerChange`,
         customer
       );
     }
@@ -234,6 +233,15 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
           isScan: true
         };
       });
+      const currentSelectedDiscountList = this.getDiscountList().filter((n) => n.isSelected);
+      if (currentSelectedDiscountList.length && currentSelectedDiscountList.some((n) => withScanList.some((m) => m.id === n.id))) {
+        return {
+          type: "clientCalc",
+          isAvailable: true,
+          productList: this.store.productList || [],
+          discountList: this.getDiscountList()
+        };
+      }
       const {
         productList: newProductList,
         discountList: newDiscountList,
@@ -292,7 +300,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   // 触发优惠列表变更事件
   async emitDiscountListChange(discountList) {
     await this.core.effects.emit(
-      import_types.ShopDiscountHooks.onDiscountListChange,
+      `${this.name}:onDiscountListChange`,
       discountList
     );
   }
@@ -390,7 +398,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         const { ...customer } = result.data;
         this.setCustomer(customer);
         await this.core.effects.emit(
-          import_types.ShopDiscountHooks.onScanCustomerChange,
+          `${this.name}:onScanCustomerChange`,
           customer
         );
       }
@@ -406,12 +414,12 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       const result = this.calcDiscount(this.store.productList);
       cb == null ? void 0 : cb(result);
       await this.core.effects.emit(
-        import_types.ShopDiscountHooks.onLoadPrepareCalcResult,
+        `${this.name}:onLoadPrepareCalcResult`,
         result
       );
     }
     await this.core.effects.emit(
-      import_types.ShopDiscountHooks.onLoadDiscountList,
+      `${this.name}:onLoadDiscountList`,
       newDiscountList
     );
   }
@@ -437,12 +445,12 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       if ((_d = this.store.productList) == null ? void 0 : _d.length) {
         const result = this.calcDiscount(this.store.productList);
         await this.core.effects.emit(
-          import_types.ShopDiscountHooks.onLoadPrepareCalcResult,
+          `${this.name}:onLoadPrepareCalcResult`,
           result
         );
       }
       await this.core.effects.emit(
-        import_types.ShopDiscountHooks.onLoadDiscountList,
+        `${this.name}:onLoadDiscountList`,
         newDiscountList
       );
     } catch (error) {

package/lib/types/index.d.ts

@@ -40,6 +40,7 @@ export interface PisellCore {
     effects: {
         on: (event: string, callback: (payload: any) => void) => () => void;
         once: (event: string, callback: (payload: any) => void) => () => void;
+        only: (event: string, callback: (payload: any) => void) => () => void;
         off: (event: string, callback: (payload: any) => void) => void;
         emit: (event: string, payload: any, value?: any) => Promise<{
             status: boolean;

package/package.json

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