@pisell/pisellos 2.3.29 → 2.3.30

package/lib/solution/BaseSales/index.js

@@ -40,6 +40,8 @@ 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_payment_utils = require("../../modules/Order/payment-utils");
+var import_payment_number = require("../../utils/payment-number");
 var import_orderCollectionIdentity = require("../../modules/Order/utils/orderCollectionIdentity");
 var import_dayjs = __toESM(require("dayjs"));
 __reExport(BaseSales_exports, require("./types"), module.exports);
@@ -77,6 +79,11 @@ function isBaseSalesHistoricalDiscountEntry(discount) {
     (discount == null ? void 0 : discount.isEditMode) || (discount == null ? void 0 : discount.isDisabled) || (discount == null ? void 0 : discount.order_discount_id) != null
   );
 }
+function getBaseSalesUniqueArrayMetadataKey(key) {
+  if (key === "products" || key === "bookings")
+    return "unique_identification_number";
+  return null;
+}
 var BASE_SALES_PERSISTENT_ID_FIELD_BY_KIND = {
   product: "order_detail_id",
   booking: "schedule_event_id",
@@ -209,6 +216,35 @@ function normalizeBaseSalesRecordCollections(sourceRecord, options) {
   }
   return normalizedRecord;
 }
+function getBaseSalesMetadataUid(item, metadataKey) {
+  var _a;
+  const uid = ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a[metadataKey]) ?? (item == null ? void 0 : item[metadataKey]);
+  if (uid === void 0 || uid === null || uid === "")
+    return null;
+  return String(uid);
+}
+function mergeBaseSalesUniqueArray(currentValue, loadedValue, metadataKey) {
+  const result = [];
+  const indexByUid = /* @__PURE__ */ new Map();
+  const appendOrReplaceByUid = (item) => {
+    const clonedItem = (0, import_lodash_es.cloneDeep)(item);
+    const uid = getBaseSalesMetadataUid(clonedItem, metadataKey);
+    if (!uid) {
+      result.push(clonedItem);
+      return;
+    }
+    const existingIndex = indexByUid.get(uid);
+    if (existingIndex !== void 0) {
+      result[existingIndex] = clonedItem;
+      return;
+    }
+    indexByUid.set(uid, result.length);
+    result.push(clonedItem);
+  };
+  currentValue.forEach(appendOrReplaceByUid);
+  loadedValue.forEach(appendOrReplaceByUid);
+  return result;
+}
 function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord, strategy) {
   const normalizedLoadedRecord = normalizeBaseSalesRecordCollections(
     loadedRecord || {},
@@ -237,6 +273,15 @@ function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord, str
         );
       }
       if (Array.isArray(currentValue) && Array.isArray(loadedValue)) {
+        if (key === "payments" || key === "payment") {
+          return (0, import_payment_utils.mergeOrderPaymentListsByIdentity)(currentValue, loadedValue, {
+            preserveUnmatchedExisting: true
+          });
+        }
+        const metadataKey = getBaseSalesUniqueArrayMetadataKey(key);
+        if (metadataKey) {
+          return mergeBaseSalesUniqueArray(currentValue, loadedValue, metadataKey);
+        }
         return [
           ...(0, import_lodash_es.cloneDeep)(currentValue),
           ...(0, import_lodash_es.cloneDeep)(loadedValue)
@@ -796,6 +841,16 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     const coreData = (_f = (_d = (_c = app == null ? void 0 : app.models) == null ? void 0 : _c.getStore) == null ? void 0 : (_e = _d.call(_c)).getDataByModel) == null ? void 0 : _f.call(_e, "core", "core");
     return coreData == null ? void 0 : coreData[key];
   }
+  getPaymentNumberDevicePrefixSync() {
+    if (!this.appPlugin)
+      return "LOCAL";
+    return (0, import_payment_number.resolvePaymentNumberDevicePrefixFromDeviceId)((key) => this.getAppData(key));
+  }
+  getPaymentNumberDevicePrefixAsync() {
+    if (!this.appPlugin)
+      return Promise.resolve("LOCAL");
+    return (0, import_payment_number.resolvePaymentNumberDevicePrefix)((key) => this.getAppData(key));
+  }
   syncAppDataToTempOrder(tempOrder) {
     const isPriceIncludeTax = this.getAppData("is_price_include_tax");
     const taxCountryCode = this.getAppData("tax_country_code");
@@ -1323,8 +1378,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     if (hasManualDiscountSelection && currentDiscountList.length) {
       return {
         productList: tempOrder.products || [],
-        discountList: currentDiscountList,
-        availableWalletIds: this.getAvailableWalletIds()
+        discountList: currentDiscountList
       };
     }
     let nextDiscountList = this.mergeHistoricalDiscountList(
@@ -1353,8 +1407,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       });
       return {
         productList: tempOrder.products || [],
-        discountList: nextDiscountList,
-        availableWalletIds: this.getAvailableWalletIds()
+        discountList: nextDiscountList
       };
     }
     if (rulesModule) {
@@ -1415,16 +1468,9 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     });
     return {
       productList: tempOrder.products || [],
-      discountList: nextDiscountList,
-      availableWalletIds: this.getAvailableWalletIds()
+      discountList: nextDiscountList
     };
   }
