@pisell/pisellos 2.2.204 → 2.2.206

package/lib/solution/BaseSales/index.js

@@ -37,6 +37,7 @@ var import_BaseModule = require("../../modules/BaseModule");
 var import_types = require("./types");
 var import_Order = require("../../modules/Order");
 var import_decimal = __toESM(require("decimal.js"));
+var import_lodash_es = require("lodash-es");
 var import_types2 = require("../BookingByStep/types");
 var import_utils = require("../../modules/Order/utils");
 var import_dayjs = __toESM(require("dayjs"));
@@ -69,6 +70,28 @@ function preserveManualProductDiscountProducts(previousProducts, nextProducts) {
     return previous && isBaseSalesManualProductDiscountProduct(previous) ? previous : product;
   });
 }
+function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord) {
+  if (!currentTempOrder)
+    return loadedRecord;
+  return (0, import_lodash_es.mergeWith)(
+    (0, import_lodash_es.cloneDeep)(currentTempOrder),
+    (0, import_lodash_es.cloneDeep)(loadedRecord || {}),
+    (currentValue, loadedValue) => {
+      if (Array.isArray(currentValue) && Array.isArray(loadedValue)) {
+        return [
+          ...(0, import_lodash_es.cloneDeep)(currentValue),
+          ...(0, import_lodash_es.cloneDeep)(loadedValue)
+        ];
+      }
+      if (Array.isArray(loadedValue))
+        return (0, import_lodash_es.cloneDeep)(loadedValue);
+      if (Array.isArray(currentValue) && loadedValue === void 0) {
+        return (0, import_lodash_es.cloneDeep)(currentValue);
+      }
+      return void 0;
+    }
+  );
+}
 var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -84,6 +107,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     this.currentSalesDetail = null;
     this.discountConfigCacheKey = null;
     this.hasManualDiscountSelection = false;
+    this.paymentMethodsCache = [];
   }
   /**
    * 子类可覆盖此方法以追加/收敛要注册的子模块。
@@ -131,6 +155,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 +488,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         this.otherParams.enableTempOrderPersist
       );
     }
+    await this.getPaymentMethodsAsync();
     this.core.effects.emit(`${this.name}:onInited`, {});
   }
   async destroy() {
@@ -476,7 +530,9 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       const message = res && (res.message || res.msg) || `加载销售详情失败: ${lookup}`;
       throw new Error(message);
     }
-    const sales = await this.store.order.hydrateTempOrderFromRecord(res.data, { recalcOnHydrate: false });
+    const currentTempOrder = params.merge ? this.store.order.getTempOrder() : null;
+    const record = params.merge ? mergeSalesDetailRecordWithTempOrder(currentTempOrder, res.data) : res.data;
+    const sales = await this.store.order.hydrateTempOrderFromRecord(record, { recalcOnHydrate: false });
     this.currentSalesDetail = sales;
     await this.core.effects.emit(`${this.name}:onSalesOrderLoaded`, { sales });
     return sales;
@@ -1164,6 +1220,26 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     };
     return this.store.order.submitTempOrder(submitParams);
   }
+  async printLocalOrderReceipt() {
+    var _a, _b, _c, _d, _e, _f, _g;
+    if (!this.store.order) {
+      throw new Error("BaseSales 解决方案需要 order 模块支持");
+    }
+    const payload = this.store.order.buildCurrentSubmitPayloadForLocalPrint({
+      cacheId: this.cacheId,
+      platform: (_a = this.otherParams) == null ? void 0 : _a.platform,
+      businessCode: ((_b = this.otherParams) == null ? void 0 : _b.businessCode) || ((_c = this.otherParams) == null ? void 0 : _c.business_code),
+      channel: this.getSubmitOrderSalesChannel(),
+      type: (_d = this.otherParams) == null ? void 0 : _d.type
+    });
+    const response = await this.request.post("/local/print-order", payload, {
+      osServer: true,
+      customToast: () => {
+      }
+    });
+    await ((_g = (_f = this.store.order).applyLocalPrintOrderNumbers) == null ? void 0 : _g.call(_f, (_e = response == null ? void 0 : response.data) == null ? void 0 : _e.order));
+    return response;
+  }
   getSubmitPaymentStatus(paymentStatus) {
     var _a, _b;
     if (paymentStatus !== void 0)
@@ -1226,7 +1302,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) {
@@ -1273,6 +1350,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
           error: error instanceof Error ? error.message : String(error)
         });
       });
+    } else {
     }
     return payments;
   }
@@ -1408,11 +1486,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/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 | 5 | 3 | 4 | 6;
+        weekNum: 0 | 1 | 2 | 5 | 3 | 6 | 4;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -27,6 +27,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     private productCatalog;
     private orderCustomerDiscountRefreshInFlight;
     private orderCustomerDiscountRefreshCustomerId;
+    private loadOpenDataConfigInFlight;
     /**
      * 在 BaseSales 默认模块清单（products/order/salesSummary/schedule）基础上追加 customer + bookingContext。
      * bookingContext 是 SalesSdk 加车下沉所需的「预约 UI 上下文」（bookingConfig / resourcesOrigin / date）。
@@ -39,6 +40,12 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      */
     protected createSubModule(moduleName: string): Module | null;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
