@pisell/pisellos 2.2.204 → 2.2.205

package/lib/solution/BaseSales/index.js

@@ -84,6 +84,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     this.currentSalesDetail = null;
     this.discountConfigCacheKey = null;
     this.hasManualDiscountSelection = false;
+    this.paymentMethodsCache = [];
   }
   /**
    * 子类可覆盖此方法以追加/收敛要注册的子模块。
@@ -131,6 +132,35 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       });
     }
   }
+  hydrateOrderPaymentNames(payments) {
+    if (!payments.length)
+      return [];
+    if (!this.paymentMethodsCache.length) {
+      return payments.map((payment) => ({ ...payment }));
+    }
+    const paymentMethodById = /* @__PURE__ */ new Map();
+    const paymentMethodByCode = /* @__PURE__ */ new Map();
+    this.paymentMethodsCache.forEach((method) => {
+      if ((method == null ? void 0 : method.id) !== void 0 && (method == null ? void 0 : method.id) !== null) {
+        paymentMethodById.set(String(method.id), method);
+      }
+      if (method == null ? void 0 : method.code) {
+        paymentMethodByCode.set(String(method.code), method);
+      }
+    });
+    return payments.map((payment) => {
+      const nextPayment = { ...payment };
+      if (nextPayment.name)
+        return nextPayment;
+      const paymentMethod = paymentMethodById.get(String(nextPayment.custom_payment_id)) || paymentMethodByCode.get(String(nextPayment.code));
+      if (!(paymentMethod == null ? void 0 : paymentMethod.name))
+        return nextPayment;
+      return {
+        ...nextPayment,
+        name: paymentMethod.name
+      };
+    });
+  }
   get payment() {
     return this.store.payment;
   }
@@ -435,6 +465,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         this.otherParams.enableTempOrderPersist
       );
     }
