@pisell/pisellos 2.2.188 → 2.2.190

package/dist/solution/BookingTicket/utils/scan/scanProductValues.js

@@ -0,0 +1,150 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+/**
+ * 扫码商品条码预选规格纯函数（对齐 ticketBooking addServiceVariant/utils）。
+ */
+
+/** 套餐商品 */
+export function isScanProductBundle(item) {
+  return ((item === null || item === void 0 ? void 0 : item.bundle_group_count) || 0) > 0;
+}
+
+/** 单规格 / 选项组商品 */
+export function isScanProductOption(item) {
+  var _item$option_group;
+  return ((item === null || item === void 0 ? void 0 : item.option_group_count) || 0) > 0 || ((item === null || item === void 0 || (_item$option_group = item.option_group) === null || _item$option_group === void 0 ? void 0 : _item$option_group.length) || 0) > 0;
+}
+function formatVariantGroupTitle(title) {
+  var variantGroup = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  try {
+    return variantGroup.map(function (group) {
+      var value = title === null || title === void 0 ? void 0 : title[group === null || group === void 0 ? void 0 : group.position_id];
+      return value ? "".concat((group === null || group === void 0 ? void 0 : group.name) || '-', ": ").concat(value) : '';
+    }).filter(Boolean).join(', ');
+  } catch (_unused) {
+    return '';
+  }
+}
+function formatDataKey(data) {
+  var _next$option, _next$bundle;
+  var next = _objectSpread({}, data);
+  var key = "".concat(next.product_id);
+  var rowKey = key;
+  if (next.product_variant_id) {
+    var str = "_".concat(next.product_variant_id);
+    key += str;
+    rowKey += str;
+  }
+  if (next !== null && next !== void 0 && (_next$option = next.option) !== null && _next$option !== void 0 && _next$option.length) {
+    var _iterator = _createForOfIteratorHelper(next.option),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var item = _step.value;
+        var _str = "_".concat(item.option_group_id, "_").concat(item.product_option_item_id);
+        key += _str;
+        rowKey += "".concat(_str, "_").concat(item.quantity || item.num);
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+  }
+  if (next !== null && next !== void 0 && (_next$bundle = next.bundle) !== null && _next$bundle !== void 0 && _next$bundle.length) {
+    var _iterator2 = _createForOfIteratorHelper(next.bundle),
+      _step2;
+    try {
+      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+        var _item = _step2.value;
+        var _str2 = "_".concat(_item.group_id, "_").concat(_item.bundle_product_id);
+        key += _str2;
+        rowKey += "".concat(_str2, "_").concat(_item.quantity || _item.num);
+        if (_item !== null && _item !== void 0 && _item.option) {
+          var _iterator3 = _createForOfIteratorHelper(_item.option),
+            _step3;
+          try {
+            for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+              var opt = _step3.value;
+              var optStr = "_".concat(opt.option_group_id, "_").concat(opt.product_option_item_id);
+              key += optStr;
+              rowKey += "".concat(optStr, "_").concat(opt.quantity || opt.num);
+            }
+          } catch (err) {
+            _iterator3.e(err);
+          } finally {
+            _iterator3.f();
+          }
+        }
+      }
+    } catch (err) {
+      _iterator2.e(err);
+    } finally {
+      _iterator2.f();
+    }
+  }
+  if (next !== null && next !== void 0 && next.session) {
+    var _next$session;
+    var _str3 = "_".concat((_next$session = next.session) === null || _next$session === void 0 ? void 0 : _next$session.key);
+    key += _str3;
+    rowKey += _str3;
+  }
+  if (next !== null && next !== void 0 && next.schedule) {
+    var _next$schedule;
+    var _str4 = "_".concat((_next$schedule = next.schedule) === null || _next$schedule === void 0 ? void 0 : _next$schedule.key);
+    key += _str4;
+    rowKey += _str4;
+  }
+  next.key = key;
+  next.rowKey = rowKey;
+  return next;
+}
+
+/**
+ * 根据条码匹配 variant，生成 cartDetailValue（对齐 ticketBooking `genValues`）。
+ *
+ * @example
+ * ```ts
+ * const values = genScanProductValues(catalogItem, '6901234567890');
+ * const itemWithSelection = { ...catalogItem, cartDetailValue: values };
+ * ```
+ */
+export function genScanProductValues(item, code) {
+  var _item$variant_group, _item$option_group2;
+  var params = {
+    bundle: [],
+    option: [],
+    product_id: item.id,
+    product_variant_id: 0,
+    quantity: 1,
+    rowKey: '',
+    session: null
+  };
+  if (item !== null && item !== void 0 && (_item$variant_group = item.variant_group) !== null && _item$variant_group !== void 0 && _item$variant_group.length || item !== null && item !== void 0 && (_item$option_group2 = item.option_group) !== null && _item$option_group2 !== void 0 && _item$option_group2.length) {
+    var variantItem = (item.variant || []).find(function (v) {
+      return (v === null || v === void 0 ? void 0 : v.code) === code || (v === null || v === void 0 ? void 0 : v.barcode) === code;
+    });
+    if (variantItem) {
+      params.price = Number((variantItem === null || variantItem === void 0 ? void 0 : variantItem.price) || 0);
+      params.product_variant_id = variantItem.id;
+      params.product_option_string = formatVariantGroupTitle(variantItem === null || variantItem === void 0 ? void 0 : variantItem.title, (item === null || item === void 0 ? void 0 : item.variant_group) || []);
+    }
+  }
+  return formatDataKey(params);
+}
+
+/**
+ * 统计条码命中的 variant 数量（多命中时需弹窗选择）。
+ */
+export function countScanVariantMatches(item, code) {
+  return ((item === null || item === void 0 ? void 0 : item.variant) || []).filter(function (v) {
+    return (v === null || v === void 0 ? void 0 : v.code) === code || (v === null || v === void 0 ? void 0 : v.barcode) === code;
+  }).length;
+}

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