+    private getBookingTicketBusinessCode;
+    private getIdGeneratorPlugin;
+    private loadOpenDataConfig;
+    private configureIdGeneratorFromOpenData;
+    private normalizePositiveInteger;
+    private normalizeIdPrefix;
     /**
      * 加载销售详情，并在父类基础上把 customer 信息装配到 CustomerModule。
      *
@@ -302,7 +309,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/BookingTicket/index.js

@@ -51,6 +51,8 @@ var import_buildNormalProductCacheItemFromOrderLine = require("../../modules/Boo
 var import_orderLineDisplay = require("../../modules/BookingContext/utils/orderLineDisplay");
 var import_bookingStatus = require("./utils/bookingStatus");
 __reExport(BookingTicket_exports, require("./types"), module.exports);
+var OPEN_DATA_SECTION_CODES = ["sale", "reservation", "fulfillment", "menu", "workflow"];
+var OPEN_DATA_CACHE_TTL = 5 * 60 * 1e3;
 function withProductOptionString(cacheItem) {
   var _a;
   const productOptionString = (0, import_orderLineDisplay.buildProductOptionStringFromOrderLine)(cacheItem);
@@ -78,13 +80,14 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     this.productCatalog = [];
     this.orderCustomerDiscountRefreshInFlight = null;
     this.orderCustomerDiscountRefreshCustomerId = null;
+    this.loadOpenDataConfigInFlight = null;
   }
   /**
    * 在 BaseSales 默认模块清单（products/order/salesSummary/schedule）基础上追加 customer + bookingContext。
    * bookingContext 是 SalesSdk 加车下沉所需的「预约 UI 上下文」（bookingConfig / resourcesOrigin / date）。
    */
   getRegisteredModuleNames() {
-    return [...super.getRegisteredModuleNames(), "customer", "bookingContext"];
+    return [...super.getRegisteredModuleNames(), "customer", "bookingContext", "openData"];
   }
   getSubmitOrderSalesChannel() {
     return "pos";
@@ -104,14 +107,118 @@ 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 插件支持");
     }
     this.platform = (_a = this.otherParams) == null ? void 0 : _a.platform;
+    await this.configureIdGeneratorFromOpenData();
     console.log("[BookingTicket] 初始化完成");
   }