-  getAvailableWalletIds() {
-    var _a;
-    if (!((_a = this.store.order) == null ? void 0 : _a.getAvailableWalletIds))
-      return [];
-    return this.store.order.getAvailableWalletIds();
-  }
   async bestDiscount(cb) {
     var _a, _b, _c;
     if (!this.store.order)
@@ -1727,6 +1773,20 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     };
     return this.store.order.submitTempOrder(submitParams);
   }
+  async saveSalesOrderDraft(params) {
+    var _a, _b, _c, _d;
+    if (!this.store.order) {
+      throw new Error("BaseSales 解决方案需要 order 模块支持");
+    }
+    return this.store.order.saveTempOrderAsDraft({
+      cacheId: this.cacheId,
+      platform: (params == null ? void 0 : params.platform) ?? ((_a = this.otherParams) == null ? void 0 : _a.platform),
+      businessCode: (params == null ? void 0 : params.businessCode) ?? ((_b = this.otherParams) == null ? void 0 : _b.businessCode) ?? ((_c = this.otherParams) == null ? void 0 : _c.business_code),
+      channel: (params == null ? void 0 : params.channel) ?? this.getSubmitOrderSalesChannel(),
+      type: (params == null ? void 0 : params.type) ?? ((_d = this.otherParams) == null ? void 0 : _d.type),
+      ...(params == null ? void 0 : params.enhancePayload) !== void 0 ? { enhancePayload: params.enhancePayload } : {}
+    });
+  }
   async submitTempOrderAsync(params) {
     var _a, _b, _c, _d;
     if (!this.store.order) {
@@ -1927,8 +1987,26 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       }
     }
   }