@@ -143,6 +143,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private saveDraftInBackground;
     private hydrateTempOrderFromLocalRecord;
     private extractOrderIdFromSubmitResult;
+    private calculatePaymentEffectiveAmount;
     private calculatePaymentTotal;
     private normalizePaymentSource;
     private updateTempOrderPaymentStatus;

package/lib/modules/Order/index.js

@@ -690,13 +690,16 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     var _a, _b;
     return ((_a = result == null ? void 0 : result.data) == null ? void 0 : _a.order_id) ?? (result == null ? void 0 : result.order_id) ?? ((_b = result == null ? void 0 : result.data) == null ? void 0 : _b.id) ?? (result == null ? void 0 : result.id) ?? null;
   }
+  calculatePaymentEffectiveAmount(payment) {
+    const amount = new import_decimal.default(payment.amount || 0).minus(new import_decimal.default(payment.service_fee || 0));
+    const rounding = new import_decimal.default(payment.rounding_amount || 0);
+    return amount.minus(rounding);
+  }
   calculatePaymentTotal(payments) {
     return (0, import_utils.mapPaymentItemsToOrderPayments)(payments, {
       includeVoided: false
     }).reduce((sum, payment) => {
-      const amount = new import_decimal.default(payment.amount || 0).minus(new import_decimal.default(payment.service_fee || 0));
-      const rounding = new import_decimal.default(payment.rounding_amount || 0);
-      return sum.plus(amount.minus(rounding));
+      return sum.plus(this.calculatePaymentEffectiveAmount(payment));
     }, new import_decimal.default(0));
   }
   normalizePaymentSource(payment, options) {
@@ -739,12 +742,14 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         return {
           customerPaidAmount: summary.customerPaidAmount.plus(paymentRecord.amount || 0),
           orderPaidAmount: summary.orderPaidAmount.plus(paymentRecord.origin_amount || 0),
+          gapPaidAmount: summary.gapPaidAmount.plus(this.calculatePaymentEffectiveAmount(paymentRecord)),
           payServiceChargeAmount: summary.payServiceChargeAmount.plus(this.calculatePaymentServiceFee(paymentRecord))
         };
       },
       {
         customerPaidAmount: new import_decimal.default(0),
         orderPaidAmount: new import_decimal.default(0),
+        gapPaidAmount: new import_decimal.default(0),
         payServiceChargeAmount: new import_decimal.default(0)
       }
     );