+  getBookingTicketBusinessCode() {
+    var _a, _b;
+    const businessCode = ((_a = this.otherParams) == null ? void 0 : _a.businessCode) ?? ((_b = this.otherParams) == null ? void 0 : _b.business_code);
+    if (businessCode === void 0 || businessCode === null)
+      return null;
+    const normalized = String(businessCode).trim();
+    return normalized || null;
+  }
+  getIdGeneratorPlugin() {
+    var _a, _b;
+    const appPlugin = this.core.getPlugin("app");
+    const app = (_a = appPlugin == null ? void 0 : appPlugin.getApp) == null ? void 0 : _a.call(appPlugin);
+    return ((_b = app == null ? void 0 : app.getPlugin) == null ? void 0 : _b.call(app, "idGenerator")) || null;
+  }
+  async loadOpenDataConfig() {
+    if (!this.store.openData)
+      throw new Error("openData 模块未初始化");
+    const businessCode = this.getBookingTicketBusinessCode();
+    if (!businessCode) {
+      console.warn("[BookingTicket] businessCode 缺失，跳过 OpenData 配置加载");
+      return null;
+    }
+    const lastFetchedAt = this.store.openData.getLastFetchedAt();
+    const cachedData = this.store.openData.getOpenData();
+    if (cachedData && lastFetchedAt && Date.now() - lastFetchedAt < OPEN_DATA_CACHE_TTL) {
+      this.otherParams.openData = cachedData;
+      return cachedData;
+    }
+    if (this.loadOpenDataConfigInFlight)
+      return await this.loadOpenDataConfigInFlight;
+    this.loadOpenDataConfigInFlight = this.store.openData.fetchOpenData({
+      scope: "board",
+      target: `${businessCode}+pos`,
+      // target: `dine_in+pos`,
+      section_code: [...OPEN_DATA_SECTION_CODES]
+    });
+    try {
+      const openDataConfig = await this.loadOpenDataConfigInFlight;
+      this.otherParams.openData = openDataConfig;
+      return openDataConfig;
+    } finally {
+      this.loadOpenDataConfigInFlight = null;
+    }
+  }
+  async configureIdGeneratorFromOpenData() {
+    let openDataConfig = null;
+    try {
+      openDataConfig = await this.loadOpenDataConfig();
+    } catch (error) {
+      console.warn("[BookingTicket] OpenData 配置加载失败，跳过 idGenerator 配置", error);
+      return;
+    }
+    if (!openDataConfig)
+      return;
+    const idGenerator = this.getIdGeneratorPlugin();
+    if (!(idGenerator == null ? void 0 : idGenerator.configure)) {
+      console.warn("[BookingTicket] idGenerator 插件不可用，跳过配置");
+      return;
+    }
+    const receiptSequenceLength = this.normalizePositiveInteger(
+      openDataConfig["sale.short_number_digits"],
+      5
+    );
+    const receiptSequenceStart = this.normalizePositiveInteger(
+      openDataConfig["sale.short_number_start_number"],
+      1
+    );
+    const prefix = this.normalizeIdPrefix(
+      openDataConfig["sale.short_number_prefix"],
+      "R"
+    );
+    const resetReceiptSequenceDaily = typeof openDataConfig["sale.short_number_daily_reset"] === "boolean" ? openDataConfig["sale.short_number_daily_reset"] : true;
+    const operatingDayBoundary = this.getAppData("operating_day_boundary");
+    try {
+      await idGenerator.configure({
+        biz: "ticket",
+        config: {
+          prefix,
+          deviceCode: this.getAppData("device_id") || 0,
+          // TODO 现在 picoding 没这个配置的 key
+          padReceiptSequence: true,
+          receiptSequenceLength,
+          resetReceiptSequenceDaily,
+          receiptSequenceResetTime: operatingDayBoundary.time,
+          receiptSequenceStart
+        }
+      });
+    } catch (error) {
+      console.warn("[BookingTicket] idGenerator 配置失败", error);
+    }
+  }
+  normalizePositiveInteger(value, fallback) {
+    const numeric = Number(value);
+    if (!Number.isInteger(numeric) || numeric <= 0)
+      return fallback;
+    return numeric;
+  }
+  normalizeIdPrefix(value, fallback) {
+    if (value === void 0 || value === null)
+      return fallback;
+    const normalized = String(value).trim().toUpperCase();
+    return normalized || fallback;
+  }
   /**
    * 加载销售详情，并在父类基础上把 customer 信息装配到 CustomerModule。
    *

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

@@ -1,4 +1,4 @@
-import { ProductList, OrderModule } from '../../modules';
+import { ProductList, OrderModule, OpenDataModule } from '../../modules';
 import { BookingContextModule } from '../../modules/BookingContext';
 import { CustomerModule } from '../../modules/Customer';
 import { SalesSummaryModule } from '../../modules/SalesSummary';
@@ -18,6 +18,7 @@ export interface BookingTicketState extends BaseSalesState {
     schedule: ScheduleModule;
     customer: CustomerModule;
     bookingContext: BookingContextModule;
+    openData: OpenDataModule;
 }
 export declare function createBookingTicketModule<T extends keyof BookingTicketState>(moduleName: T, solutionName: string, name?: string, version?: string): BookingTicketState[T] | null;
 export declare enum BookingTicketHooks {

package/lib/solution/BookingTicket/types.js

@@ -60,6 +60,11 @@ function createBookingTicketModule(moduleName, solutionName, name, version) {
         `${solutionName}_${name || moduleName}`,
         version
       );
+    case "openData":
+      return new import_modules.OpenDataModule(
+        `${solutionName}_${name || moduleName}`,
+        version
+      );
     default:
       return null;
   }

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