@pisell/pisellos 2.2.189 → 2.2.191

package/lib/solution/BaseSales/index.js

@@ -266,7 +266,16 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       product_variant_id: product.product_variant_id ?? authoritativeProduct.product_variant_id ?? 0,
       num: product.num ?? product.quantity ?? authoritativeProduct.num,
       quantity: product.quantity ?? product.num ?? authoritativeProduct.quantity,
-      product_option_item: product.product_option_item ?? authoritativeProduct.product_option_item,
+      product_sku: (() => {
+        const authoritativeSku = (0, import_utils.ensureProductSku)(authoritativeProduct);
+        const productSku = (0, import_utils.ensureProductSku)(product);
+        const hasProductSku = product.product_sku && typeof product.product_sku === "object";
+        return {
+          ...authoritativeSku,
+          ...productSku,
+          option: hasProductSku ? productSku.option : authoritativeSku.option
+        };
+      })(),
       product_bundle: productBundle,
       metadata: product.metadata ?? authoritativeProduct.metadata
     };
@@ -823,7 +832,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
           (sum, pd) => sum + Number(pd.amount || 0),
           0
         );
-        const optionSum = (0, import_utils.sumOptionUnitPrice)(product.product_option_item);
+        const optionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(product));
         const sourcePrice = ((_t = product.metadata) == null ? void 0 : _t.source_product_price) ?? (((_u = product.metadata) == null ? void 0 : _u.main_product_original_price) != null ? new import_decimal.default(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : product.original_price ?? "0");
         const newSourceSellingPrice = new import_decimal.default(Number(sourcePrice) || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
         const newMainSellingPrice = new import_decimal.default(Number(newSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
@@ -1002,7 +1011,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
           (sum, pd) => sum + (pd.amount || 0),
           0
         );
-        const optionSum = (0, import_utils.sumOptionUnitPrice)(product.product_option_item);
+        const optionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(product));
         const sourcePrice = ((_h = product.metadata) == null ? void 0 : _h.source_product_price) ?? (((_i = product.metadata) == null ? void 0 : _i.main_product_original_price) != null ? new import_decimal.default(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : product.original_price ?? "0");
         const newSourceSellingPrice = new import_decimal.default(Number(sourcePrice) || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
         const newMainSellingPrice = new import_decimal.default(Number(newSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
@@ -1068,7 +1077,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
    * payments 会交给 OrderModule 统一映射为 Sales 协议支付项。
    */
   async submitSalesOrder(params) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     if (!this.store.order) {
       throw new Error("BaseSales 解决方案需要 order 模块支持");
     }
@@ -1077,9 +1086,9 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     const submitParams = {
       cacheId: this.cacheId,
       platform: (_a = this.otherParams) == null ? void 0 : _a.platform,
-      businessCode: (_b = this.otherParams) == null ? void 0 : _b.businessCode,
+      businessCode: ((_b = this.otherParams) == null ? void 0 : _b.businessCode) || ((_c = this.otherParams) == null ? void 0 : _c.business_code),
       channel: this.getSubmitOrderSalesChannel(),
-      type: (_c = this.otherParams) == null ? void 0 : _c.type,
+      type: (_d = this.otherParams) == null ? void 0 : _d.type,
       ...(params == null ? void 0 : params.payments) !== void 0 ? { payments: params.payments } : {},
       ...inferredPaymentStatus !== void 0 ? { paymentStatus: inferredPaymentStatus } : {},
       ...(params == null ? void 0 : params.smallTicketDataFlag) !== void 0 ? { smallTicketDataFlag: params.smallTicketDataFlag } : {},
@@ -1102,11 +1111,14 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     }
   }
   async syncPaymentsToOrder(params) {
+    var _a, _b;
     if (!this.store.order)
       throw new Error("order 模块未初始化");
+    const businessCode = params.businessCode ?? ((_a = this.otherParams) == null ? void 0 : _a.businessCode) ?? ((_b = this.otherParams) == null ? void 0 : _b.business_code);
     const channel = params.channel ?? this.getSubmitOrderSalesChannel();
     const syncParams = {
       ...params,
+      ...businessCode !== void 0 ? { businessCode } : {},
       ...channel !== void 0 ? { channel } : {}
     };
     const syncState = this.store.order.getOrderSyncState();
@@ -1157,10 +1169,16 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   }
   /** 追加单个支付项到当前订单。 */
   addOrderPayment(payment) {
+    var _a;
     if (!this.store.order)
       throw new Error("order 模块未初始化");
     const paymentRecord = payment;
     const metadata = paymentRecord.metadata && typeof paymentRecord.metadata === "object" ? { ...paymentRecord.metadata } : {};
+    debugger;
+    const shopWalletPassId = (_a = this.otherParams) == null ? void 0 : _a.shop_wallet_pass_id;
+    if (shopWalletPassId !== void 0 && shopWalletPassId !== null) {
+      metadata.shop_wallet_pass_id = shopWalletPassId;
+    }
     if (!metadata.unique_identification_number) {
       metadata.unique_identification_number = (0, import_utils.createUuidV4)();
     }
@@ -1446,8 +1464,8 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       if (identity.unique_identification_number !== void 0) {
         params.unique_identification_number = identity.unique_identification_number;
       }
-      if (identity.product_option_item !== void 0) {
-        params.product_option_item = identity.product_option_item;
+      if (identity.product_sku !== void 0) {
+        params.product_sku = identity.product_sku;
       }
       if (identity.product_bundle !== void 0)
         params.product_bundle = identity.product_bundle;

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

@@ -41,16 +41,20 @@ export interface BaseSalesOrderProductIdentity {
     identity_key?: string;
     unique_identification_number?: string;
     /** 参与合并/匹配；与 remove 通配语义见 isSkuOnlyDeleteIdentity */
-    product_option_item?: any[];
+    product_sku?: BaseSalesProductSku;
     product_bundle?: any[];
 }
+export interface BaseSalesProductSku {
+    option: any[];
+    [key: string]: any;
+}
 export interface BaseSalesUpdateOrderProductQuantityParams extends BaseSalesOrderProductIdentity {
     num: number;
 }
 export interface BaseSalesOrderProduct extends BaseSalesOrderProductIdentity {
     order_detail_id: number | null;
     num: number;
-    product_option_item: any[];
+    product_sku: BaseSalesProductSku;
     /**
      * 券后 **行 composite 单价** = `metadata.main_product_selling_price`
      *   + Σ((bundle.bundle_selling_price ?? bundle.price) × (bundle.num ?? 1))
@@ -96,9 +100,8 @@ export interface BaseSalesOrderProduct extends BaseSalesOrderProductIdentity {
  * 出站 payload 版本的商品行。
  *
  * 与 tempOrder 内部 `BaseSalesOrderProduct` 的字段差异：
- * - `product_option_item[*]`：内部为 `{ option_group_item_id, option_group_id, num, price, ... }`，
- *   出站保留 `{ option_group_item_id, option_group_id, num }`
- *   （后端 checkout 协议；丢弃 `price` 等运行时辅助字段）。
+ * - `product_sku.option[*]`：内部直接维护统一 Sales 协议字段；
+ *   提交时仅规范 `add_price`，保留传入/恢复得到的展示字段。
  * - `product_bundle[*].option[*]`：同上重命名规则。
  *
  * 运行时（UI 显示、加购合并、指纹、持久化）与提交边界统一消费字段名

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

@@ -48,7 +48,7 @@ var import_utils = require("../../../modules/Order/utils");
 var import_utils2 = require("../../ScanOrder/utils");
 function getOrderProductBasePrice(product) {
   const metadata = (product == null ? void 0 : product.metadata) || {};
-  const optionSum = (0, import_utils.sumOptionUnitPrice)(product == null ? void 0 : product.product_option_item).toNumber();
+  const optionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(product)).toNumber();
   if (metadata.source_product_price !== void 0) {
     const v2 = Number(metadata.source_product_price);
     return Number.isFinite(v2) ? v2 : 0;
@@ -63,7 +63,7 @@ function getOrderProductBasePrice(product) {
 function getOrderProductOriginalPriceForPromotion(product) {
   var _a;
   const metadata = (product == null ? void 0 : product.metadata) || {};
-  const optionSum = (0, import_utils.sumOptionUnitPrice)(product == null ? void 0 : product.product_option_item).toNumber();
+  const optionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(product)).toNumber();
   if (metadata.main_product_original_price !== void 0 && metadata.main_product_original_price !== null && metadata.main_product_original_price !== "") {
     const v = Number(metadata.main_product_original_price) - optionSum;
     if (Number.isFinite(v) && v >= 0)
@@ -101,7 +101,7 @@ function updatePromotionDiscountList(item, promotionDiscount) {
 var X_ITEMS_FOR_Y_PRICE = "X_ITEMS_FOR_Y_PRICE";
 function applyPromoUnitPriceToLine(item, input) {
   const metadata = item.metadata || (item.metadata = {});
-  const optionSum = (0, import_utils.sumOptionUnitPrice)(item.product_option_item).toNumber();
+  const optionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(item)).toNumber();
   const promoUnitPrice = new import_decimal.default(Number(input.promoUnitPrice) || 0).toDecimalPlaces(2).toFixed(2);
   const mainSelling = new import_decimal.default(Number(promoUnitPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
   const catalogSource = new import_decimal.default(input.originalBasePrice).toDecimalPlaces(2).toFixed(2);
@@ -169,7 +169,7 @@ function mergeIdenticalPromotionCartLines(products) {
       continue;
     }
     const fingerprint = (0, import_utils2.buildProductLineFingerprint)(
-      line.product_option_item,
+      (0, import_utils.getProductSkuOptions)(line),
       line.product_bundle
     );
     const unitPrice = String(
@@ -340,7 +340,7 @@ function getProductBundleForEvaluator(product) {
 function buildConsolidateKeyForPromotion(item) {
   var _a;
   const fingerprint = (0, import_utils2.buildProductLineFingerprint)(
-    item.product_option_item,
+    (0, import_utils.getProductSkuOptions)(item),
     item.product_bundle
   );
   const bookingUid = (item == null ? void 0 : item.booking_uid) ?? ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.booking_uid);
@@ -795,7 +795,7 @@ function processCartPromotion(list, evaluator, options) {
           strategyTitle: (_b = priced.strategyMetadata) == null ? void 0 : _b.name
         });
       } else {
-        const optionSum = (0, import_utils.sumOptionUnitPrice)(newItem.product_option_item).toNumber();
+        const optionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(newItem)).toNumber();
         const sourceRestore = new import_decimal.default(originalBasePrice).toDecimalPlaces(2).toFixed(2);
         const mainRestore = new import_decimal.default(Number(sourceRestore) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
         metadata.source_product_price = sourceRestore;

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

@@ -23,6 +23,7 @@ export interface BaseProductDetailPayload {
     option?: BaseProductDetailOptionItem[];
     options?: BaseProductDetailOptionItem[];
     product_option_item?: BaseProductDetailOptionItem[];
+    product_sku?: Record<string, any>;
     bundle?: BaseProductDetailBundleItem[];
     product_bundle?: BaseProductDetailBundleItem[];
     unique?: string;

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

@@ -22,6 +22,7 @@ __export(transformBaseProductToOrderProduct_exports, {
   transformBaseProductToOrderProduct: () => transformBaseProductToOrderProduct
 });
 module.exports = __toCommonJS(transformBaseProductToOrderProduct_exports);
+var import_utils = require("../../../modules/Order/utils");
 var import_manualProductDiscount = require("../../../modules/Order/utils/manualProductDiscount");
 function toNumber(value, fallback = 0) {
   const parsedValue = Number(value);
@@ -53,13 +54,15 @@ function normalizeOptionItems(optionItems) {
   if (!Array.isArray(optionItems))
     return [];
   return optionItems.map((optionItem) => {
-    const optionGroupItemId = toNumber(optionItem == null ? void 0 : optionItem.id);
+    const optionGroupItemId = toNumber((optionItem == null ? void 0 : optionItem.option_group_item_id) ?? (optionItem == null ? void 0 : optionItem.id));
     const price = (optionItem == null ? void 0 : optionItem.price) ?? (optionItem == null ? void 0 : optionItem.add_price) ?? 0;
     return {
+      ...optionItem,
       option_group_item_id: optionGroupItemId,
       option_group_id: toNumber(optionItem == null ? void 0 : optionItem.option_group_id),
       num: toSafePositiveInt((optionItem == null ? void 0 : optionItem.num) ?? (optionItem == null ? void 0 : optionItem.quantity), 1),
-      price: toNumber(price, 0)
+      add_price: toNumber(price, 0),
+      price: void 0
     };
   });
 }
@@ -88,7 +91,7 @@ function findVariantById(origin, variantId) {
   return variants.find((variant) => Number(variant == null ? void 0 : variant.id) === variantId) || null;
 }
 function transformBaseProductToOrderProduct(params) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
   const { payload, fallbackProductId = null } = params;
   if (!payload || typeof payload !== "object")
     return null;
@@ -117,8 +120,10 @@ function transformBaseProductToOrderProduct(params) {
     sourceProductPrice
   );
   const hasPriceOverride = payload.price_override !== void 0 && payload.price_override !== null && payload.price_override !== "";
-  const productOptionItem = normalizeOptionItems(
-    payload.option ?? payload.options ?? payload.product_option_item
+  const productOptionItem = (0, import_utils.normalizeProductSkuOptions)(
+    normalizeOptionItems(
+      ((_d = payload.product_sku) == null ? void 0 : _d.option) ?? payload.option ?? payload.options ?? payload.product_option_item
+    )
   );
   const productBundle = normalizeBundleItems(
     payload.bundle ?? payload.product_bundle,
@@ -128,19 +133,19 @@ function transformBaseProductToOrderProduct(params) {
   const resolvedQuantity = toSafePositiveInt(payload.quantity ?? payload.num, 1);
   const originTotal = (0, import_manualProductDiscount.resolveManualDiscountOriginTotal)({
     originTotal: payload.origin_total,
-    extendOriginTotal: (_d = payload._extend) == null ? void 0 : _d.origin_total,
-    originExtendOriginTotal: (_e = origin == null ? void 0 : origin._extend) == null ? void 0 : _e.origin_total,
-    sourceExtendOriginTotal: (_f = sourceProduct == null ? void 0 : sourceProduct._extend) == null ? void 0 : _f.origin_total,
+    extendOriginTotal: (_e = payload._extend) == null ? void 0 : _e.origin_total,
+    originExtendOriginTotal: (_f = origin == null ? void 0 : origin._extend) == null ? void 0 : _f.origin_total,
+    sourceExtendOriginTotal: (_g = sourceProduct == null ? void 0 : sourceProduct._extend) == null ? void 0 : _g.origin_total,
     catalogUnitPrice: (origin == null ? void 0 : origin.base_price) ?? (origin == null ? void 0 : origin.price) ?? (sourceProduct == null ? void 0 : sourceProduct.base_price) ?? (sourceProduct == null ? void 0 : sourceProduct.price),
     quantity: resolvedQuantity
   });
   const sellingTotal = Number(
-    payload.line_total ?? payload.total ?? ((_g = payload._extend) == null ? void 0 : _g.total) ?? lineCompositeTotal
+    payload.line_total ?? payload.total ?? ((_h = payload._extend) == null ? void 0 : _h.total) ?? lineCompositeTotal
   );
   const discountReason = (0, import_manualProductDiscount.resolveManualDiscountReasonFromSources)({
     discountReason: payload.discount_reason,
-    extendDiscountReason: (_h = payload._extend) == null ? void 0 : _h.discount_reason,
-    originExtendDiscountReason: (_i = origin == null ? void 0 : origin._extend) == null ? void 0 : _i.discount_reason
+    extendDiscountReason: (_i = payload._extend) == null ? void 0 : _i.discount_reason,
+    originExtendDiscountReason: (_j = origin == null ? void 0 : origin._extend) == null ? void 0 : _j.discount_reason
   });
   const lineOriginalPrice = hasPriceOverride && Number.isFinite(originTotal) ? toPriceString(originTotal) : lineCompositeTotal;
   const manualDiscountList = (0, import_manualProductDiscount.shouldBuildManualProductDiscount)({
@@ -154,10 +159,17 @@ function transformBaseProductToOrderProduct(params) {
       sellingTotal: Number.isFinite(sellingTotal) ? sellingTotal : Number(lineCompositeTotal),
       quantity: resolvedQuantity,
       message: discountReason,
-      discountway: (_j = payload._extend) == null ? void 0 : _j.discountway,
-      discount_per: (_k = payload._extend) == null ? void 0 : _k.discount_per
+      discountway: (_k = payload._extend) == null ? void 0 : _k.discountway,
+      discount_per: (_l = payload._extend) == null ? void 0 : _l.discount_per
     })
   ) : payload.discount_list || [];
+  const optionSum = (0, import_utils.sumOptionUnitPrice)(productOptionItem).toNumber();
+  const mainProductOriginalPrice = toPriceString(Number(sourceProductPrice) + optionSum);
+  const bundleOnlyComposite = (0, import_utils.composeLinePrice)({ mainPrice: 0, bundle: productBundle });
+  const derivedMainSelling = Number(lineCompositeTotal) - Number(bundleOnlyComposite);
+  const mainProductSellingPrice = toPriceString(
+    Number.isFinite(derivedMainSelling) && derivedMainSelling >= 0 ? derivedMainSelling : Number(mainProductOriginalPrice)
+  );
   const metadata = {
     unique: payload.unique,
     session: payload.session,
@@ -170,8 +182,9 @@ function transformBaseProductToOrderProduct(params) {
     source_shop_id: payload.source_shop_id,
     origin,
     source_product_price: sourceProductPrice,
-    main_product_selling_price: sourceProductPrice,
-    main_product_original_price: sourceProductPrice,
+    main_product_selling_price: mainProductSellingPrice,
+    main_product_original_price: mainProductOriginalPrice,
+    price_schema_version: 2,
     ...hasPriceOverride ? {
       price_override: String(payload.price_override),
       is_manual_discount: 1
@@ -186,7 +199,10 @@ function transformBaseProductToOrderProduct(params) {
     product_variant_id: productVariantId,
     unique_identification_number: uniqueIdentificationNumber ? String(uniqueIdentificationNumber) : void 0,
     num: resolvedQuantity,
-    product_option_item: productOptionItem,
+    product_sku: {
+      ...payload.product_sku && typeof payload.product_sku === "object" ? payload.product_sku : {},
+      option: productOptionItem
+    },
     product_bundle: productBundle,
     discount_list: manualDiscountList,
     // 折后行价由 normalizeOrderProduct 按 main + bundle 合成；手动改价时 bundle 已为分摊后单价

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

@@ -12,7 +12,7 @@ export declare function buildProductLineFingerprint(productOptionItem?: unknown,
 export declare function getSafeProductNum(num?: number): number;
 /**
  * removeProductFromOrder 仅传 SKU 时的通配 identity（对象上未声明选项键）。
- * 与显式 `product_option_item: []` 区分：后者只匹配「无选项」行。
+ * 与显式 `product_sku: { option: [] }` 区分：后者只匹配「无选项」行。
  */
 export declare function isSkuOnlyDeleteIdentity(x: BaseSalesOrderProductIdentity): boolean;
 /**

package/lib/solution/BaseSales/utils.js

@@ -65,7 +65,7 @@ function buildProductLineFingerprint(productOptionItem, productBundle) {
     option_group_item_id: Number(item == null ? void 0 : item.option_group_item_id) || 0,
     option_group_id: Number(item == null ? void 0 : item.option_group_id) || 0,
     num: typeof (item == null ? void 0 : item.num) === "number" && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
-    price: String((item == null ? void 0 : item.price) ?? "")
+    price: String((item == null ? void 0 : item.add_price) ?? (item == null ? void 0 : item.price) ?? "")
   })).sort((p, q) => {
     if (p.option_group_item_id !== q.option_group_item_id) {
       return p.option_group_item_id - q.option_group_item_id;
@@ -100,10 +100,10 @@ function getSafeProductNum(num) {
 function isSkuOnlyDeleteIdentity(x) {
   if (x.identity_key)
     return false;
-  return !("product_option_item" in x) && !("product_bundle" in x);
+  return !("product_sku" in x) && !("product_bundle" in x);
 }
 function normalizeOrderProduct(product) {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g;
   const metadata = { ...product.metadata || {} };
   const resolvedIdentityKey = ((_a = product.metadata) == null ? void 0 : _a.unique_identification_number) ? String(product.metadata.unique_identification_number) : product.unique_identification_number && String(product.unique_identification_number).length > 0 ? String(product.unique_identification_number) : product.identity_key && String(product.identity_key).length > 0 ? String(product.identity_key) : (0, import_utils.createUuidV4)();
   metadata.unique_identification_number = resolvedIdentityKey;
@@ -142,12 +142,16 @@ function normalizeOrderProduct(product) {
     price_type: item.price_type ?? item.custom_price_type ?? "",
     price_type_ext: item.price_type_ext ?? item.custom_price_type_ext ?? ""
   }));
-  const normalizedOptions = product.product_option_item || [];
+  const normalizedOptions = (0, import_utils.normalizeProductSkuOptions)((_e = product.product_sku) == null ? void 0 : _e.option);
   const optionSum = (0, import_utils.sumOptionUnitPrice)(normalizedOptions);
+  const productSku = {
+    ...(0, import_utils.ensureProductSku)(product),
+    option: normalizedOptions
+  };
   const isV2 = metadata.price_schema_version === 2 || metadata.price_schema_version === "2";
   const variantId = Number(product.product_variant_id || 0);
-  const variantList = variantId ? (_e = metadata == null ? void 0 : metadata.origin) == null ? void 0 : _e.variant : null;
-  const variantPrice = Array.isArray(variantList) ? (_f = variantList.find((v) => Number(v == null ? void 0 : v.id) === variantId)) == null ? void 0 : _f.price : void 0;
+  const variantList = variantId ? (_f = metadata == null ? void 0 : metadata.origin) == null ? void 0 : _f.variant : null;
+  const variantPrice = Array.isArray(variantList) ? (_g = variantList.find((v) => Number(v == null ? void 0 : v.id) === variantId)) == null ? void 0 : _g.price : void 0;
   const resolvedSource = (() => {
     var _a2, _b2;
     if (metadata.source_product_price !== void 0) {
@@ -219,7 +223,7 @@ function normalizeOrderProduct(product) {
     product_id: product.product_id,
     num: getSafeProductNum(product.num),
     product_variant_id: product.product_variant_id,
-    product_option_item: normalizedOptions,
+    product_sku: productSku,
     selling_price: composedSellingPrice,
     original_price: finalOriginalPrice,
     tax_fee: product.tax_fee || "0.00",

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

package/lib/solution/ScanOrder/index.js

@@ -751,7 +751,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
           (sum, pd) => sum + (pd.amount || 0),
           0
         );
-        const optionSum = (0, import_utils2.sumOptionUnitPrice)(product.product_option_item);
+        const optionSum = (0, import_utils2.sumOptionUnitPrice)((0, import_utils2.getProductSkuOptions)(product));
         const sourcePrice = ((_d = product.metadata) == null ? void 0 : _d.source_product_price) ?? (((_e = product.metadata) == null ? void 0 : _e.main_product_original_price) != null ? new import_decimal.default(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : product.original_price ?? "0");
         const newSourceSellingPrice = new import_decimal.default(Number(sourcePrice) || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
         const newMainSellingPrice = new import_decimal.default(Number(newSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
@@ -899,7 +899,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
           original_price: originalPrice,
           payment_price: sellingPrice,
           is_charge_tax: ruleProduct.is_gst ?? 0,
-          product_option_item: [],
+          product_sku: { option: [] },
           discount_list: [],
           product_bundle: [],
           booking_uid: bookingUuid,
@@ -1009,8 +1009,8 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
       };
       if (identity.identity_key !== void 0)
         params.identity_key = identity.identity_key;
-      if (identity.product_option_item !== void 0) {
-        params.product_option_item = identity.product_option_item;
+      if (identity.product_sku !== void 0) {
+        params.product_sku = identity.product_sku;
       }
       if (identity.product_bundle !== void 0)
         params.product_bundle = identity.product_bundle;

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

@@ -33,13 +33,17 @@ export interface ScanOrderOrderProductIdentity {
     identity_key?: string;
     unique_identification_number?: string;
     /** 参与合并/匹配；与 remove 通配语义见 isSkuOnlyDeleteIdentity */
-    product_option_item?: any[];
+    product_sku?: ScanOrderProductSku;
     product_bundle?: any[];
 }
+export interface ScanOrderProductSku {
+    option: any[];
+    [key: string]: any;
+}
 export interface ScanOrderOrderProduct extends ScanOrderOrderProductIdentity {
     order_detail_id: number | null;
     num: number;
-    product_option_item: any[];
+    product_sku: ScanOrderProductSku;
     /**
      * 券后 **行 composite 单价** = `metadata.main_product_selling_price`
      *   + Σ((bundle.bundle_selling_price ?? bundle.price) × (bundle.num ?? 1))
@@ -85,9 +89,8 @@ export interface ScanOrderOrderProduct extends ScanOrderOrderProductIdentity {
  * 出站 payload 版本的商品行。
  *
  * 与 tempOrder 内部 `ScanOrderOrderProduct` 的字段差异：
- * - `product_option_item[*]`：内部为 `{ option_group_item_id, option_group_id, num, price, ... }`，
- *   出站保留 `{ option_group_item_id, option_group_id, num }`
- *   （后端 checkout 协议；丢弃 `price` 等运行时辅助字段）。
+ * - `product_sku.option[*]`：内部直接维护统一 Sales 协议字段；
+ *   提交时仅规范 `add_price`，保留传入/恢复得到的展示字段。
  * - `product_bundle[*].option[*]`：同上重命名规则。
  *
  * 运行时（UI 显示、加购合并、指纹、持久化）与提交边界统一消费字段名

package/lib/solution/ScanOrder/utils.d.ts

@@ -88,7 +88,7 @@ export declare function attachItemRuleLimitsToTopLevelProducts<T>(productList: T
 export declare function buildProductLineFingerprint(productOptionItem?: unknown, productBundle?: unknown): string;
 /**
  * removeProductFromOrder 仅传 SKU 时的通配 identity（对象上未声明选项键）。
- * 与显式 `product_option_item: []` 区分：后者只匹配「无选项」行。
+ * 与显式 `product_sku: { option: [] }` 区分：后者只匹配「无选项」行。
  */
 export declare function isSkuOnlyDeleteIdentity(x: ScanOrderOrderProductIdentity): boolean;
 /**

package/lib/solution/ScanOrder/utils.js

@@ -353,7 +353,7 @@ function buildProductLineFingerprint(productOptionItem, productBundle) {
     option_group_item_id: Number(item == null ? void 0 : item.option_group_item_id) || 0,
     option_group_id: Number(item == null ? void 0 : item.option_group_id) || 0,
     num: typeof (item == null ? void 0 : item.num) === "number" && !Number.isNaN(item.num) ? Math.max(1, Math.floor(item.num)) : 1,
-    price: String((item == null ? void 0 : item.price) ?? "")
+    price: String((item == null ? void 0 : item.add_price) ?? (item == null ? void 0 : item.price) ?? "")
   })).sort((p, q) => {
     if (p.option_group_item_id !== q.option_group_item_id) {
       return p.option_group_item_id - q.option_group_item_id;
@@ -381,11 +381,11 @@ function buildProductLineFingerprint(productOptionItem, productBundle) {
 function isSkuOnlyDeleteIdentity(x) {
   if (x.unique_identification_number || x.identity_key)
     return false;
-  return !("product_option_item" in x) && !("product_bundle" in x);
+  return !("product_sku" in x) && !("product_bundle" in x);
 }
 function fingerprintForIdentityWithOptionKeys(x) {
   const row = x;
-  const opts = "product_option_item" in row ? Array.isArray(row.product_option_item) ? row.product_option_item : [] : [];
+  const opts = "product_sku" in row ? (0, import_utils.getProductSkuOptions)(row) : [];
   const buds = "product_bundle" in row ? Array.isArray(row.product_bundle) ? row.product_bundle : [] : [];
   return buildProductLineFingerprint(opts, buds);
 }
@@ -407,7 +407,7 @@ function getProductIdentityIndex(products, identity) {
   return products.findIndex((item) => isIdentityMatch(item, identity));
 }
 function normalizeOrderProduct(product) {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g;
   const metadata = { ...product.metadata || {} };
   const resolvedIdentityKey = ((_a = product.metadata) == null ? void 0 : _a.unique_identification_number) ? String(product.metadata.unique_identification_number) : product.unique_identification_number && String(product.unique_identification_number).length > 0 ? String(product.unique_identification_number) : product.identity_key && String(product.identity_key).length > 0 ? String(product.identity_key) : (0, import_utils.createUuidV4)();
   metadata.unique_identification_number = resolvedIdentityKey;
@@ -446,12 +446,16 @@ function normalizeOrderProduct(product) {
     price_type: item.price_type ?? item.custom_price_type ?? "",
     price_type_ext: item.price_type_ext ?? item.custom_price_type_ext ?? ""
   }));
-  const normalizedOptions = product.product_option_item || [];
+  const normalizedOptions = (0, import_utils.normalizeProductSkuOptions)((_e = product.product_sku) == null ? void 0 : _e.option);
   const optionSum = (0, import_utils.sumOptionUnitPrice)(normalizedOptions);
+  const productSku = {
+    ...(0, import_utils.ensureProductSku)(product),
+    option: normalizedOptions
+  };
   const isV2 = metadata.price_schema_version === 2 || metadata.price_schema_version === "2";
   const variantId = Number(product.product_variant_id || 0);
-  const variantList = variantId ? (_e = metadata == null ? void 0 : metadata.origin) == null ? void 0 : _e.variant : null;
-  const variantPrice = Array.isArray(variantList) ? (_f = variantList.find((v) => Number(v == null ? void 0 : v.id) === variantId)) == null ? void 0 : _f.price : void 0;
+  const variantList = variantId ? (_f = metadata == null ? void 0 : metadata.origin) == null ? void 0 : _f.variant : null;
+  const variantPrice = Array.isArray(variantList) ? (_g = variantList.find((v) => Number(v == null ? void 0 : v.id) === variantId)) == null ? void 0 : _g.price : void 0;
   const resolvedSource = (() => {
     var _a2, _b2;
     if (metadata.source_product_price !== void 0) {
@@ -527,7 +531,7 @@ function normalizeOrderProduct(product) {
     product_id: product.product_id,
     num: getSafeProductNum(product.num),
     product_variant_id: product.product_variant_id,
-    product_option_item: normalizedOptions,
+    product_sku: productSku,
     selling_price: composedSellingPrice,
     original_price: manualOriginalPrice,
     tax_fee: product.tax_fee || "0.00",

package/lib/solution/VenueBooking/index.js

@@ -1077,7 +1077,7 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
               product_variant_id: 0,
               num: 1,
               product_bundle: [],
-              product_option_item: [],
+              product_sku: { option: [] },
               discount_list: [],
               custom_deposit_data: customDepositData,
               metadata: {}
@@ -1348,7 +1348,7 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
           (sum, pd) => sum + (pd.amount || 0),
           0
         );
-        const optionSum = (0, import_utils3.sumOptionUnitPrice)(product.product_option_item);
+        const optionSum = (0, import_utils3.sumOptionUnitPrice)((0, import_utils3.getProductSkuOptions)(product));
         const sourcePrice = ((_d = product.metadata) == null ? void 0 : _d.source_product_price) ?? (((_e = product.metadata) == null ? void 0 : _e.main_product_original_price) != null ? new import_decimal.default(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : product.original_price ?? "0");
         const newSourceSellingPrice = new import_decimal.default(Number(sourcePrice) || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
         const newMainSellingPrice = new import_decimal.default(Number(newSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);

package/lib/solution/VenueBooking/sales-section-4-annotated.json

@@ -71,8 +71,6 @@
         "num__comment": "数量；int；↕；必填。统一使用 num，不再使用 product_quantity。",
         "product_variant_id": 0,
         "product_variant_id__comment": "多规格 ID；int；↕；可选。",
-        "product_option_item": [],
-        "product_option_item__comment": "选项配置；array；↕；可选。",
         "selling_price": "50.00",
         "selling_price__comment": "销售单价（交易快照）；string；←；服务端返回，不能依赖基准数据回填。",
         "original_price": "60.00",

package/package.json

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

package/dist/solution/Checkout/appointmentDemo.json

@@ -1 +0,0 @@
-{"type":"appointment_booking","platform":"PC","sales_channel":"my_pisel","order_sales_channel":"online_store","bookings":[{"id":0,"number":1,"registration_type":"all","relation_products":[],"is_all":false,"product":{"num":1,"product_id":61170,"product_variant_id":0,"product_bundle":[],"product_option_item":[],"discount_list":[{"amount":100,"type":"good_pass","discount":{"resource_id":64523,"title":{"auto":"玄-商品券","original":"玄-商品券","en":null,"zh-CN":null,"zh-HK":null},"original_amount":100,"product_id":61170,"percent":"1.00"}}]},"sub_type":"minutes","duration":480,"like_status":"common","resources":[{"relation_type":"form","like_status":"common","form_id":35,"relation_id":40357,"capacity":1,"metadata":{"combined_resource":{"status":1,"resource_ids":[40262,40263]},"form_name":"桌台","resource_name":"组合资源测试table-0422-01"},"children":[{"relation_type":"form","like_status":"common","id":40262,"main_field":"A01（组合资源-小桌-4 人）","resourceType":"single","form_id":35,"relation_id":40262,"capacity":1,"metadata":{"combined_resource":null,"form_name":"桌台","resource_name":"A01（组合资源-小桌-4 人）"}},{"relation_type":"form","like_status":"common","id":40263,"main_field":"A02（组合资源-小桌-4 人）","resourceType":"single","form_id":35,"relation_id":40263,"capacity":0,"metadata":{"combined_resource":null,"form_name":"桌台","resource_name":"A02（组合资源-小桌-4 人）"}}]},{"relation_type":"form","like_status":"common","form_id":214,"relation_id":38350,"capacity":1,"metadata":{"combined_resource":null,"form_name":"校区2","resource_name":"West Campus"}}],"schedule_id":0,"start_date":"2025-08-22","start_time":"09:00","select_date":"2025-08-22","end_time":"17:00","end_date":"2025-08-22","metadata":{"account":{"id":13433,"username":"a a"},"capacity":[{"id":0,"value":1,"name":""}]},"holder":null,"relation_forms":[]}],"shop_note":"","schedule_date":"2025-08-22 09:00:00","is_deposit":0,"relation_products":[],"relation_forms":[]}

package/lib/solution/Checkout/appointmentDemo.json

@@ -1 +0,0 @@
-{"type":"appointment_booking","platform":"PC","sales_channel":"my_pisel","order_sales_channel":"online_store","bookings":[{"id":0,"number":1,"registration_type":"all","relation_products":[],"is_all":false,"product":{"num":1,"product_id":61170,"product_variant_id":0,"product_bundle":[],"product_option_item":[],"discount_list":[{"amount":100,"type":"good_pass","discount":{"resource_id":64523,"title":{"auto":"玄-商品券","original":"玄-商品券","en":null,"zh-CN":null,"zh-HK":null},"original_amount":100,"product_id":61170,"percent":"1.00"}}]},"sub_type":"minutes","duration":480,"like_status":"common","resources":[{"relation_type":"form","like_status":"common","form_id":35,"relation_id":40357,"capacity":1,"metadata":{"combined_resource":{"status":1,"resource_ids":[40262,40263]},"form_name":"桌台","resource_name":"组合资源测试table-0422-01"},"children":[{"relation_type":"form","like_status":"common","id":40262,"main_field":"A01（组合资源-小桌-4 人）","resourceType":"single","form_id":35,"relation_id":40262,"capacity":1,"metadata":{"combined_resource":null,"form_name":"桌台","resource_name":"A01（组合资源-小桌-4 人）"}},{"relation_type":"form","like_status":"common","id":40263,"main_field":"A02（组合资源-小桌-4 人）","resourceType":"single","form_id":35,"relation_id":40263,"capacity":0,"metadata":{"combined_resource":null,"form_name":"桌台","resource_name":"A02（组合资源-小桌-4 人）"}}]},{"relation_type":"form","like_status":"common","form_id":214,"relation_id":38350,"capacity":1,"metadata":{"combined_resource":null,"form_name":"校区2","resource_name":"West Campus"}}],"schedule_id":0,"start_date":"2025-08-22","start_time":"09:00","select_date":"2025-08-22","end_time":"17:00","end_date":"2025-08-22","metadata":{"account":{"id":13433,"username":"a a"},"capacity":[{"id":0,"value":1,"name":""}]},"holder":null,"relation_forms":[]}],"shop_note":"","schedule_date":"2025-08-22 09:00:00","is_deposit":0,"relation_products":[],"relation_forms":[]}