@pisell/pisellos 2.2.224 → 2.2.226

package/dist/solution/BaseSales/utils/cartPromotion.js

@@ -419,7 +419,9 @@ function getProductLineNoteSignature(product) {
   var note = product === null || product === void 0 ? void 0 : product.note;
   if (typeof note !== 'string') return '';
   var normalizedNote = note.trim();
-  return normalizedNote ? "note:".concat(normalizedNote) : '';
+  if (!normalizedNote) return '';
+  var uid = getOrderProductUid(product);
+  return uid ? "note:".concat(uid) : "note:".concat(normalizedNote);
 }
 function isPersistedGeneratedVoucher(product) {
   var _product$order_detail;

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

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

@@ -312,7 +312,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/BookingTicket/index.js

@@ -300,7 +300,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               console.warn('[BookingTicket] idGenerator 插件不可用，跳过配置');
               return _context4.abrupt("return");
             case 15:
-              receiptSequenceLength = this.normalizePositiveInteger((_openDataConfig = openDataConfig) === null || _openDataConfig === void 0 ? void 0 : _openDataConfig['sale.short_number_digits'], 2);
+              receiptSequenceLength = this.normalizePositiveInteger((_openDataConfig = openDataConfig) === null || _openDataConfig === void 0 ? void 0 : _openDataConfig['sale.short_number_digits'], 5);
               receiptSequenceStart = this.normalizePositiveInteger((_openDataConfig2 = openDataConfig) === null || _openDataConfig2 === void 0 ? void 0 : _openDataConfig2['sale.short_number_start_number'], 1);
               prefix = this.normalizeIdPrefix((_openDataConfig3 = openDataConfig) === null || _openDataConfig3 === void 0 ? void 0 : _openDataConfig3['sale.short_number_prefix'], '');
               shopOrderPrefix = this.normalizeIdPrefix((_openDataConfig4 = openDataConfig) === null || _openDataConfig4 === void 0 ? void 0 : _openDataConfig4['sale.sale_number_prefix'], '');
@@ -318,7 +318,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                   prefix: prefix,
                   deviceCode: deviceId,
                   // TODO 现在 picoding 没这个配置的 key
-                  padReceiptSequence: true,
+                  padReceiptSequence: false,
                   receiptSequenceLength: receiptSequenceLength,
                   resetReceiptSequenceDaily: resetReceiptSequenceDaily,
                   receiptSequenceResetTime: operatingDayBoundary.time,

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/Order/index.d.ts

@@ -294,6 +294,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      */
     updateVoucherOrderPayments(payments: OrderPaymentSource[]): OrderPaymentData[];
     private shouldMergeProductToOrder;
+    private hasOrderProductLineNote;
     /**
      * 预约商品加车后的统一收尾：促销、折扣、summary 重算与持久化（批量拆行时只调用一次）。
      *

package/lib/modules/Order/index.js

@@ -2109,6 +2109,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
     return true;
   }
+  hasOrderProductLineNote(product) {
+    return typeof (product == null ? void 0 : product.note) === "string" && product.note.trim().length > 0;
+  }
   // ─── TempOrder: 商品 CRUD ───
   /**
    * 预约商品加车后的统一收尾：促销、折扣、summary 重算与持久化（批量拆行时只调用一次）。
@@ -2150,11 +2153,13 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const hasIncomingGoodPass = this.hasGoodPassDiscount(
       normalizedIncoming
     );
-    const hasIncomingProductNote = typeof normalizedIncoming.note === "string" && normalizedIncoming.note.trim().length > 0;
+    const hasIncomingProductNote = this.hasOrderProductLineNote(normalizedIncoming);
     const shouldForceNewLine = !!booking || hasIncomingProductNote;
     const matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex((item) => {
       if (this.hasGoodPassDiscount(item))
         return false;
+      if (this.hasOrderProductLineNote(item))
+        return false;
       if (item.order_detail_id !== void 0 && item.order_detail_id !== null)
         return false;
       if (item.product_id !== productToAdd.product_id)

package/lib/server/index.d.ts

@@ -388,6 +388,9 @@ declare class Server {
     private taskTimeout;
     private getShortNumberOrDeviceId;
     private buildCheckoutTaskIdempotencyKey;
+    private isBlankCheckoutValue;
+    private isLocalCheckoutOrderId;
+    private normalizeCheckoutSubmitData;
     private ensureCheckoutOrderNumbers;
     private dispatchCheckoutSyncTask;
     private dispatchPrintOtherReceiptTask;
@@ -453,6 +456,9 @@ declare class Server {
     private isMergeableCheckoutOrder;
     private normalizeCheckoutResponse;
     private isCheckoutResponseRejected;
+    private getUnknownErrorMessage;
+    private normalizeUnknownError;
+    private safeJsonClone;
     private extractBackendErrorResponse;
     private isExplicitBackendErrorResponse;
     /**

package/lib/server/index.js

@@ -1249,10 +1249,11 @@ var Server = class {
         });
         return this.taskFail("BACKEND_REJECTED", message, backendError);
       }
-      const errorMessage = error instanceof Error ? error.message : String(error);
+      const errorMessage = this.getUnknownErrorMessage(error);
       this.logError(`${title}: sync_sales 请求未明确成功`, {
         backendPath,
-        error: errorMessage
+        error: errorMessage,
+        error_detail: this.normalizeUnknownError(error)
       });
       return this.taskTimeout(errorMessage);
     }
@@ -2358,6 +2359,74 @@ var Server = class {
       return void 0;
     return `sync_sales:${identity}`;
   }
+  isBlankCheckoutValue(value) {
+    return value === void 0 || value === null || value === "";
+  }
+  isLocalCheckoutOrderId(orderId) {
+    return typeof orderId === "string" && orderId.startsWith("LOCAL_");
+  }
+  async normalizeCheckoutSubmitData(data, title) {
+    if (!data || typeof data !== "object")
+      return data;
+    const next = { ...data };
+    const externalSaleNumber = next.external_sale_number;
+    const shouldClearLocalOrderId = this.isLocalCheckoutOrderId(next.order_id);
+    if (shouldClearLocalOrderId)
+      next.order_id = null;
+    if (this.isBlankCheckoutValue(externalSaleNumber)) {
+      if (shouldClearLocalOrderId) {
+        this.logInfo(`${title}: checkout 本地订单号已清理`, {
+          original_order_id: data.order_id,
+          order_id: next.order_id
+        });
+      }
+      return next;
+    }
+    if (!this.order || typeof this.order.getLocalOrderByLookup !== "function") {
+      if (shouldClearLocalOrderId) {
+        this.logInfo(`${title}: checkout 本地订单号已清理`, {
+          original_order_id: data.order_id,
+          external_sale_number: externalSaleNumber
+        });
+      }
+      return next;
+    }
+    try {
+      const localOrder = await this.order.getLocalOrderByLookup(externalSaleNumber);
+      if (!localOrder) {
+        if (shouldClearLocalOrderId) {
+          this.logInfo(`${title}: checkout 本地订单号已清理`, {
+            original_order_id: data.order_id,
+            external_sale_number: externalSaleNumber,
+            localOrderFound: false
+          });
+        }
+        return next;
+      }
+      if (this.isBlankCheckoutValue(next.shop_order_number)) {
+        next.shop_order_number = localOrder.shop_order_number;
+      }
+      if (this.isBlankCheckoutValue(next.shop_full_order_number)) {
+        next.shop_full_order_number = localOrder.shop_full_order_number;
+      }
+      this.logInfo(`${title}: checkout 已复用本地订单号`, {
+        original_order_id: data.order_id,
+        order_id: next.order_id,
+        external_sale_number: externalSaleNumber,
+        local_order_id: localOrder.order_id,
+        shop_order_number: next.shop_order_number,
+        shop_full_order_number: next.shop_full_order_number
+      });
+      return next;
+    } catch (error) {
+      this.logWarning(`${title}: checkout 查找本地订单失败`, {
+        external_sale_number: externalSaleNumber,
+        error: this.getUnknownErrorMessage(error),
+        error_detail: this.normalizeUnknownError(error)
+      });
+      return next;
+    }
+  }
   async ensureCheckoutOrderNumbers(data, title) {
     if (!data || typeof data !== "object")
       return data;
@@ -2523,7 +2592,8 @@ var Server = class {
       external_sale_number: data == null ? void 0 : data.external_sale_number,
       order_number: data == null ? void 0 : data.order_number
     });
-    const checkoutData = await this.ensureCheckoutOrderNumbers(data, title);
+    const normalizedData = await this.normalizeCheckoutSubmitData(data, title);
+    const checkoutData = await this.ensureCheckoutOrderNumbers(normalizedData, title);
     const pendingResult = await this.handlePendingSyncCheckoutOrder({
       backendPath,
       data: checkoutData,
@@ -3143,6 +3213,69 @@ var Server = class {
     const isErrorSuccess = (normalized == null ? void 0 : normalized.success) === false;
     return isErrorCode || isErrorStatus || isErrorSuccess;
   }
+  getUnknownErrorMessage(error) {
+    var _a, _b, _c, _d, _e, _f;
+    if (error instanceof Error && error.message)
+      return error.message;
+    if (typeof error === "string")
+      return error;
+    const candidates = [
+      error == null ? void 0 : error.message,
+      (_b = (_a = error == null ? void 0 : error.response) == null ? void 0 : _a.data) == null ? void 0 : _b.message,
+      (_c = error == null ? void 0 : error.data) == null ? void 0 : _c.message,
+      (_e = (_d = error == null ? void 0 : error.response) == null ? void 0 : _d.body) == null ? void 0 : _e.message,
+      (_f = error == null ? void 0 : error.body) == null ? void 0 : _f.message
+    ];
+    const message = candidates.find((candidate) => typeof candidate === "string" && candidate !== "");
+    if (message)
+      return message;
+    const normalized = this.normalizeUnknownError(error);
+    if (typeof normalized === "string")
+      return normalized;
+    try {
+      return JSON.stringify(normalized);
+    } catch {
+      return String(error);
+    }
+  }
+  normalizeUnknownError(error) {
+    var _a, _b;
+    if (error instanceof Error) {
+      const normalized = {
+        name: error.name,
+        message: error.message,
+        stack: error.stack
+      };
+      const record = error;
+      if (((_a = record.response) == null ? void 0 : _a.data) !== void 0)
+        normalized.responseData = record.response.data;
+      if (record.data !== void 0)
+        normalized.data = record.data;
+      if (((_b = record.response) == null ? void 0 : _b.body) !== void 0)
+        normalized.responseBody = record.response.body;
+      if (record.body !== void 0)
+        normalized.body = record.body;
+      return this.safeJsonClone(normalized);
+    }
+    if (!error || typeof error !== "object")
+      return String(error);
+    return this.safeJsonClone(error);
+  }
+  safeJsonClone(value) {
+    const seen = /* @__PURE__ */ new WeakSet();
+    try {
+      return JSON.parse(JSON.stringify(value, (_key, current) => {
+        if (!current || typeof current !== "object")
+          return current;
+        if (seen.has(current))
+          return "[Circular]";
+        seen.add(current);
+        return current;
+      }));
+    } catch {
+      return String(value);
+    }
+  }
   extractBackendErrorResponse(error) {
     var _a, _b;
     const candidates = [

package/lib/solution/BaseSales/utils/cartPromotion.js

@@ -324,7 +324,10 @@ function getProductLineNoteSignature(product) {
   if (typeof note !== "string")
     return "";
   const normalizedNote = note.trim();
-  return normalizedNote ? `note:${normalizedNote}` : "";
+  if (!normalizedNote)
+    return "";
+  const uid = getOrderProductUid(product);
+  return uid ? `note:${uid}` : `note:${normalizedNote}`;
 }
 function isPersistedGeneratedVoucher(product) {
   const orderDetailId = (product == null ? void 0 : product.order_detail_id) ?? (product == null ? void 0 : product.orderDetailId);

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

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

@@ -312,7 +312,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

@@ -185,7 +185,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     }
     const receiptSequenceLength = this.normalizePositiveInteger(
       openDataConfig == null ? void 0 : openDataConfig["sale.short_number_digits"],
-      2
+      5
     );
     const receiptSequenceStart = this.normalizePositiveInteger(
       openDataConfig == null ? void 0 : openDataConfig["sale.short_number_start_number"],
@@ -209,7 +209,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
           prefix,
           deviceCode: deviceId,
           // TODO 现在 picoding 没这个配置的 key
-          padReceiptSequence: true,
+          padReceiptSequence: false,
           receiptSequenceLength,
           resetReceiptSequenceDaily,
           receiptSequenceResetTime: operatingDayBoundary.time,

package/package.json

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