@@ -1078,7 +1083,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         amount_gap: this.calculateSummaryAmountGap({
           tempOrder,
           summary: (0, import_utils.createEmptySummary)(),
-          orderPaidAmount: paidPaymentSummary.orderPaidAmount
+          orderPaidAmount: paidPaymentSummary.gapPaidAmount
         }),
         pay_service_charge_amount: paidPaymentSummary.payServiceChargeAmount.toFixed(2)
       };
@@ -1100,7 +1105,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       amount_gap: this.calculateSummaryAmountGap({
         tempOrder,
         summary: salesSummaryResult,
-        orderPaidAmount: paidPaymentSummary.orderPaidAmount
+        orderPaidAmount: paidPaymentSummary.gapPaidAmount
       }),
       pay_service_charge_amount: paidPaymentSummary.payServiceChargeAmount.toFixed(2)
     };
@@ -1440,7 +1445,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   // ─── TempOrder: 商品 CRUD ───
   async addProductToOrder(product, booking) {
     var _a;
-    debugger;
     const tempOrder = this.ensureTempOrder();
     const linked = booking ? this.createLinkedProductAndBooking({ product, booking }) : null;
     const productToAdd = (linked == null ? void 0 : linked.product) || product;
@@ -1836,7 +1840,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * 应传 1，确保 /order/sales/checkout 返回打印所需数据。
    */
   async submitTempOrder(params) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     const tempOrder = this.ensureTempOrder();
     this.persistTempOrder();
     const effectiveCacheId = (params == null ? void 0 : params.cacheId) ?? this.cacheId;
@@ -1861,7 +1865,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       tempOrder,
       cacheId: effectiveCacheId,
       platform: (params == null ? void 0 : params.platform) || ((_a = this.otherParams) == null ? void 0 : _a.platform),
-      businessCode: params == null ? void 0 : params.businessCode,
+      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,
       type: params == null ? void 0 : params.type,
       enhance: enhancePayload
@@ -1875,7 +1879,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         externalSaleNumber: payload.external_sale_number,
         requestUniqueIdempotencyToken: payload.request_unique_idempotency_token,
         paymentStatus: payload.payment_status,
-        paymentsCount: ((_b = payload.payments) == null ? void 0 : _b.length) || 0,
+        paymentsCount: ((_d = payload.payments) == null ? void 0 : _d.length) || 0,
         smallTicketDataFlag: payload.small_ticket_data_flag
       });
       result = await this.submitSalesOrder({
@@ -1894,7 +1898,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         orderId: payload.order_id,
         externalSaleNumber: payload.external_sale_number,
         paymentStatus: payload.payment_status,
-        paymentsCount: ((_c = payload.payments) == null ? void 0 : _c.length) || 0
+        paymentsCount: ((_e = payload.payments) == null ? void 0 : _e.length) || 0
       });
       throw error;
     }
@@ -1983,6 +1987,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       payments: mappedPayments,
       paymentStatus,
       smallTicketDataFlag: params.smallTicketDataFlag,