-  /** 追加单个支付项到当前订单。 */
+  /**
+   * 同步兼容入口。无法等待 IoT 短号时，按调用当下的 device_id 或 LOCAL 生成。
+   */
   addOrderPayment(payment) {
+    const hasPaymentNumber = String(
+      payment.payment_number || ""
+    ).trim() !== "";
+    return this.addOrderPaymentWithDevicePrefix(
+      payment,
+      hasPaymentNumber ? "LOCAL" : this.getPaymentNumberDevicePrefixSync()
+    );
+  }
+  /** 创建新支付项时读取最新设备短号，不缓存运行时设备信息。 */
+  async addOrderPaymentAsync(payment) {
+    const paymentRecord = payment;
+    const hasPaymentNumber = String(paymentRecord.payment_number || "").trim() !== "";
+    const devicePrefix = hasPaymentNumber ? "LOCAL" : await this.getPaymentNumberDevicePrefixAsync();
+    return this.addOrderPaymentWithDevicePrefix(payment, devicePrefix);
+  }
+  addOrderPaymentWithDevicePrefix(payment, devicePrefix) {
     var _a;
     if (!this.store.order)
       throw new Error("order 模块未初始化");
@@ -1945,21 +2023,26 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     if (shopWalletPassId !== void 0 && shopWalletPassId !== null) {
       metadata.shop_wallet_pass_id = shopWalletPassId;
     }
-    if (!metadata.unique_payment_number) {
-      metadata.unique_payment_number = (0, import_utils.createUuidV4)();
-    }
+    const normalizedPaymentRecord = (0, import_payment_utils.ensureOrderPaymentNumber)(
+      paymentRecord,
+      devicePrefix,
+      import_utils.createUuidV4
+    );
     const paymentTimestamp = (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss");
     const paymentTime = paymentRecord.payment_time ?? paymentTimestamp;
     const createdAt = paymentRecord.created_at ?? paymentTimestamp;
     const serviceCharge = paymentRecord.service_charge && typeof paymentRecord.service_charge === "object" ? paymentRecord.service_charge : null;
     const calculatedServiceFee = serviceCharge ? new import_decimal.default(paymentRecord.origin_amount ?? paymentRecord.amount ?? 0).times(serviceCharge.percentage || 0).plus(serviceCharge.amount || 0).toDecimalPlaces(2).toFixed(2) : void 0;
     const payments = this.store.order.addOrderPayment({
-      ...paymentRecord,
+      ...normalizedPaymentRecord,
       ...calculatedServiceFee !== void 0 ? { service_fee: calculatedServiceFee } : {},
       metadata,
       payment_time: paymentTime,
       created_at: createdAt
     });
+    if (paymentRecord.status === "payment_pending") {
+      return payments;
+    }
     const amountSnapshot = this.store.order.getOrderAmountSnapshot();
     const syncState = this.store.order.getOrderSyncState();
     if (amountSnapshot) {
@@ -1981,10 +2064,73 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     return payments;
   }
   /** 更新当前订单中的指定支付项。 */
-  updateOrderPayment(paymentIdentity, updates) {
+  async updateOrderPayment(paymentIdentity, updates, options = {}) {
+    var _a, _b, _c;
     if (!this.store.order)
       throw new Error("order 模块未初始化");
-    return this.store.order.updateOrderPayment(paymentIdentity, updates);
+    const matchMode = options.matchBy === "compat" || options.matchBy === "legacy" ? "compat" : "payment_number";
+    const previousMatch = (0, import_payment_utils.resolveOrderPaymentIdentity)(
+      this.store.order.getOrderPayments(),
+      paymentIdentity,
+      matchMode
+    );
+    const previousPayment = previousMatch == null ? void 0 : previousMatch.payment;
+    if ((previousPayment == null ? void 0 : previousPayment.status) === "paid" && !options.applyUpdatesWhenPaid) {
+      const currentPayments = this.store.order.getOrderPayments();
+      let syncResult2;
+      if (options.submitWhenPaid && options.forceSubmitIfPaid) {
+        syncResult2 = await this.syncPaymentsToOrder({
+          payments: currentPayments,
+          paymentStatus: this.getPaymentStatusForSync(currentPayments),
+          submitWhenPaid: true,
+          smallTicketDataFlag: options.smallTicketDataFlag ?? 1
+        });
+      }
+      return {
+        updated: false,
+        payment: previousPayment,
+        payments: currentPayments,
+        summary: ((_a = this.store.order.getOrderAmountSnapshot()) == null ? void 0 : _a.summary) || null,
+        ...syncResult2 !== void 0 ? { syncResult: syncResult2 } : {}
+      };
+    }
+    const result = await this.store.order.updateOrderPayment(paymentIdentity, updates, {
+      matchBy: matchMode
+    });
+    let draftResult;
+    let draftError;
+    if (options.persistDraft !== false) {
+      try {
+        draftResult = await this.saveSalesOrderDraft();
+      } catch (error) {
+        draftError = error;
+        this.logError("updateOrderPayment: 保存支付草稿失败", {
+          paymentIdentity,
+          error: error instanceof Error ? error.message : String(error)
+        });
+        if (!options.submitWhenPaid)
+          throw error;
+      }
+    }
+    const becamePaid = (previousPayment == null ? void 0 : previousPayment.status) !== "paid" && ((_b = result.payment) == null ? void 0 : _b.status) === "paid";
+    const shouldSubmit = Boolean(
+      options.submitWhenPaid && ((_c = result.payment) == null ? void 0 : _c.status) === "paid" && (becamePaid || options.forceSubmitIfPaid)
+    );
+    let syncResult;
+    if (shouldSubmit) {
+      syncResult = await this.syncPaymentsToOrder({
+        payments: result.payments,
+        paymentStatus: this.getPaymentStatusForSync(result.payments),
+        submitWhenPaid: true,
+        smallTicketDataFlag: options.smallTicketDataFlag ?? 1
+      });
+    }
+    return {
+      ...result,
+      ...draftResult !== void 0 ? { draftResult } : {},
+      ...draftError !== void 0 ? { draftError } : {},
+      ...syncResult !== void 0 ? { syncResult } : {}
+    };
   }
   /** 删除当前订单中的指定支付项。 */
   deleteOrderPayment(paymentIdentity) {
@@ -1998,6 +2144,11 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       throw new Error("order 模块未初始化");
     return this.store.order.updateVoucherOrderPayments(payments, options);
   }
+  async updateVoucherOrderPaymentsAsync(payments, options) {
+    if (!this.store.order)
+      throw new Error("order 模块未初始化");
+    return this.store.order.updateVoucherOrderPaymentsAsync(payments, options);
+  }
   confirmPendingVoucherPayments() {
     if (!this.store.order)
       throw new Error("order 模块未初始化");

package/lib/solution/BaseSales/utils/parseSalesResponse.d.ts

@@ -82,8 +82,13 @@ export interface ISalesBooking {
     metadata?: Record<string, any> | null;
     [key: string]: any;
 }
+export interface ISalesPaymentMetadata extends Record<string, any> {
+    /** 刷卡机设备快照；OS 不解析内部字段 */
+    card_reader_snapshot?: Record<string, unknown>;
+}
 export interface ISalesPayment {
     order_payment_id?: number | null;
+    payment_number?: string;
     custom_payment_id?: number;
     code?: string;
     name?: string;
@@ -95,7 +100,7 @@ export interface ISalesPayment {
     status?: string;
     payment_time?: string | null;
     service_charge?: Record<string, any> | null;
-    metadata?: Record<string, any> | null;
+    metadata?: ISalesPaymentMetadata | null;
     [key: string]: any;
 }
 export interface ISalesSurcharge {

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

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

@@ -322,7 +322,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/lib/solution/BookingTicket/index.js

@@ -1153,7 +1153,8 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
   }
   /** 读取当前 booking config。 */
   getBookingConfig() {
-    return this.store.bookingContext.getBookingConfig();
+    var _a;
+    return (_a = this.store.bookingContext) == null ? void 0 : _a.getBookingConfig();
   }
   /** 写入资源全集（来源：`/form/schedule`），同步派生 resourcesOriginMap。 */
   setResources(resources) {

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

@@ -83,8 +83,6 @@ export interface ILoadProductsParams {
     extension_type?: string[];
     /** 商品发布状态 */
     status?: string;
-    /** 智能定价条件上下文，仅影响策略命中，不参与商品集合筛选 */
-    strategy_context?: Record<string, any>;
 }
 /**
  * 加载商品详情的参数

package/lib/solution/ShopDiscount/index.js

@@ -505,7 +505,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     try {
       const orderId = this.store.orderId;
       const customerId = params.customerId || ((_a = this.getCustomer()) == null ? void 0 : _a.id);
-      const prepareConfigResult = await ((_b = this.store.discount) == null ? void 0 : _b.loadPrepareConfig({
+      const goodPassList = await ((_b = this.store.discount) == null ? void 0 : _b.loadPrepareConfig({
         customer_id: customerId,
         action: orderId ? "edit" : "create",
         with_good_pass: 1,
@@ -514,7 +514,6 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
         ...orderId ? { order_id: orderId } : {}
       }));
-      const goodPassList = (prepareConfigResult == null ? void 0 : prepareConfigResult.discountList) || [];
       const scanDiscount = (_c = this.getDiscountList()) == null ? void 0 : _c.filter(
         (item) => item.isScan
       );

package/lib/utils/payment-number.d.ts

@@ -0,0 +1,9 @@
+export type PaymentNumberAppDataGetter = (key: string) => unknown;
+/**
+ * Resolve the synchronous fallback without caching runtime device data.
+ */
+export declare function resolvePaymentNumberDevicePrefixFromDeviceId(getAppData: PaymentNumberAppDataGetter): string;
+/**
+ * Resolve the latest device segment when a new payment number is generated.
+ */
+export declare function resolvePaymentNumberDevicePrefix(getAppData: PaymentNumberAppDataGetter): Promise<string>;

package/lib/utils/payment-number.js

@@ -0,0 +1,64 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/utils/payment-number.ts
+var payment_number_exports = {};
+__export(payment_number_exports, {
+  resolvePaymentNumberDevicePrefix: () => resolvePaymentNumberDevicePrefix,
+  resolvePaymentNumberDevicePrefixFromDeviceId: () => resolvePaymentNumberDevicePrefixFromDeviceId
+});
+module.exports = __toCommonJS(payment_number_exports);
+function normalizeNonEmptyString(value) {
+  if (value === void 0 || value === null)
+    return null;
+  if (typeof value !== "string" && typeof value !== "number")
+    return null;
+  if (typeof value === "number" && !Number.isFinite(value))
+    return null;
+  const normalized = String(value).trim();
+  return normalized || null;
+}
+function resolvePaymentNumberDevicePrefixFromDeviceId(getAppData) {
+  try {
+    const deviceId = normalizeNonEmptyString(getAppData("device_id"));
+    if (deviceId && deviceId !== "0")
+      return deviceId.slice(-2);
+  } catch {
+  }
+  return "LOCAL";
+}
+async function resolvePaymentNumberDevicePrefix(getAppData) {
+  try {
+    const getAsyncIotDeviceInfo = getAppData("async_iot_device_info");
+    if (typeof getAsyncIotDeviceInfo === "function") {
+      const info = await getAsyncIotDeviceInfo();
+      const shortNumber = normalizeNonEmptyString(
+        info == null ? void 0 : info.short_number
+      );
+      if (shortNumber && shortNumber !== "0")
+        return shortNumber;
+    }
+  } catch {
+  }
+  return resolvePaymentNumberDevicePrefixFromDeviceId(getAppData);
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  resolvePaymentNumberDevicePrefix,
+  resolvePaymentNumberDevicePrefixFromDeviceId
+});

package/package.json

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

package/dist/model/strategy/adapter/dataVariant/adapter.d.ts

@@ -1,50 +0,0 @@
-import type { EvaluationResult, RuntimeContext } from '../../type';
-import type { BusinessAdapter } from '../type';
-import type { DataVariantBusinessData, DataVariantProduct } from './type';
-/**
- * Data Variant 适配器。
- *
- * 负责把智能定价运行态数据转换为 StrategyEngine 能识别的 attributes。
- */
-export declare class DataVariantAdapter implements BusinessAdapter {
-    name: string;
-    version: string;
-    /**
-     * 准备批量全局上下文。
-     *
-     * 这里只放不依赖单个商品的字段，用于预计算 schedule/channel/orderType 等条件。
-     */
-    prepareContext(businessData: DataVariantBusinessData): RuntimeContext;
-    /**
-     * 准备全局预计算上下文。
-     */
-    prepareGlobalContext(businessData: DataVariantBusinessData): RuntimeContext;
-    /**
-     * 准备单商品上下文。
-     *
-     * 商品级条件只在当前商品 data_variants 引用到对应规则后才评估。
-     */
-    prepareProductContext(businessData: DataVariantBusinessData, product: DataVariantProduct): RuntimeContext;
-    transformResult(result: EvaluationResult): EvaluationResult;
-    formatConfig(result: EvaluationResult, businessData?: DataVariantBusinessData): {
-        result: EvaluationResult;
-        businessData?: DataVariantBusinessData;
-    };
-    /**
-     * 构建 menu_match 使用的轻量商品对象。
-     *
-     * collection_ids 来自商品 collection 字段，避免 operator 读取复杂商品对象。
-     */
-    buildProductValue(product: DataVariantProduct): {
-        id: number;
-        product_variant_id: number;
-        collection_ids: number[];
-    };
-    private toNumber;
-    /**
-     * 归一化客户 id：无效值返回 undefined，有效值统一为 number。
-     */
-    private normalizeCustomerId;
-    private normalizeNumberArray;
-}
-export default DataVariantAdapter;