+    await this.getPaymentMethodsAsync();
     this.core.effects.emit(`${this.name}:onInited`, {});
   }
   async destroy() {
@@ -1226,7 +1257,8 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   getOrderPayments() {
     if (!this.store.order)
       return [];
-    return this.store.order.getOrderPayments();
+    const payments = this.store.order.getOrderPayments();
+    return this.hydrateOrderPaymentNames(payments);
   }
   /** 覆盖当前订单支付项，内部由 OrderModule 清洗为 Sales 协议字段。 */
   setOrderPayments(payments) {
@@ -1408,11 +1440,25 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   }
   /** 获取可用支付方式列表，供 PaymentModal 渲染支付选项。 */
   async getPaymentMethodsAsync() {
-    if (this.store.payment) {
-      return this.store.payment.getPayMethodListAsync();
+    try {
+      const response = await this.request.get("/pay/custom-payment/all", {
+        filterPaymentMethods: true
+      }, {
+        osServer: true
+      });
+      const paymentMethods = (response == null ? void 0 : response.data) || [];
+      this.paymentMethodsCache = Array.isArray(paymentMethods) ? [...paymentMethods] : [];
+      return this.getPaymentMethods();
+    } catch (error) {
+      this.logWarning("getPaymentMethodsAsync: 获取支付方式列表失败，使用缓存列表", {
+        error: error instanceof Error ? error.message : String(error)
+      });
+      return this.getPaymentMethods();
     }
-    const response = await this.request.get("/pay/custom-payment/all");
-    return (response == null ? void 0 : response.data) || [];
+  }
+  /** 同步读取初始化时缓存的支付方式列表。 */
+  getPaymentMethods() {
+    return [...this.paymentMethodsCache];
   }
   /** 轻量舍入能力，供现金支付 UI 计算 rounding_amount。 */
   roundAmount(params) {

package/lib/solution/BookingTicket/index.js

@@ -104,7 +104,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
   }
   async initialize(core, options = {}) {
     var _a;
-    this.scan = new import_scan.default(this, "BOOKING_TICKET_SCAN");
+    this.scan = new import_scan.default(this, `BOOKING_TICKET_SCAN:${this.name}`);
     await super.initialize(core, options);
     if (!this.request) {
       throw new Error("bookingTicket解决方案需要 request 插件支持");

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

@@ -91,7 +91,6 @@ async function runAddProductDecision(host, catalogItem, decision, ctx, bridge) {
 async function applyGlobalScan(host, formatted, bridge) {
   var _a, _b, _c, _d, _e, _f, _g;
   const { searchType, data, scanCode } = formatted;
-  debugger;
   if (searchType === "wallet") {
     if (!data) {
       (_a = bridge == null ? void 0 : bridge.onNotify) == null ? void 0 : _a.call(bridge, "fail", "pisell2.text.scan-global-failed");
@@ -157,7 +156,7 @@ async function applyGlobalScan(host, formatted, bridge) {
     }
     bridge.openOrder({
       order_id: Number(orderId),
-      business_code: host.getBusinessCode()
+      business_code: (data == null ? void 0 : data.business_code) ?? host.getBusinessCode()
     });
     return { status: "pending", kind: "openOrder" };
   }

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

@@ -14,12 +14,17 @@ declare enum ScanResultType {
     NativeScanner = "nativeScanner"
 }
 export default class Scan {
+    private static scanInstances;
+    private static peripheralsListenerMounted;
     private solution;
     private watchKey;
     private listenerConfig;
     constructor(solution: BookingTicketImpl, watchKey: string);
     /**
      * 初始化外设扫码结果监听
+     *
+     * @example
+     * scan.initPeripheralsListener();
      */
     initPeripheralsListener(): void;
     /**

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

@@ -34,17 +34,24 @@ __export(scan_exports, {
 module.exports = __toCommonJS(scan_exports);
 var import_watch = __toESM(require("../../../../utils/watch"));
 var import_task = __toESM(require("../../../../utils/task"));
-var Scan = class {
+var _Scan = class {
   constructor(solution, watchKey) {
     this.listenerConfig = /* @__PURE__ */ new Map();
     this.solution = solution;
     this.watchKey = watchKey;
+    _Scan.scanInstances.add(this);
   }
   /**
    * 初始化外设扫码结果监听
+   *
+   * @example
+   * scan.initPeripheralsListener();
    */
   initPeripheralsListener() {
     var _a, _b, _c, _d, _e;
+    if (_Scan.peripheralsListenerMounted)
+      return;
+    _Scan.peripheralsListenerMounted = true;
     (_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",
@@ -53,7 +60,9 @@ var Scan = class {
         try {
           const result = JSON.parse(strVal);
           console.log("nativeScannerResult>>>>>>>", result);
-          this.handleScan(result);
+          _Scan.scanInstances.forEach((instance) => {
+            instance.handleScan(result);
+          });
         } catch (err) {
           console.error(err);
         }
@@ -70,8 +79,9 @@ var Scan = class {
     if (lastEnableEventKey) {
       const listenerConfig = this.listenerConfig.get(lastEnableEventKey);
       if (listenerConfig) {
+        const taskUuid = this.generateUuid();
         listenerConfig.task.addTask({
-          uuid: this.generateUuid(),
+          uuid: taskUuid,
           type: lastEnableEventKey,
           actionParams: {
             scanResult: result
@@ -122,6 +132,7 @@ var Scan = class {
    */
   removeAllListeners() {
     var _a, _b, _c, _d;
+    _Scan.scanInstances.delete(this);
     import_watch.default.clearEvent(this.watchKey);
     (_b = (_a = this.listenerConfig) == null ? void 0 : _a.forEach) == null ? void 0 : _b.call(_a, (item) => {
       var _a2;
@@ -213,3 +224,6 @@ var Scan = class {
     }
   }
 };
+var Scan = _Scan;
+Scan.scanInstances = /* @__PURE__ */ new Set();
+Scan.peripheralsListenerMounted = false;

package/package.json

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