+      businessCode: params.businessCode,
       channel: params.channel,
       enhancePayload: (payload) => {
         const nextPayload = {

package/lib/modules/Order/types.d.ts

@@ -439,6 +439,7 @@ export interface OrderPaymentMetadata {
     [key: string]: any;
 }
 export interface OrderPaymentData {
+    order_payment_id?: number | string;
     amount: string;
     code: string;
     custom_payment_id: number;
@@ -478,6 +479,7 @@ export interface SyncPaymentsToOrderParams {
     paymentStatus?: SubmitSalesOrderParams['query']['payment_status'];
     submitWhenPaid?: boolean;
     smallTicketDataFlag?: number;
+    businessCode?: string;
     channel?: string;
 }
 export interface SyncPaymentsToOrderResult<T = any> {

package/lib/modules/Order/utils.js

@@ -753,6 +753,7 @@ function mapPaymentItemToOrderPayment(paymentItem) {
     }
   }
   return {
+    ...item.order_payment_id !== void 0 ? { order_payment_id: item.order_payment_id } : {},
     amount: String(item.amount ?? "0.00"),
     code: String(item.code || ""),
     custom_payment_id: Number(customPaymentId ?? 0),

package/lib/solution/BaseSales/index.js

@@ -432,7 +432,6 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     const externalSaleNumber = params.externalSaleNumber || params.external_sale_number;
     if (!params.forceRemote) {
       const localRecord = params.orderId !== void 0 ? await this.store.order.getLocalOrderByOrderId(params.orderId) : externalSaleNumber ? await this.store.order.getLocalOrderByExternalSaleNumber(externalSaleNumber) : params.orderNumber ? await this.store.order.getLocalOrderByOrderNumber(params.orderNumber) : null;
-      debugger;
       if (localRecord) {
         const sales2 = await this.store.order.hydrateTempOrderFromRecord(localRecord, { recalcOnHydrate: false });
         this.currentSalesDetail = sales2;
@@ -1069,7 +1068,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 模块支持");
     }
@@ -1078,9 +1077,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 } : {},
@@ -1103,11 +1102,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();
@@ -1158,10 +1160,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)();
     }

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);
@@ -158,6 +159,13 @@ function transformBaseProductToOrderProduct(params) {
       discount_per: (_k = payload._extend) == null ? void 0 : _k.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 +178,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

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

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

@@ -7,6 +7,7 @@ import { BaseSalesImpl } from '../BaseSales';
 import type { BaseSalesScanCodeResult } from '../BaseSales/types';
 import type { ISalesDetail } from '../BaseSales/utils/parseSalesResponse';
 import type { LoadSalesDetailParams } from '../../modules/Order/types';
+import type { GlobalScanHandleResult, GlobalScanHostBridge } from './types';
 import { AddProductDecideContext, AddProductRequiresDetailPayload } from './utils/addProductDecision';
 import { type BuildCacheItemFromOrderLineInput } from '../../modules/BookingContext/utils/buildCacheItemFromOrderLine';
 import { type BuildNormalProductCacheItemFromOrderLineInput } from '../../modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine';
@@ -278,7 +279,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 客户状态
@@ -441,6 +442,20 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     buildNormalProductCacheItemFromOrderLine(input: BuildNormalProductCacheItemFromOrderLineInput): Record<string, any>;
     /** 文档别名：与 OrderModule.updateOrderProduct 一致。 */
     updateProductInOrder(params: UpdateOrderProductParams): Promise<OrderProduct[]>;
+    /**
+     * 全局扫码 pubsub 入口：解析码值 → 搜索 → 业务分发（客户 / 加车 / 开单）。
+     * UI 层在 pubsub 订阅回调里注入 `bridge`（uiHosts / action / cart.confirm*）。
+     *
+     * @example
+     * ```ts
+     * await bookingTicket.handleGlobalScanCode(payload.data, {
+     *   openProductDetail: uiHosts.openProductDetail,
+     *   confirmDetail: cart.confirmDetail,
+     *   openOrder: ({ order_id }) => action({ type: 'pisell1.handleOpenCachedBigSale', data: { order_id } }),
+     * });
+     * ```
+     */
+    handleGlobalScanCode(code: string, bridge?: GlobalScanHostBridge): Promise<GlobalScanHandleResult>;
     /**
      * 销毁模块：先调用父类（销毁所有 store 内子模块 + emit destroy + super.destroy()），
      * 再清理 BookingTicket 自有资源（scan 监听 + scan 内存缓存）。

package/lib/solution/BookingTicket/index.js

@@ -41,6 +41,8 @@ var import_scan = __toESM(require("./utils/scan"));
 var import_orderCustomer = require("./utils/orderCustomer");
 var import_handleScan = require("./utils/scan/handleScan");
 var import_scanCache = __toESM(require("./utils/scan/scanCache"));
+var import_formatGlobalScan = require("./utils/scan/formatGlobalScan");
+var import_applyGlobalScan = require("./utils/scan/applyGlobalScan");
 var import_cartView = require("./utils/cartView");
 var import_addProductDecision = require("./utils/addProductDecision");
 var import_buildCacheItemFromOrderLine = require("../../modules/BookingContext/utils/buildCacheItemFromOrderLine");
@@ -1017,6 +1019,60 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
   async updateProductInOrder(params) {
     return this.updateOrderProduct(params);
   }
+  /**
+   * 全局扫码 pubsub 入口：解析码值 → 搜索 → 业务分发（客户 / 加车 / 开单）。
+   * UI 层在 pubsub 订阅回调里注入 `bridge`（uiHosts / action / cart.confirm*）。
+   *
+   * @example
+   * ```ts
+   * await bookingTicket.handleGlobalScanCode(payload.data, {
+   *   openProductDetail: uiHosts.openProductDetail,
+   *   confirmDetail: cart.confirmDetail,
+   *   openOrder: ({ order_id }) => action({ type: 'pisell1.handleOpenCachedBigSale', data: { order_id } }),
+   * });
+   * ```
+   */
+  async handleGlobalScanCode(code, bridge) {
+    var _a, _b, _c, _d;
+    const trimmed = typeof code === "string" ? code.trim() : "";
+    if (!trimmed) {
+      (_a = bridge == null ? void 0 : bridge.onNotify) == null ? void 0 : _a.call(bridge, "fail", "pisell2.text.scan-global-failed");
+      return { status: "failed", reason: "empty_code" };
+    }
+    try {
+      const localSearch = (v) => this.store.products.findProductsByCodeOrBarcode(v);
+      const scanCallback = (0, import_handleScan.handleGlobalScan)(this.request, localSearch);
+      const raw = await scanCallback({ type: "nativeScanner", value: trimmed });
+      const formatted = (0, import_formatGlobalScan.formatGlobalScanResult)(raw, trimmed);
+      if (!formatted) {
+        (_b = bridge == null ? void 0 : bridge.onNotify) == null ? void 0 : _b.call(bridge, "fail", "pisell2.text.scan-global-failed");
+        return { status: "failed", reason: "not_found" };
+      }
+      const result = await (0, import_applyGlobalScan.applyGlobalScan)(
+        {
+          setOrderCustomer: (customer) => this.setOrderCustomer(customer),
+          getOrderCustomerSnapshot: () => this.getOrderCustomerSnapshot(),
+          getBusinessCode: () => {
+            var _a2;
+            return (_a2 = this.otherParams) == null ? void 0 : _a2.businessCode;
+          },
+          buildAddProductCtx: (extra) => this.buildAddProductCtx(extra),
+          decideAddProduct: (item, options) => this.decideAddProduct(item, options),
+          decideAfterDetail: (cacheItem, options) => this.decideAfterDetail(cacheItem, options),
+          transformDetailToProductAndBooking: (input) => this.transformDetailToProductAndBooking(input),
+          addProductToOrder: (product, booking) => this.addProductToOrder(product, booking)
+        },
+        formatted,
+        bridge
+      );
+      (_c = bridge == null ? void 0 : bridge.refresh) == null ? void 0 : _c.call(bridge);
+      return result;
+    } catch (error) {
+      console.error("[BookingTicket] handleGlobalScanCode failed", error);
+      (_d = bridge == null ? void 0 : bridge.onNotify) == null ? void 0 : _d.call(bridge, "fail", "pisell2.text.scan-global-failed");
+      return { status: "failed", reason: "not_found" };
+    }
+  }
   /**
    * 销毁模块：先调用父类（销毁所有 store 内子模块 + emit destroy + super.destroy()），
    * 再清理 BookingTicket 自有资源（scan 监听 + scan 内存缓存）。

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

@@ -134,3 +134,51 @@ export interface BookingTicketCustomerView {
 export interface BookingTicketProductCatalogView {
     products: ProductData[];
 }
+/** 扫码宿主桥接：SalesSdk 在 pubsub 订阅回调里注入，OS 需要 UI 时直接调用 */
+export interface GlobalScanHostBridge {
+    openProductDetail?: (payload: Record<string, any>) => Promise<any | null>;
+    openBookingEdit?: (payload: Record<string, any>) => Promise<any | null>;
+    confirmDetail?: (input: {
+        item: any;
+        detailResult: {
+            e: any;
+            extension_type?: any;
+            detail?: any;
+        };
+        options?: Record<string, any>;
+    }) => Promise<any>;
+    confirmBookingEdit?: (input: {
+        cacheItem: any;
+        options?: Record<string, any>;
+    }) => Promise<any>;
+    openOrder?: (data: {
+        order_id: number;
+        business_code?: string;
+    }) => void;
+    /**
+     * walk-in 扫 walletPass：直接核销优惠码（对齐 SaleDetail Voucher.handleApplyCode / cart.scanCode）。
+     */
+    applyPromotionCode?: (code: string, customerId?: number) => Promise<{
+        isAvailable?: boolean;
+        type?: string;
+        unavailableReason?: string;
+    }>;
+    onNotify?: (type: 'success' | 'fail' | 'info', messageKey?: string) => void;
+    refresh?: () => void;
+}
+/** handleGlobalScanCode 结构化返回 */
+export type GlobalScanHandleResult = {
+    status: 'success';
+    kind: 'customer' | 'products' | 'promotion';
+    meta?: {
+        count?: number;
+    };
+} | {
+    status: 'pending';
+    kind: 'openOrder' | 'requiresDetail' | 'requiresBookingEdit';
+} | {
+    status: 'cancelled';
+} | {
+    status: 'failed';
+    reason: 'empty_code' | 'not_found' | 'invalid_data' | 'no_bridge';
+};

package/lib/solution/BookingTicket/utils/scan/applyGlobalScan.d.ts

@@ -0,0 +1,36 @@
+import type { GlobalScanHandleResult, GlobalScanHostBridge, ICustomer } from '../../types';
+import type { AddProductDecision } from '../addProductDecision';
+import { GlobalScanFormattedResult } from './formatGlobalScan';
+/** applyGlobalScan 所需的 BookingTicket 运行时能力 */
+export interface GlobalScanApplyHost {
+    setOrderCustomer(customer: ICustomer | null): void;
+    getOrderCustomerSnapshot(): ICustomer | null;
+    getBusinessCode(): string | undefined;
+    buildAddProductCtx(extra?: Record<string, any>): Record<string, any>;
+    decideAddProduct(item: any, options?: Record<string, any>): AddProductDecision;
+    decideAfterDetail(cacheItem: any, options?: Record<string, any>): AddProductDecision;
+    transformDetailToProductAndBooking(input: {
+        item: any;
+        cacheItem?: any;
+        detailResult?: {
+            e: any;
+            extension_type?: any;
+            detail?: any;
+        };
+        options?: Record<string, any>;
+    }): {
+        product: any;
+        booking?: any;
+        cacheItem: any;
+    };
+    addProductToOrder(product: any, booking?: any): Promise<any>;
+}
+/**
+ * 应用全局扫码格式化结果：设客户 / 加车 / 开单 / 弹窗链。
+ *
+ * @example
+ * ```ts
+ * const result = await applyGlobalScan(bookingTicket, formatted, bridge);
+ * ```
+ */
+export declare function applyGlobalScan(host: GlobalScanApplyHost, formatted: GlobalScanFormattedResult, bridge?: GlobalScanHostBridge): Promise<GlobalScanHandleResult>;