@pisell/pisellos 2.2.278 → 2.2.279

package/dist/solution/BookingByStep/types.d.ts

@@ -1,4 +1,4 @@
-import { ProductList, CartModule, ProductData, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, SalesSummaryModule, ScheduleModule, ScanOrderLoggerModule } from '../../modules';
+import { ProductList, CartModule, ProductData, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, SalesSummaryModule, ScheduleModule, ScanOrderLoggerModule, HolderModule } from '../../modules';
 export interface BookingByStepState {
     cart: CartModule;
     summary: SummaryModule;
@@ -16,6 +16,7 @@ export interface BookingByStepState {
     schedule: ScheduleModule;
     salesSummary?: SalesSummaryModule;
     scanOrderLogger?: ScanOrderLoggerModule;
+    holder: HolderModule;
 }
 export declare function createModule<T extends keyof BookingByStepState>(moduleName: T, solutionName: string, name?: string, version?: string): BookingByStepState[T];
 export declare enum BookingByStepHooks {

package/dist/solution/BookingByStep/types.js

@@ -1,4 +1,4 @@
-import { ProductList, CartModule, AccountListModule, DateModule, OrderModule, PaymentModule, StepModule, SummaryModule, SalesSummaryModule, ScheduleModule, ScanOrderLoggerModule } from "../../modules";
+import { ProductList, CartModule, AccountListModule, DateModule, OrderModule, PaymentModule, StepModule, SummaryModule, SalesSummaryModule, ScheduleModule, ScanOrderLoggerModule, HolderModule } from "../../modules";
 export function createModule(moduleName, solutionName, name, version) {
   switch (moduleName) {
     case 'cart':
@@ -23,6 +23,8 @@ export function createModule(moduleName, solutionName, name, version) {
       return new ScheduleModule("".concat(solutionName, "_").concat(name || moduleName), version);
     case 'scanOrderLogger':
       return new ScanOrderLoggerModule("".concat(solutionName, "_").concat(name || moduleName), version);
+    case 'holder':
+      return new HolderModule("".concat(solutionName, "_").concat(name || moduleName), version);
     default:
       throw new Error("Unknown module type: ".concat(moduleName));
   }

package/dist/solution/BookingByStep/utils/capacity.js

@@ -23,11 +23,27 @@ export var formatDefaultCapacitys = function formatDefaultCapacitys(_ref) {
     product_bundle = _ref.product_bundle;
   if ((capacity === null || capacity === void 0 ? void 0 : capacity.type) === 'package') {
     return (product_bundle || []).map(function (d) {
+      var _window;
       var id = d.bundle_product_id;
       var variantId = d.bundle_variant_id;
       var item = ((capacity === null || capacity === void 0 ? void 0 : capacity.package) || []).find(function (item) {
-        return item.product_id === id || item.product_id === variantId;
+        return item.product_id == id || item.product_id == variantId;
       });
+      if (!item && (_window = window) !== null && _window !== void 0 && _window.sendWarningLog) {
+        window.sendWarningLog({
+          title: '未找到套餐 capacity 配置',
+          content: [{
+            key: 'product_id',
+            value: id
+          }, {
+            key: 'variant_id',
+            value: variantId
+          }, {
+            key: 'package',
+            value: JSON.stringify((capacity === null || capacity === void 0 ? void 0 : capacity.package) || [])
+          }]
+        });
+      }
       return {
         id: id,
         value: item ? d.num || 0 : 0,

package/dist/solution/BookingByStep/utils/timeslots.d.ts

@@ -19,10 +19,12 @@ export declare function calculateResourceAvailableTime({ resource, timeSlots, cu
  * @param countMap 已预约数量映射
  * @returns 最快可用的资源
  */
-export declare function findFastestAvailableResource({ resources, currentCapacity, countMap, }: {
+export declare function findFastestAvailableResource({ resources, currentCapacity, countMap, targetDate, durationMinutes, }: {
     resources: ResourceItem[];
     currentCapacity?: number;
     countMap?: Record<number, number>;
+    targetDate?: string | Dayjs;
+    durationMinutes?: number;
 }): ResourceItem | null;
 /**
  * 给定一个时间列表，通过开始和结束时间过滤出符合条件的时间段

package/dist/solution/BookingByStep/utils/timeslots.js

@@ -91,8 +91,14 @@ export function findFastestAvailableResource(_ref2) {
     _ref2$currentCapacity = _ref2.currentCapacity,
     currentCapacity = _ref2$currentCapacity === void 0 ? 1 : _ref2$currentCapacity,
     _ref2$countMap = _ref2.countMap,
-    countMap = _ref2$countMap === void 0 ? {} : _ref2$countMap;
+    countMap = _ref2$countMap === void 0 ? {} : _ref2$countMap,
+    targetDate = _ref2.targetDate,
+    _ref2$durationMinutes = _ref2.durationMinutes,
+    durationMinutes = _ref2$durationMinutes === void 0 ? 30 : _ref2$durationMinutes;
   var currentTime = dayjs();
+  var resolvedDuration = durationMinutes > 0 ? durationMinutes : 30;
+  var targetDay = targetDate ? dayjs(targetDate) : currentTime;
+  var isTargetDayToday = targetDay.isSame(currentTime, 'day');
   var fastestTime = null;
   var fastestResources = [];
   console.log('[TimeslotUtils] 查找最快可用资源:', {
@@ -108,17 +114,18 @@ export function findFastestAvailableResource(_ref2) {
   try {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
       var _resource = _step2.value;
-      // 获取资源当天且还在工作时间内的时间段
-      var todayTimes = _resource.times.filter(function (time) {
-        var isToday = dayjs(time.start_at).isSame(currentTime, 'day');
-        var isStillWorking = dayjs(time.end_at).isAfter(currentTime);
-        return isToday && isStillWorking;
+      // 获取资源在目标日期且还在工作时间内的时间段
+      var targetDayTimes = _resource.times.filter(function (time) {
+        var isSameTargetDay = dayjs(time.start_at).isSame(targetDay, 'day');
+        if (!isSameTargetDay) return false;
+        if (!isTargetDayToday) return true;
+        return dayjs(time.end_at).isAfter(currentTime);
       });
-      if (todayTimes.length === 0) {
+      if (targetDayTimes.length === 0) {
         console.log("[TimeslotUtils] \u8D44\u6E90 ".concat(_resource.id, "(").concat(_resource.main_field, ") \u4ECA\u65E5\u65E0\u53EF\u7528\u65F6\u95F4\u6BB5"));
         continue;
       }
-      var _iterator4 = _createForOfIteratorHelper(todayTimes),
+      var _iterator4 = _createForOfIteratorHelper(targetDayTimes),
         _step4;
       try {
         var _loop = function _loop() {
@@ -128,7 +135,7 @@ export function findFastestAvailableResource(_ref2) {
             var workEndTime = dayjs(time.end_at);
 
             // 确定检查的起始时间（当前时间 vs 工作开始时间）
-            var nextAvailableTime = currentTime.isBefore(workStartTime) ? workStartTime : currentTime;
+            var nextAvailableTime = isTargetDayToday && currentTime.isAfter(workStartTime) ? currentTime : workStartTime;
             console.log("[TimeslotUtils] \u68C0\u67E5\u8D44\u6E90 ".concat(_resource.id, "(").concat(_resource.main_field, "):"), {
               workTime: "".concat(workStartTime.format('HH:mm'), "-").concat(workEndTime.format('HH:mm')),
               checkStartTime: nextAvailableTime.format('HH:mm:ss'),
@@ -165,7 +172,7 @@ export function findFastestAvailableResource(_ref2) {
                 // 检查资源类型和容量
                 if (_resource.resourceType === 'single' || (_resource.capacity || 1) === 1) {
                   // 单人预约资源：检查时间冲突
-                  if (finalAvailableTime.isBefore(_eventEnd) && _eventStart.isBefore(finalAvailableTime.add(30, 'minute'))) {
+                  if (finalAvailableTime.isBefore(_eventEnd) && _eventStart.isBefore(finalAvailableTime.add(resolvedDuration, 'minute'))) {
                     // 有冲突，使用事件结束时间
                     finalAvailableTime = _eventEnd;
                     console.log("[TimeslotUtils] \u53D1\u73B0\u65F6\u95F4\u51B2\u7A81\uFF0C\u8C03\u6574\u5230: ".concat(finalAvailableTime.format('HH:mm:ss')));
@@ -177,7 +184,7 @@ export function findFastestAvailableResource(_ref2) {
                   var eventUsedCapacity = _event.pax || 1;
 
                   // 如果在事件时间范围内，检查容量是否足够
-                  if (finalAvailableTime.isBefore(_eventEnd) && _eventStart.isBefore(finalAvailableTime.add(30, 'minute'))) {
+                  if (finalAvailableTime.isBefore(_eventEnd) && _eventStart.isBefore(finalAvailableTime.add(resolvedDuration, 'minute'))) {
                     var totalRequiredCapacity = currentUsedCapacity + currentCapacity + eventUsedCapacity;
                     if (totalRequiredCapacity > totalCapacity) {
                       // 容量不足，使用事件结束时间
@@ -194,7 +201,7 @@ export function findFastestAvailableResource(_ref2) {
             } finally {
               _iterator5.f();
             }
-            if (finalAvailableTime.isAfter(workEndTime)) {
+            if (finalAvailableTime.add(resolvedDuration, 'minute').isAfter(workEndTime)) {
               console.log("[TimeslotUtils] \u8D44\u6E90 ".concat(_resource.id, " \u53EF\u7528\u65F6\u95F4\u8D85\u51FA\u5DE5\u4F5C\u65F6\u95F4\uFF0C\u8DF3\u8FC7"));
               return 0; // continue
             }

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

@@ -29,6 +29,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     private addTimeProductsCatalog;
     private orderCustomerDiscountRefreshInFlight;
     private orderCustomerDiscountRefreshCustomerId;
+    private orderCustomerPromotionRefreshInFlight;
     private loadOpenDataConfigInFlight;
     /**
      * 在 BaseSales 默认模块清单（products/order/salesSummary/schedule）基础上追加 customer + bookingContext。
@@ -63,6 +64,8 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     scanPromotionCode(code: string, customerId?: number): Promise<BaseSalesScanCodeResult>;
     private hydrateOrderCustomerFromScanDiscounts;
     private getDiscountCustomerId;
+    resolveCustomerById(customerId: string | number): Promise<ICustomer | null>;
+    /** 兼容既有优惠码扫码逻辑。 */
     private resolveCustomerByDiscountCustomerId;
     private findCustomerById;
     private normalizeCustomer;
@@ -282,7 +285,8 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     restoreOrder(): Promise<import("../../modules/Order/types").OrderTempOrder>;
     /** 内部：基于 OrderModule 当前状态构造一份 OrderCustomerChangePayload。 */
     private buildOrderCustomerPayload;
-    private refreshDiscountConfigAfterOrderCustomerChange;
+    protected refreshDiscountConfigAfterOrderCustomerChange(customerId: number | null): Promise<void>;
+    protected waitForOrderCustomerPromotionRefresh(): Promise<void>;
     /**
      * 获取客户分页信息
      * @returns 分页信息
@@ -445,7 +449,19 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
+        action: "reloadCatalog";
+    } | {
+        action: "add";
+        cacheItem: any;
+    } | {
+        action: "requiresDetail";
+        payload: AddProductRequiresDetailPayload;
+    } | {
+        action: "requiresBookingEdit";
+        cacheItem: any;
+        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
+    };
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**

package/dist/solution/BookingTicket/index.js

@@ -52,6 +52,7 @@ import { resolveBestAddTimePlan as _resolveBestAddTimePlan } from "./utils/resol
 import { createUuidV4 } from "../../modules/Order/utils";
 var OPEN_DATA_SECTION_CODES = ['sale', 'reservation', 'fulfillment', 'menu', 'workflow'];
 var OPEN_DATA_CACHE_TTL = 5 * 60 * 1000;
+var USER_PLATFORM = ['pc', 'h5'];
 
 /**
  * 读取已有 booking 的协议唯一值，用于加时商品行绑定原预约。
@@ -178,6 +179,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     _defineProperty(_assertThisInitialized(_this), "addTimeProductsCatalog", []);
     _defineProperty(_assertThisInitialized(_this), "orderCustomerDiscountRefreshInFlight", null);
     _defineProperty(_assertThisInitialized(_this), "orderCustomerDiscountRefreshCustomerId", null);
+    _defineProperty(_assertThisInitialized(_this), "orderCustomerPromotionRefreshInFlight", null);
     _defineProperty(_assertThisInitialized(_this), "loadOpenDataConfigInFlight", null);
     return _this;
   }
@@ -400,35 +402,35 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     value: function () {
       var _configureIdGeneratorFromOpenData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
         var _openDataConfig, _openDataConfig2, _openDataConfig3, _openDataConfig4, _openDataConfig5, _openDataConfig6;
-        var openDataConfig, idGenerator, receiptSequenceLength, receiptSequenceStart, prefix, shopOrderPrefix, resetReceiptSequenceDaily, operatingDayBoundary, deviceId, businessCode;
+        var idGenerator, openDataConfig, receiptSequenceLength, receiptSequenceStart, prefix, shopOrderPrefix, resetReceiptSequenceDaily, operatingDayBoundary, deviceId, businessCode;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
               // 业务码切换或配置失败时不能复用上一次初始化的短号。
               this.setPaymentNumberDevicePrefix(null);
-              openDataConfig = null;
-              _context5.prev = 2;
-              _context5.next = 5;
-              return this.loadOpenDataConfig();
-            case 5:
-              openDataConfig = _context5.sent;
-              _context5.next = 12;
-              break;
-            case 8:
-              _context5.prev = 8;
-              _context5.t0 = _context5["catch"](2);
-              console.warn('[BookingTicket] OpenData 配置加载失败，跳过 idGenerator 配置', _context5.t0);
-              return _context5.abrupt("return");
-            case 12:
-              // if (!openDataConfig) return;
               idGenerator = this.getIdGeneratorPlugin();
               if (idGenerator !== null && idGenerator !== void 0 && idGenerator.configure) {
-                _context5.next = 16;
+                _context5.next = 5;
                 break;
               }
               console.warn('[BookingTicket] idGenerator 插件不可用，跳过配置');
               return _context5.abrupt("return");
+            case 5:
+              openDataConfig = null;
+              _context5.prev = 6;
+              _context5.next = 9;
+              return this.loadOpenDataConfig();
+            case 9:
+              openDataConfig = _context5.sent;
+              _context5.next = 16;
+              break;
+            case 12:
+              _context5.prev = 12;
+              _context5.t0 = _context5["catch"](6);
+              console.warn('[BookingTicket] OpenData 配置加载失败，跳过 idGenerator 配置', _context5.t0);
+              return _context5.abrupt("return");
             case 16:
+              // if (!openDataConfig) return;
               receiptSequenceLength = this.normalizePositiveInteger((_openDataConfig = openDataConfig) === null || _openDataConfig === void 0 ? void 0 : _openDataConfig['sale.short_number_digits'], 5);
               receiptSequenceStart = this.normalizePositiveInteger((_openDataConfig2 = openDataConfig) === null || _openDataConfig2 === void 0 ? void 0 : _openDataConfig2['sale.short_number_start_number'], 1);
               prefix = this.normalizeIdPrefix((_openDataConfig3 = openDataConfig) === null || _openDataConfig3 === void 0 ? void 0 : _openDataConfig3['sale.short_number_prefix'], '');
@@ -475,7 +477,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[2, 8], [30, 35]]);
+        }, _callee5, this, [[6, 12], [30, 35]]);
       }));
       function configureIdGeneratorFromOpenData() {
         return _configureIdGeneratorFromOpenData.apply(this, arguments);
@@ -559,7 +561,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     key: "scanPromotionCode",
     value: function () {
       var _scanPromotionCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(code, customerId) {
-        var raw, scannedList, extractedCustomerId, hasOrderCustomer, tempOrder;
+        var raw, scannedList, extractedCustomerId, hasOrderCustomer, isUserPlatform, tempOrder;
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
@@ -575,33 +577,34 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               raw = _context7.sent;
               scannedList = raw.scannedDiscountList || [];
               extractedCustomerId = this.getDiscountCustomerId(scannedList);
-              hasOrderCustomer = Boolean(this.store.order.getOrderCustomer()); // 缺 Holder 等场景 isAvailable=false，但仍需把 Pass 归属客户带入订单，供 Holder 弹窗使用。
-              if (!(!hasOrderCustomer && extractedCustomerId)) {
-                _context7.next = 11;
+              hasOrderCustomer = Boolean(this.store.order.getOrderCustomer());
+              isUserPlatform = USER_PLATFORM.includes(this.otherParams.platform); // 缺 Holder 等场景 isAvailable=false，但仍需把 Pass 归属客户带入订单，供 Holder 弹窗使用。
+              if (!(!hasOrderCustomer && extractedCustomerId && !isUserPlatform)) {
+                _context7.next = 12;
                 break;
               }
-              _context7.next = 11;
+              _context7.next = 12;
               return this.hydrateOrderCustomerFromScanDiscounts(scannedList);
-            case 11:
+            case 12:
               if (!raw.isAvailable) {
-                _context7.next = 18;
+                _context7.next = 19;
                 break;
               }
-              _context7.next = 14;
+              _context7.next = 15;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
-            case 14:
+            case 15:
               this.store.order.persistTempOrder();
               tempOrder = this.store.order.ensureTempOrder();
-              _context7.next = 18;
+              _context7.next = 19;
               return this.effectsEmit('onDiscountApplied', {
                 productList: tempOrder.products || [],
                 discountList: this.store.order.getDiscountList(),
                 selectedDiscountList: tempOrder.discount_list || [],
                 tempOrder: tempOrder
               });
-            case 18:
+            case 19:
               return _context7.abrupt("return", _objectSpread(_objectSpread({
                 isAvailable: raw.isAvailable
               }, raw.isAccepted !== undefined ? {
@@ -611,7 +614,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                 unavailableReason: raw.unavailableReason,
                 scannedDiscountList: raw.scannedDiscountList
               }));
-            case 19:
+            case 20:
             case "end":
               return _context7.stop();
           }
@@ -688,11 +691,11 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
       return null;
     }
   }, {
-    key: "resolveCustomerByDiscountCustomerId",
+    key: "resolveCustomerById",
     value: function () {
-      var _resolveCustomerByDiscountCustomerId = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(customerId) {
+      var _resolveCustomerById = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(customerId) {
         var _result$list;
-        var localCustomers, localCustomer, normalizedLocalCustomer, result, remoteCustomer;
+        var localCustomers, localCustomer, normalizedLocalCustomer, result, remoteCustomer, detailCustomer;
         return _regeneratorRuntime().wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
@@ -714,18 +717,42 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
             case 7:
               result = _context9.sent;
               remoteCustomer = this.findCustomerById((result === null || result === void 0 ? void 0 : result.list) || [], customerId) || (result === null || result === void 0 || (_result$list = result.list) === null || _result$list === void 0 ? void 0 : _result$list[0]) || null;
-              return _context9.abrupt("return", remoteCustomer ? this.normalizeCustomer(remoteCustomer) : null);
-            case 10:
+              if (!remoteCustomer) {
+                _context9.next = 11;
+                break;
+              }
+              return _context9.abrupt("return", this.normalizeCustomer(remoteCustomer));
+            case 11:
+              _context9.prev = 11;
+              _context9.next = 14;
+              return this.store.customer.queryCustomerDetail(customerId);
+            case 14:
+              detailCustomer = _context9.sent;
+              return _context9.abrupt("return", detailCustomer ? this.normalizeCustomer(detailCustomer) : null);
+            case 18:
+              _context9.prev = 18;
+              _context9.t0 = _context9["catch"](11);
+              console.warn('[BookingTicket] resolveCustomerById detail request failed', {
+                customerId: customerId,
+                error: _context9.t0
+              });
+              return _context9.abrupt("return", null);
+            case 22:
             case "end":
               return _context9.stop();
           }
-        }, _callee9, this);
+        }, _callee9, this, [[11, 18]]);
       }));
-      function resolveCustomerByDiscountCustomerId(_x6) {
-        return _resolveCustomerByDiscountCustomerId.apply(this, arguments);
+      function resolveCustomerById(_x6) {
+        return _resolveCustomerById.apply(this, arguments);
       }
-      return resolveCustomerByDiscountCustomerId;
-    }()
+      return resolveCustomerById;
+    }() /** 兼容既有优惠码扫码逻辑。 */
+  }, {
+    key: "resolveCustomerByDiscountCustomerId",
+    value: function resolveCustomerByDiscountCustomerId(customerId) {
+      return this.resolveCustomerById(customerId);
+    }
   }, {
     key: "findCustomerById",
     value: function findCustomerById() {
@@ -1532,7 +1559,8 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "setOrderCustomer",
     value: function setOrderCustomer(customer) {
-      var _this$store$order$get3;
+      var _this$store$order$get3,
+        _this3 = this;
       if (!customer) {
         this.clearOrderCustomer();
         return;
@@ -1561,8 +1589,17 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
       this.core.effects.emit("".concat(this.name, ":onOrderCustomerChange"), next);
       this.refreshDiscountConfigAfterOrderCustomerChange(patch.customer_id);
       // 客户切换可能改变可用促销/赠品；触发一次重算（recursion-safe）。
-      void this.store.order.applyPromotion().catch(function (error) {
+      var promotionRefreshTask = this.store.order.applyPromotion().then(function () {
+        return undefined;
+      });
+      this.orderCustomerPromotionRefreshInFlight = promotionRefreshTask;
+      void promotionRefreshTask.then(function () {
+        if (_this3.orderCustomerPromotionRefreshInFlight !== promotionRefreshTask) return;
+        _this3.orderCustomerPromotionRefreshInFlight = null;
+      }, function (error) {
         console.error('[BookingTicket] applyPromotion after customer change failed', error);
+        if (_this3.orderCustomerPromotionRefreshInFlight !== promotionRefreshTask) return;
+        _this3.orderCustomerPromotionRefreshInFlight = null;
       });
     }
 
@@ -1592,7 +1629,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     value: function clearOrderCustomer() {
       var _discountModule$setOr,
         _discountModule$setDi,
-        _this3 = this;
+        _this4 = this;
       this.store.order.clearOrderCustomer();
       this.discountConfigCacheKey = null;
       this.hasManualDiscountSelection = false;
@@ -1605,9 +1642,9 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
         createIfMissing: true
       }).then(function () {
         var _discountModule$getDi;
-        var tempOrder = _this3.store.order.ensureTempOrder();
-        _this3.store.order.persistTempOrder();
-        return _this3.effectsEmit('onDiscountApplied', {
+        var tempOrder = _this4.store.order.ensureTempOrder();
+        _this4.store.order.persistTempOrder();
+        return _this4.effectsEmit('onDiscountApplied', {
           productList: tempOrder.products || [],
           discountList: (discountModule === null || discountModule === void 0 || (_discountModule$getDi = discountModule.getDiscountList) === null || _discountModule$getDi === void 0 ? void 0 : _discountModule$getDi.call(discountModule)) || [],
           selectedDiscountList: tempOrder.discount_list || [],
@@ -1668,14 +1705,15 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "refreshDiscountConfigAfterOrderCustomerChange",
     value: function refreshDiscountConfigAfterOrderCustomerChange(customerId) {
-      var _this4 = this;
-      if (!customerId || customerId === 1) return;
+      var _this5 = this;
+      if (!customerId || customerId === 1) return Promise.resolve();
       if (this.orderCustomerDiscountRefreshInFlight && this.orderCustomerDiscountRefreshCustomerId === customerId) {
-        return;
+        return this.orderCustomerDiscountRefreshInFlight;
       }
       var previousRefresh = this.orderCustomerDiscountRefreshInFlight;
       var refreshTask = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22() {
-        var currentCustomer;
+        var _this5$store$order$ge, _this5$store$order, _this5$getOrderIdenti;
+        var currentCustomer, tempOrder, orderId, action;
         return _regeneratorRuntime().wrap(function _callee22$(_context22) {
           while (1) switch (_context22.prev = _context22.next) {
             case 0:
@@ -1688,18 +1726,22 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                 return undefined;
               });
             case 3:
-              currentCustomer = _this4.store.order.getOrderCustomer();
+              currentCustomer = _this5.store.order.getOrderCustomer();
               if (!(!currentCustomer || Number(currentCustomer.customer_id) !== customerId)) {
                 _context22.next = 6;
                 break;
               }
               return _context22.abrupt("return");
             case 6:
-              _context22.next = 8;
-              return _this4.loadDiscountConfig({
-                customerId: customerId
+              tempOrder = (_this5$store$order$ge = (_this5$store$order = _this5.store.order).getTempOrder) === null || _this5$store$order$ge === void 0 ? void 0 : _this5$store$order$ge.call(_this5$store$order);
+              orderId = (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.order_id) || ((_this5$getOrderIdenti = _this5.getOrderIdentity) === null || _this5$getOrderIdenti === void 0 || (_this5$getOrderIdenti = _this5$getOrderIdenti.call(_this5)) === null || _this5$getOrderIdenti === void 0 ? void 0 : _this5$getOrderIdenti.orderId);
+              action = !orderId || String(orderId).startsWith('local_order') ? 'create' : 'edit';
+              _context22.next = 11;
+              return _this5.loadDiscountConfig({
+                customerId: customerId,
+                action: action
               });
-            case 8:
+            case 11:
             case "end":
               return _context22.stop();
           }
@@ -1710,10 +1752,16 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
       refreshTask.catch(function (error) {
         console.error('Failed to load discount config after customer change:', error);
       }).finally(function () {
-        if (_this4.orderCustomerDiscountRefreshInFlight !== refreshTask) return;
-        _this4.orderCustomerDiscountRefreshInFlight = null;
-        _this4.orderCustomerDiscountRefreshCustomerId = null;
+        if (_this5.orderCustomerDiscountRefreshInFlight !== refreshTask) return;
+        _this5.orderCustomerDiscountRefreshInFlight = null;
+        _this5.orderCustomerDiscountRefreshCustomerId = null;
       });
+      return refreshTask;
+    }
+  }, {
+    key: "waitForOrderCustomerPromotionRefresh",
+    value: function waitForOrderCustomerPromotionRefresh() {
+      return this.orderCustomerPromotionRefreshInFlight || Promise.resolve();
     }
 
     /**
@@ -1897,11 +1945,11 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "scanGlobalListener",
     value: function scanGlobalListener(callback) {
-      var _this5 = this;
+      var _this6 = this;
       var localSearch = function localSearch(v) {
-        return _this5.store.products.findProductsByCodeOrBarcode(v);
+        return _this6.store.products.findProductsByCodeOrBarcode(v);
       };
-      var scanCallback = handleGlobalScan(this.request, localSearch);
+      var scanCallback = handleGlobalScan(this.request, localSearch, this.getSubmitOrderSalesChannel());
       var safeCallback = function safeCallback(d) {
         try {
           callback(d);
@@ -2375,7 +2423,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     key: "handleGlobalScanCode",
     value: (function () {
       var _handleGlobalScanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(code, bridge) {
-        var _this6 = this;
+        var _this7 = this;
         var trimmed, _bridge$onNotify, _bridge$refresh, localSearch, scanCallback, raw, formatted, _bridge$onNotify2, _result7, _bridge$onNotify3;
         return _regeneratorRuntime().wrap(function _callee28$(_context28) {
           while (1) switch (_context28.prev = _context28.next) {
@@ -2393,9 +2441,9 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
             case 4:
               _context28.prev = 4;
               localSearch = function localSearch(v) {
-                return _this6.store.products.findProductsByCodeOrBarcode(v);
+                return _this7.store.products.findProductsByCodeOrBarcode(v);
               };
-              scanCallback = handleGlobalScan(this.request, localSearch);
+              scanCallback = handleGlobalScan(this.request, localSearch, this.getSubmitOrderSalesChannel());
               _context28.next = 9;
               return scanCallback({
                 type: 'nativeScanner',
@@ -2417,35 +2465,35 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               _context28.next = 16;
               return applyGlobalScan({
                 setOrderCustomer: function setOrderCustomer(customer) {
-                  return _this6.setOrderCustomer(customer);
+                  return _this7.setOrderCustomer(customer);
                 },
                 getOrderCustomerSnapshot: function getOrderCustomerSnapshot() {
-                  return _this6.getOrderCustomerSnapshot();
+                  return _this7.getOrderCustomerSnapshot();
                 },
                 getBusinessCode: function getBusinessCode() {
-                  var _this6$otherParams;
-                  return (_this6$otherParams = _this6.otherParams) === null || _this6$otherParams === void 0 ? void 0 : _this6$otherParams.businessCode;
+                  var _this7$otherParams;
+                  return (_this7$otherParams = _this7.otherParams) === null || _this7$otherParams === void 0 ? void 0 : _this7$otherParams.businessCode;
                 },
                 buildAddProductCtx: function buildAddProductCtx(extra) {
-                  return _this6.buildAddProductCtx(extra);
+                  return _this7.buildAddProductCtx(extra);
                 },
                 decideAddProduct: function decideAddProduct(item, options) {
-                  return _this6.decideAddProduct(item, options);
+                  return _this7.decideAddProduct(item, options);
                 },
                 decideAfterDetail: function decideAfterDetail(cacheItem, options) {
-                  return _this6.decideAfterDetail(cacheItem, options);
+                  return _this7.decideAfterDetail(cacheItem, options);
                 },
                 transformDetailToProductAndBooking: function transformDetailToProductAndBooking(input) {
-                  return _this6.transformDetailToProductAndBooking(input);
+                  return _this7.transformDetailToProductAndBooking(input);
                 },
                 addProductToOrder: function addProductToOrder(product, booking) {
-                  return _this6.addProductToOrder(product, booking);
+                  return _this7.addProductToOrder(product, booking);
                 },
                 refreshWalletAssets: function refreshWalletAssets(params) {
-                  return _this6.refreshWalletAssets(params);
+                  return _this7.refreshWalletAssets(params);
                 },
                 scanWalletAsset: function scanWalletAsset(scanCode) {
-                  return _this6.scanWalletAsset(scanCode);
+                  return _this7.scanWalletAsset(scanCode);
                 }
               }, formatted, bridge);
             case 16:
@@ -2584,7 +2632,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     key: "addAddTimeProductsToBooking",
     value: (function () {
       var _addAddTimeProductsToBooking = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30(input) {
-        var _this7 = this,
+        var _this8 = this,
           _input$bookingPatch;
         var bookingUid, orderLines, coveredMinutes, bookingTimePatch, result, _iterator2, _step2, line;
         return _regeneratorRuntime().wrap(function _callee30$(_context30) {
@@ -2599,7 +2647,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
             case 3:
               orderLines = (input.products || []).map(function (line) {
                 return {
-                  product: _this7.buildAddTimeOrderLine(line, bookingUid)
+                  product: _this8.buildAddTimeOrderLine(line, bookingUid)
                 };
               });
               if (this.store.order) {

package/dist/solution/BookingTicket/utils/scan/handleScan.d.ts

@@ -2,9 +2,11 @@ import { RequestPlugin } from '../../../../plugins';
 /**
  * 处理全局扫码
  * @param request 请求插件
+ * @param localSearch 本地商品搜索
+ * @param channel 当前销售渠道
  * @returns 处理结果
  */
-export declare const handleGlobalScan: (request: RequestPlugin, localSearch: (v: string) => any[]) => (scanResult: {
+export declare const handleGlobalScan: (request: RequestPlugin, localSearch: (v: string) => any[], channel?: string) => (scanResult: {
     type: string;
     value: string;
 }) => Promise<any>;