@pisell/pisellos 2.2.207 → 2.2.209

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

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

@@ -381,7 +381,7 @@ declare class Server {
     private taskOk;
     private taskFail;
     private taskTimeout;
-    private resolveCheckoutTaskDeviceId;
+    private getShortNumberOrDeviceId;
     private buildCheckoutTaskIdempotencyKey;
     private ensureCheckoutOrderNumbers;
     private dispatchCheckoutSyncTask;

package/lib/server/index.js

@@ -2181,7 +2181,6 @@ var Server = class {
   }
   getSmallTicketShopInfo() {
     const shopInfo = this.getAppData("shop_info") || {};
-    debugger;
     return {
       ...shopInfo,
       currency_symbol: shopInfo.currency_symbol || this.getAppData("shop_symbol") || this.getAppData("currency_symbol"),
@@ -2207,7 +2206,14 @@ var Server = class {
       error: { code: "TIMEOUT", message }
     };
   }
-  resolveCheckoutTaskDeviceId(_data) {
+  async getShortNumberOrDeviceId() {
+    const getAsyncIotDeviceInfo = this.getAppData("async_iot_device_info");
+    if (getAsyncIotDeviceInfo) {
+      const res = await (getAsyncIotDeviceInfo == null ? void 0 : getAsyncIotDeviceInfo());
+      if (res.short_number) {
+        return res.short_number;
+      }
+    }
     return this.getAppData("device_id") || 0;
   }
   buildCheckoutTaskIdempotencyKey(data) {
@@ -2258,7 +2264,7 @@ var Server = class {
     var _a, _b, _c;
     this.registerDeviceTaskActions();
     const deviceTask = this.getDeviceTaskPlugin();
-    const debugDeviceId = this.resolveCheckoutTaskDeviceId(params.data);
+    const debugDeviceId = await this.getShortNumberOrDeviceId();
     const debugIdempotencyKey = this.buildCheckoutTaskIdempotencyKey(params.data);
     if (!(deviceTask == null ? void 0 : deviceTask.dispatch)) {
       this.logError(`${params.title}: deviceTask.dispatch 不可用`);
@@ -2300,9 +2306,10 @@ var Server = class {
     }
     try {
       const printIdentity = this.getPrintOrderIdentity(params.syncedOrder);
+      const deviceId = await this.getShortNumberOrDeviceId();
       await deviceTask.dispatch({
         action: "print_all",
-        device_id: params.deviceId ?? this.resolveCheckoutTaskDeviceId(params.checkoutData),
+        device_id: params.deviceId ?? deviceId,
         payload: {
           type: params.receiptOnly ? "0" : "99",
           data: params.receiptOnly ? {

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

@@ -43,6 +43,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     private getBookingTicketBusinessCode;
     private getIdGeneratorPlugin;
     private loadOpenDataConfig;
+    private getShortNumberOrDeviceId;
     private configureIdGeneratorFromOpenData;
     private normalizePositiveInteger;
     private normalizeIdPrefix;

package/lib/solution/BookingTicket/index.js

@@ -160,6 +160,16 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
       this.loadOpenDataConfigInFlight = null;
     }
   }
+  async getShortNumberOrDeviceId() {
+    const getAsyncIotDeviceInfo = this.getAppData("async_iot_device_info");
+    if (getAsyncIotDeviceInfo) {
+      const res = await (getAsyncIotDeviceInfo == null ? void 0 : getAsyncIotDeviceInfo());
+      if (res.short_number) {
+        return res.short_number;
+      }
+    }
+    return this.getAppData("device_id") || 0;
+  }
   async configureIdGeneratorFromOpenData() {
     let openDataConfig = null;
     try {
@@ -168,33 +178,32 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
       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"],
+      openDataConfig == null ? void 0 : openDataConfig["sale.short_number_digits"],
       5
     );
     const receiptSequenceStart = this.normalizePositiveInteger(
-      openDataConfig["sale.short_number_start_number"],
+      openDataConfig == null ? void 0 : openDataConfig["sale.short_number_start_number"],
       1
     );
     const prefix = this.normalizeIdPrefix(
-      openDataConfig["sale.short_number_prefix"],
+      openDataConfig == null ? void 0 : openDataConfig["sale.short_number_prefix"],
       "R"
     );
-    const resetReceiptSequenceDaily = typeof openDataConfig["sale.short_number_daily_reset"] === "boolean" ? openDataConfig["sale.short_number_daily_reset"] : true;
+    const resetReceiptSequenceDaily = typeof (openDataConfig == null ? void 0 : openDataConfig["sale.short_number_daily_reset"]) === "boolean" ? openDataConfig == null ? void 0 : openDataConfig["sale.short_number_daily_reset"] : true;
     const operatingDayBoundary = this.getAppData("operating_day_boundary");
+    const deviceId = await this.getShortNumberOrDeviceId();
     try {
       await idGenerator.configure({
-        biz: "ticket",
+        biz: this.getBookingTicketBusinessCode() || "ticket",
         config: {
           prefix,
-          deviceCode: this.getAppData("device_id") || 0,
+          deviceCode: deviceId,
           // TODO 现在 picoding 没这个配置的 key
           padReceiptSequence: true,
           receiptSequenceLength,

package/package.json

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