@pisell/pisellos 0.10.42 → 0.10.43

package/dist/model/strategy/adapter/promotion/index.js

@@ -1,9 +0,0 @@
-// 导出评估器
-export { PromotionEvaluator } from "./evaluator";
-
-// 导出适配器
-export { PromotionAdapter } from "./adapter";
-export { default } from "./adapter";
-
-// 导出策略配置示例常量
-export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY, ITEM_REWARD_STRATEGY } from "./examples";

package/dist/modules/Order/index.d.ts

@@ -540,7 +540,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/dist/modules/Rules/index.js

@@ -1813,7 +1813,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
               // 计算折扣后的价格（使用 getDiscountAmount，内部已处理 maxDeductionAmount）
               var discountedPrice = getDiscountAmount(_selectedDiscount2, product.origin_total, product.origin_total);
-              var bundleDiscountAmount = new Decimal(product.origin_total || 0).minus(discountedPrice).toNumber();
+              var bundleDiscountAmountPerItem = new Decimal(product.origin_total || 0).minus(discountedPrice).toNumber();
+              var bundleDiscountAmount = new Decimal(bundleDiscountAmountPerItem).mul(_appliedUseCount).toNumber();
               debugger;
               var _discountDetail = {
                 amount: bundleDiscountAmount,

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

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -230,12 +230,16 @@ export interface GlobalScanHostBridge {
     /**
      * walk-in 扫 walletPass：直接核销优惠码（对齐 SaleDetail Voucher.handleApplyCode / cart.scanCode）。
      */
-    applyPromotionCode?: (code: string, customerId?: number) => Promise<{
+    applyPromotionCode?: (code: string, customerId?: number, options?: {
+        suppressFailureNotification?: boolean;
+    }) => Promise<{
         isAvailable?: boolean;
         isAccepted?: boolean;
         type?: string;
         unavailableReason?: string;
     }>;
+    /** 当前订单已有其他客户时，由宿主复用客户组件完成确认及切换。 */
+    requestCustomerSwitch?: (customer: ICustomer) => Promise<boolean | null>;
     onNotify?: (type: 'success' | 'fail' | 'info', messageKey?: string) => void;
     refresh?: () => void;
 }

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

@@ -206,35 +206,27 @@ export function applyGlobalScan(_x14, _x15, _x16) {
 }
 function _applyGlobalScan() {
   _applyGlobalScan = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(host, formatted, bridge) {
-    var searchType, data, scanCode, formattedCustomerId, isCrossShopWallet, _getRealCustomerId, _bridge$onNotify4, currentCustomer, _customer, sourceCustomerId, _bridge$onNotify, _bridge$onNotify2, _customerId, _bridge$onNotify3, orderCustomer, _promotionResult$isAc, snapshot, currentCustomerIsWalkIn, activeCustomer, bindWalletPassCustomer, trySelectWalletAsset, walletSelection, promotionResult, list, _bridge$onNotify10, addedCount, _iterator, _step, _item, outcome, _bridge$onNotify11, _data$order_id, _data$business_code, orderId, _bridge$onNotify12;
+    var searchType, data, scanCode, formattedCustomerId, isCrossShopWallet, isWalletPassUnavailableAtStore, _getRealCustomerId, _bridge$onNotify5, currentCustomer, currentCustomerId, _customer, sourceCustomerId, _bridge$onNotify, _bridge$onNotify2, _customerId, _bridge$onNotify3, orderCustomer, switched, _bridge$onNotify4, _promotionResult$isAc, _bridge$onNotify6, snapshot, activeCustomer, bindWalletPassCustomer, trySelectWalletAsset, bindResult, walletSelection, promotionCustomerId, promotionResult, list, _bridge$onNotify12, addedCount, _iterator, _step, _item, outcome, _bridge$onNotify13, _data$order_id, _data$business_code, orderId, _bridge$onNotify14;
     return _regeneratorRuntime().wrap(function _callee6$(_context6) {
       while (1) switch (_context6.prev = _context6.next) {
         case 0:
-          searchType = formatted.searchType, data = formatted.data, scanCode = formatted.scanCode, formattedCustomerId = formatted.customerId, isCrossShopWallet = formatted.isCrossShopWallet;
+          searchType = formatted.searchType, data = formatted.data, scanCode = formatted.scanCode, formattedCustomerId = formatted.customerId, isCrossShopWallet = formatted.isCrossShopWallet, isWalletPassUnavailableAtStore = formatted.isWalletPassUnavailableAtStore;
           if (!(searchType === 'wallet')) {
-            _context6.next = 29;
+            _context6.next = 44;
             break;
           }
           currentCustomer = host.getOrderCustomerSnapshot();
-          if (!(getRealCustomerId(currentCustomer) !== undefined)) {
-            _context6.next = 5;
-            break;
-          }
-          return _context6.abrupt("return", {
-            status: 'success',
-            kind: 'customer'
-          });
-        case 5:
+          currentCustomerId = getRealCustomerId(currentCustomer);
           _customer = data;
           if (!isCrossShopWallet) {
-            _context6.next = 21;
+            _context6.next = 20;
             break;
           }
           sourceCustomerId = getRealCustomerId({
             id: formattedCustomerId
           });
           if (!(sourceCustomerId === undefined || !host.resolveCustomerById)) {
-            _context6.next = 11;
+            _context6.next = 10;
             break;
           }
           bridge === null || bridge === void 0 || (_bridge$onNotify = bridge.onNotify) === null || _bridge$onNotify === void 0 || _bridge$onNotify.call(bridge, 'fail', 'pisell2.text.scan-global-failed');
@@ -242,28 +234,28 @@ function _applyGlobalScan() {
             status: 'failed',
             reason: 'invalid_data'
           });
-        case 11:
-          _context6.prev = 11;
-          _context6.next = 14;
+        case 10:
+          _context6.prev = 10;
+          _context6.next = 13;
           return host.resolveCustomerById(sourceCustomerId);
-        case 14:
+        case 13:
           _customer = _context6.sent;
-          _context6.next = 21;
+          _context6.next = 20;
           break;
-        case 17:
-          _context6.prev = 17;
-          _context6.t0 = _context6["catch"](11);
+        case 16:
+          _context6.prev = 16;
+          _context6.t0 = _context6["catch"](10);
           bridge === null || bridge === void 0 || (_bridge$onNotify2 = bridge.onNotify) === null || _bridge$onNotify2 === void 0 || _bridge$onNotify2.call(bridge, 'fail', getErrorMessage(_context6.t0) || 'pisell2.text.scan-global-failed');
           return _context6.abrupt("return", {
             status: 'failed',
             reason: 'invalid_data'
           });
-        case 21:
+        case 20:
           _customerId = (_getRealCustomerId = getRealCustomerId(_customer)) !== null && _getRealCustomerId !== void 0 ? _getRealCustomerId : !isCrossShopWallet ? getRealCustomerId({
             id: formattedCustomerId
           }) : undefined;
           if (!(!_customer || _customerId === undefined)) {
-            _context6.next = 25;
+            _context6.next = 24;
             break;
           }
           bridge === null || bridge === void 0 || (_bridge$onNotify3 = bridge.onNotify) === null || _bridge$onNotify3 === void 0 || _bridge$onNotify3.call(bridge, 'fail', 'pisell2.text.scan-global-failed');
@@ -271,37 +263,89 @@ function _applyGlobalScan() {
             status: 'failed',
             reason: 'invalid_data'
           });
-        case 25:
+        case 24:
           orderCustomer = _customer.id === undefined || _customer.id === null ? _objectSpread(_objectSpread({}, _customer), {}, {
             id: _customerId
           }) : _customer;
+          if (!(currentCustomerId === _customerId)) {
+            _context6.next = 27;
+            break;
+          }
+          return _context6.abrupt("return", {
+            status: 'success',
+            kind: 'customer'
+          });
+        case 27:
+          if (!(currentCustomerId !== undefined)) {
+            _context6.next = 41;
+            break;
+          }
+          if (bridge !== null && bridge !== void 0 && bridge.requestCustomerSwitch) {
+            _context6.next = 30;
+            break;
+          }
+          return _context6.abrupt("return", {
+            status: 'success',
+            kind: 'customer'
+          });
+        case 30:
+          _context6.prev = 30;
+          _context6.next = 33;
+          return bridge.requestCustomerSwitch(orderCustomer);
+        case 33:
+          switched = _context6.sent;
+          return _context6.abrupt("return", switched ? {
+            status: 'success',
+            kind: 'customer'
+          } : {
+            status: 'cancelled'
+          });
+        case 37:
+          _context6.prev = 37;
+          _context6.t1 = _context6["catch"](30);
+          (_bridge$onNotify4 = bridge.onNotify) === null || _bridge$onNotify4 === void 0 || _bridge$onNotify4.call(bridge, 'fail', getErrorMessage(_context6.t1) || 'pisell2.text.scan-global-failed');
+          return _context6.abrupt("return", {
+            status: 'failed',
+            reason: 'invalid_data'
+          });
+        case 41:
           host.setOrderCustomer(orderCustomer);
-          bridge === null || bridge === void 0 || (_bridge$onNotify4 = bridge.onNotify) === null || _bridge$onNotify4 === void 0 || _bridge$onNotify4.call(bridge, 'success', 'pisell2.text.add-client-success');
+          bridge === null || bridge === void 0 || (_bridge$onNotify5 = bridge.onNotify) === null || _bridge$onNotify5 === void 0 || _bridge$onNotify5.call(bridge, 'success', 'pisell2.text.add-client-success');
           return _context6.abrupt("return", {
             status: 'success',
             kind: 'customer'
           });
-        case 29:
+        case 44:
           if (!(searchType === 'walletPass')) {
-            _context6.next = 50;
+            _context6.next = 78;
+            break;
+          }
+          if (!isWalletPassUnavailableAtStore) {
+            _context6.next = 48;
             break;
           }
+          bridge === null || bridge === void 0 || (_bridge$onNotify6 = bridge.onNotify) === null || _bridge$onNotify6 === void 0 || _bridge$onNotify6.call(bridge, 'fail', 'pisell2.text.wallet-pass-not-available-at-store');
+          return _context6.abrupt("return", {
+            status: 'failed',
+            reason: 'invalid_data'
+          });
+        case 48:
           snapshot = host.getOrderCustomerSnapshot();
-          currentCustomerIsWalkIn = getRealCustomerId(snapshot) === undefined;
           activeCustomer = snapshot;
           bindWalletPassCustomer = /*#__PURE__*/function () {
             var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(asset) {
               var _getWalletAssetCustom, _host$refreshWalletAs;
-              var assetCustomerId, customer, _bridge$onNotify5, _bridge$onNotify6, customerId, _bridge$onNotify7, orderCustomer;
+              var assetCustomerId, customer, _bridge$onNotify7, _bridge$onNotify8, customerId, _bridge$onNotify9, orderCustomer;
               return _regeneratorRuntime().wrap(function _callee4$(_context4) {
                 while (1) switch (_context4.prev = _context4.next) {
                   case 0:
-                    if (currentCustomerIsWalkIn) {
+                    if (!(getRealCustomerId(activeCustomer) !== undefined)) {
                       _context4.next = 2;
                       break;
                     }
                     return _context4.abrupt("return", {
-                      resolveFailed: false
+                      resolveFailed: false,
+                      customerBound: false
                     });
                   case 2:
                     assetCustomerId = (_getWalletAssetCustom = getWalletAssetCustomerId(asset)) !== null && _getWalletAssetCustom !== void 0 ? _getWalletAssetCustom : getRealCustomerId({
@@ -316,9 +360,10 @@ function _applyGlobalScan() {
                       _context4.next = 8;
                       break;
                     }
-                    bridge === null || bridge === void 0 || (_bridge$onNotify5 = bridge.onNotify) === null || _bridge$onNotify5 === void 0 || _bridge$onNotify5.call(bridge, 'fail', 'pisell2.text.scan-global-failed');
+                    bridge === null || bridge === void 0 || (_bridge$onNotify7 = bridge.onNotify) === null || _bridge$onNotify7 === void 0 || _bridge$onNotify7.call(bridge, 'fail', 'pisell2.text.scan-global-failed');
                     return _context4.abrupt("return", {
-                      resolveFailed: true
+                      resolveFailed: true,
+                      customerBound: false
                     });
                   case 8:
                     _context4.prev = 8;
@@ -332,9 +377,10 @@ function _applyGlobalScan() {
                     _context4.prev = 14;
                     _context4.t0 = _context4["catch"](8);
                     console.warn('[GlobalScan] Wallet asset customer lookup failed', _context4.t0);
-                    bridge === null || bridge === void 0 || (_bridge$onNotify6 = bridge.onNotify) === null || _bridge$onNotify6 === void 0 || _bridge$onNotify6.call(bridge, 'fail', getErrorMessage(_context4.t0) || 'pisell2.text.scan-global-failed');
+                    bridge === null || bridge === void 0 || (_bridge$onNotify8 = bridge.onNotify) === null || _bridge$onNotify8 === void 0 || _bridge$onNotify8.call(bridge, 'fail', getErrorMessage(_context4.t0) || 'pisell2.text.scan-global-failed');
                     return _context4.abrupt("return", {
-                      resolveFailed: true
+                      resolveFailed: true,
+                      customerBound: false
                     });
                   case 19:
                     customerId = getRealCustomerId(customer);
@@ -343,10 +389,11 @@ function _applyGlobalScan() {
                       break;
                     }
                     if (assetCustomerId !== undefined) {
-                      bridge === null || bridge === void 0 || (_bridge$onNotify7 = bridge.onNotify) === null || _bridge$onNotify7 === void 0 || _bridge$onNotify7.call(bridge, 'fail', 'pisell2.text.scan-global-failed');
+                      bridge === null || bridge === void 0 || (_bridge$onNotify9 = bridge.onNotify) === null || _bridge$onNotify9 === void 0 || _bridge$onNotify9.call(bridge, 'fail', 'pisell2.text.scan-global-failed');
                     }
                     return _context4.abrupt("return", {
-                      resolveFailed: assetCustomerId !== undefined
+                      resolveFailed: assetCustomerId !== undefined,
+                      customerBound: false
                     });
                   case 23:
                     orderCustomer = customer.id === undefined || customer.id === null ? _objectSpread(_objectSpread({}, customer), {}, {
@@ -361,7 +408,8 @@ function _applyGlobalScan() {
                     });
                   case 28:
                     return _context4.abrupt("return", {
-                      resolveFailed: false
+                      resolveFailed: false,
+                      customerBound: true
                     });
                   case 29:
                   case "end":
@@ -375,7 +423,7 @@ function _applyGlobalScan() {
           }();
           trySelectWalletAsset = /*#__PURE__*/function () {
             var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
-              var walletResult, bindResult, _bridge$onNotify8, _bridge$onNotify9;
+              var walletResult, bindResult, _bridge$onNotify10, _bridge$onNotify11;
               return _regeneratorRuntime().wrap(function _callee5$(_context5) {
                 while (1) switch (_context5.prev = _context5.next) {
                   case 0:
@@ -413,7 +461,7 @@ function _applyGlobalScan() {
                       break;
                     }
                     if (!bindResult.resolveFailed) {
-                      bridge === null || bridge === void 0 || (_bridge$onNotify8 = bridge.onNotify) === null || _bridge$onNotify8 === void 0 || _bridge$onNotify8.call(bridge, 'success');
+                      bridge === null || bridge === void 0 || (_bridge$onNotify10 = bridge.onNotify) === null || _bridge$onNotify10 === void 0 || _bridge$onNotify10.call(bridge, 'success');
                     }
                     return _context5.abrupt("return", {
                       status: 'success',
@@ -422,7 +470,7 @@ function _applyGlobalScan() {
                   case 15:
                     // 已识别为 Wallet 支付资产但当前不可用：保留禁用展示，不回退优惠码。
                     if (!bindResult.resolveFailed) {
-                      bridge === null || bridge === void 0 || (_bridge$onNotify9 = bridge.onNotify) === null || _bridge$onNotify9 === void 0 || _bridge$onNotify9.call(bridge, 'fail', 'pisell2.text.goodpass.code-invalid-cart');
+                      bridge === null || bridge === void 0 || (_bridge$onNotify11 = bridge.onNotify) === null || _bridge$onNotify11 === void 0 || _bridge$onNotify11.call(bridge, 'fail', 'pisell2.text.goodpass.code-invalid-cart');
                     }
                     return _context5.abrupt("return", {
                       status: 'failed',
@@ -437,115 +485,142 @@ function _applyGlobalScan() {
             return function trySelectWalletAsset() {
               return _ref3.apply(this, arguments);
             };
-          }();
-          _context6.next = 37;
+          }(); // batch-search 可能返回来源门店客户；先映射到当前门店，确保 Wallet
+          // 支付资产查询使用本店客户上下文。
+          _context6.next = 54;
+          return bindWalletPassCustomer();
+        case 54:
+          bindResult = _context6.sent;
+          _context6.next = 57;
           return trySelectWalletAsset();
-        case 37:
+        case 57:
           walletSelection = _context6.sent;
           if (!walletSelection) {
-            _context6.next = 40;
+            _context6.next = 60;
             break;
           }
           return _context6.abrupt("return", walletSelection);
-        case 40:
-          _context6.next = 42;
-          return bindWalletPassCustomer();
-        case 42:
+        case 60:
           if (bridge !== null && bridge !== void 0 && bridge.applyPromotionCode) {
-            _context6.next = 44;
+            _context6.next = 62;
             break;
           }
           return _context6.abrupt("return", {
             status: 'failed',
             reason: 'no_bridge'
           });
-        case 44:
-          _context6.next = 46;
-          return bridge.applyPromotionCode(scanCode, getRealCustomerId(activeCustomer));
-        case 46:
-          promotionResult = _context6.sent;
+        case 62:
+          promotionCustomerId = getRealCustomerId(activeCustomer);
+          if (!bindResult.customerBound) {
+            _context6.next = 69;
+            break;
+          }
+          _context6.next = 66;
+          return bridge.applyPromotionCode(scanCode, promotionCustomerId, {
+            suppressFailureNotification: true
+          });
+        case 66:
+          _context6.t2 = _context6.sent;
+          _context6.next = 72;
+          break;
+        case 69:
+          _context6.next = 71;
+          return bridge.applyPromotionCode(scanCode, promotionCustomerId);
+        case 71:
+          _context6.t2 = _context6.sent;
+        case 72:
+          promotionResult = _context6.t2;
           if (!((_promotionResult$isAc = promotionResult === null || promotionResult === void 0 ? void 0 : promotionResult.isAccepted) !== null && _promotionResult$isAc !== void 0 ? _promotionResult$isAc : promotionResult === null || promotionResult === void 0 ? void 0 : promotionResult.isAvailable)) {
-            _context6.next = 49;
+            _context6.next = 75;
             break;
           }
           return _context6.abrupt("return", {
             status: 'success',
             kind: 'promotion'
           });
-        case 49:
+        case 75:
+          if (!bindResult.customerBound) {
+            _context6.next = 77;
+            break;
+          }
+          return _context6.abrupt("return", {
+            status: 'success',
+            kind: 'customer'
+          });
+        case 77:
           return _context6.abrupt("return", {
             status: 'failed',
             reason: 'invalid_data'
           });
-        case 50:
+        case 78:
           if (!(searchType === 'product' || searchType === 'local_product')) {
-            _context6.next = 83;
+            _context6.next = 111;
             break;
           }
           list = data === null || data === void 0 ? void 0 : data.list;
           if (!(!Array.isArray(list) || list.length === 0)) {
-            _context6.next = 55;
+            _context6.next = 83;
             break;
           }
-          bridge === null || bridge === void 0 || (_bridge$onNotify10 = bridge.onNotify) === null || _bridge$onNotify10 === void 0 || _bridge$onNotify10.call(bridge, 'fail', 'pisell2.text.scan-global-failed');
+          bridge === null || bridge === void 0 || (_bridge$onNotify12 = bridge.onNotify) === null || _bridge$onNotify12 === void 0 || _bridge$onNotify12.call(bridge, 'fail', 'pisell2.text.scan-global-failed');
           return _context6.abrupt("return", {
             status: 'failed',
             reason: 'invalid_data'
           });
-        case 55:
+        case 83:
           addedCount = 0;
           _iterator = _createForOfIteratorHelper(list);
-          _context6.prev = 57;
+          _context6.prev = 85;
           _iterator.s();
-        case 59:
+        case 87:
           if ((_step = _iterator.n()).done) {
-            _context6.next = 71;
+            _context6.next = 99;
             break;
           }
           _item = _step.value;
-          _context6.next = 63;
+          _context6.next = 91;
           return processScannedProductItem(host, _item, scanCode, bridge);
-        case 63:
+        case 91:
           outcome = _context6.sent;
           if (outcome === 'added') {
             addedCount += 1;
           }
           if (!(outcome === 'cancelled')) {
-            _context6.next = 67;
+            _context6.next = 95;
             break;
           }
           return _context6.abrupt("return", {
             status: 'cancelled'
           });
-        case 67:
+        case 95:
           if (!(outcome === 'pending')) {
-            _context6.next = 69;
+            _context6.next = 97;
             break;
           }
           return _context6.abrupt("return", {
             status: 'pending',
             kind: 'requiresDetail'
           });
-        case 69:
-          _context6.next = 59;
+        case 97:
+          _context6.next = 87;
           break;
-        case 71:
-          _context6.next = 76;
+        case 99:
+          _context6.next = 104;
           break;
-        case 73:
-          _context6.prev = 73;
-          _context6.t1 = _context6["catch"](57);
-          _iterator.e(_context6.t1);
-        case 76:
-          _context6.prev = 76;
+        case 101:
+          _context6.prev = 101;
+          _context6.t3 = _context6["catch"](85);
+          _iterator.e(_context6.t3);
+        case 104:
+          _context6.prev = 104;
           _iterator.f();
-          return _context6.finish(76);
-        case 79:
+          return _context6.finish(104);
+        case 107:
           if (!(addedCount > 0)) {
-            _context6.next = 82;
+            _context6.next = 110;
             break;
           }
-          bridge === null || bridge === void 0 || (_bridge$onNotify11 = bridge.onNotify) === null || _bridge$onNotify11 === void 0 || _bridge$onNotify11.call(bridge, 'success');
+          bridge === null || bridge === void 0 || (_bridge$onNotify13 = bridge.onNotify) === null || _bridge$onNotify13 === void 0 || _bridge$onNotify13.call(bridge, 'success');
           return _context6.abrupt("return", {
             status: 'success',
             kind: 'products',
@@ -553,36 +628,36 @@ function _applyGlobalScan() {
               count: addedCount
             }
           });
-        case 82:
+        case 110:
           return _context6.abrupt("return", {
             status: 'failed',
             reason: 'no_bridge'
           });
-        case 83:
+        case 111:
           if (!(searchType === 'order')) {
-            _context6.next = 92;
+            _context6.next = 120;
             break;
           }
           orderId = (_data$order_id = data === null || data === void 0 ? void 0 : data.order_id) !== null && _data$order_id !== void 0 ? _data$order_id : data === null || data === void 0 ? void 0 : data.id;
           if (orderId) {
-            _context6.next = 88;
+            _context6.next = 116;
             break;
           }
-          bridge === null || bridge === void 0 || (_bridge$onNotify12 = bridge.onNotify) === null || _bridge$onNotify12 === void 0 || _bridge$onNotify12.call(bridge, 'fail', 'pisell2.text.scan-global-failed');
+          bridge === null || bridge === void 0 || (_bridge$onNotify14 = bridge.onNotify) === null || _bridge$onNotify14 === void 0 || _bridge$onNotify14.call(bridge, 'fail', 'pisell2.text.scan-global-failed');
           return _context6.abrupt("return", {
             status: 'failed',
             reason: 'invalid_data'
           });
-        case 88:
+        case 116:
           if (bridge !== null && bridge !== void 0 && bridge.openOrder) {
-            _context6.next = 90;
+            _context6.next = 118;
             break;
           }
           return _context6.abrupt("return", {
             status: 'pending',
             kind: 'openOrder'
           });
-        case 90:
+        case 118:
           bridge.openOrder({
             order_id: Number(orderId),
             business_code: (_data$business_code = data === null || data === void 0 ? void 0 : data.business_code) !== null && _data$business_code !== void 0 ? _data$business_code : host.getBusinessCode()
@@ -591,16 +666,16 @@ function _applyGlobalScan() {
             status: 'pending',
             kind: 'openOrder'
           });
-        case 92:
+        case 120:
           return _context6.abrupt("return", {
             status: 'failed',
             reason: 'invalid_data'
           });
-        case 93:
+        case 121:
         case "end":
           return _context6.stop();
       }
-    }, _callee6, null, [[11, 17], [57, 73, 76, 79]]);
+    }, _callee6, null, [[10, 16], [30, 37], [85, 101, 104, 107]]);
   }));
   return _applyGlobalScan.apply(this, arguments);
 }

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

@@ -18,7 +18,7 @@ export var searchWalletPass = /*#__PURE__*/function () {
             relation_product: 1,
             // 组装关联商品: 0不处理 1处理
             with_franchisor_data: 1,
-            with: ['customer'],
+            with: ['customer', 'franchiseeWalletPass:shop_id,source_shop_id,product_id,use'],
             tags: ['point_card',
             // 积分卡
             'gift_card',

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

@@ -10,6 +10,8 @@ export interface GlobalScanFormattedResult {
     customerId?: string | number;
     /** 仅 Wallet 返回；true 时禁止直接使用响应内的来源客户。 */
     isCrossShopWallet?: boolean;
+    /** 总店 Wallet Pass 未共享给当前子店。 */
+    isWalletPassUnavailableAtStore?: boolean;
 }
 interface RawScanSearchResult {
     searchType?: GlobalScanSearchType;

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

@@ -1,3 +1,9 @@
+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 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 `formatScanGlobal`）。
  */
@@ -33,14 +39,17 @@ export function formatGlobalScanResult(raw, scanCode) {
     };
   }
   if (searchType === 'walletPass') {
-    var _ref2, _ref3, _firstResult$customer, _firstResult$holder, _firstResult$customer2, _firstResult$customer3;
+    var _firstResult$franchis, _ref2, _ref3, _firstResult$customer, _firstResult$holder, _firstResult$customer2, _firstResult$customer3;
     var firstResult = resultData === null || resultData === void 0 ? void 0 : resultData[0];
-    return {
+    var isWalletPassUnavailableAtStore = (firstResult === null || firstResult === void 0 ? void 0 : firstResult.is_franchisor_pass) === 1 && (firstResult === null || firstResult === void 0 || (_firstResult$franchis = firstResult.franchisee_wallet_pass) === null || _firstResult$franchis === void 0 ? void 0 : _firstResult$franchis.use) !== 'enabled';
+    return _objectSpread({
       searchType: searchType,
       data: firstResult === null || firstResult === void 0 ? void 0 : firstResult.customer,
       scanCode: scanCode,
       customerId: (_ref2 = (_ref3 = (_firstResult$customer = firstResult === null || firstResult === void 0 ? void 0 : firstResult.customer_id) !== null && _firstResult$customer !== void 0 ? _firstResult$customer : firstResult === null || firstResult === void 0 || (_firstResult$holder = firstResult.holder) === null || _firstResult$holder === void 0 ? void 0 : _firstResult$holder.customer_id) !== null && _ref3 !== void 0 ? _ref3 : firstResult === null || firstResult === void 0 || (_firstResult$customer2 = firstResult.customer) === null || _firstResult$customer2 === void 0 ? void 0 : _firstResult$customer2.id) !== null && _ref2 !== void 0 ? _ref2 : firstResult === null || firstResult === void 0 || (_firstResult$customer3 = firstResult.customer) === null || _firstResult$customer3 === void 0 ? void 0 : _firstResult$customer3.customer_id
-    };
+    }, isWalletPassUnavailableAtStore ? {
+      isWalletPassUnavailableAtStore: true
+    } : {});
   }
   if (searchType === 'product' || searchType === 'local_product') {
     return {

package/lib/model/strategy/adapter/promotion/index.js

@@ -1,46 +1 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "BUY_X_GET_Y_FREE_STRATEGY", {
-  enumerable: true,
-  get: function () {
-    return _examples.BUY_X_GET_Y_FREE_STRATEGY;
-  }
-});
-Object.defineProperty(exports, "ITEM_REWARD_STRATEGY", {
-  enumerable: true,
-  get: function () {
-    return _examples.ITEM_REWARD_STRATEGY;
-  }
-});
-Object.defineProperty(exports, "PromotionAdapter", {
-  enumerable: true,
-  get: function () {
-    return _adapter.PromotionAdapter;
-  }
-});
-Object.defineProperty(exports, "PromotionEvaluator", {
-  enumerable: true,
-  get: function () {
-    return _evaluator.PromotionEvaluator;
-  }
-});
-Object.defineProperty(exports, "X_ITEMS_FOR_Y_PRICE_STRATEGY", {
-  enumerable: true,
-  get: function () {
-    return _examples.X_ITEMS_FOR_Y_PRICE_STRATEGY;
-  }
-});
-Object.defineProperty(exports, "default", {
-  enumerable: true,
-  get: function () {
-    return _adapter.default;
-  }
-});
-var _evaluator = require("./evaluator");
-var _adapter = _interopRequireWildcard(require("./adapter"));
-var _examples = require("./examples");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+"use strict";

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

@@ -540,7 +540,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/lib/modules/Rules/index.js

@@ -1501,7 +1501,8 @@ class RulesModule extends _BaseModule.BaseModule {
 
             // 计算折扣后的价格（使用 getDiscountAmount，内部已处理 maxDeductionAmount）
             const discountedPrice = (0, _utils.getDiscountAmount)(selectedDiscount, product.origin_total, product.origin_total);
-            const bundleDiscountAmount = new _decimal.default(product.origin_total || 0).minus(discountedPrice).toNumber();
+            const bundleDiscountAmountPerItem = new _decimal.default(product.origin_total || 0).minus(discountedPrice).toNumber();
+            const bundleDiscountAmount = new _decimal.default(bundleDiscountAmountPerItem).mul(appliedUseCount).toNumber();
             debugger;
             const discountDetail = {
               amount: bundleDiscountAmount,

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

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -230,12 +230,16 @@ export interface GlobalScanHostBridge {
     /**
      * walk-in 扫 walletPass：直接核销优惠码（对齐 SaleDetail Voucher.handleApplyCode / cart.scanCode）。
      */
-    applyPromotionCode?: (code: string, customerId?: number) => Promise<{
+    applyPromotionCode?: (code: string, customerId?: number, options?: {
+        suppressFailureNotification?: boolean;
+    }) => Promise<{
         isAvailable?: boolean;
         isAccepted?: boolean;
         type?: string;
         unavailableReason?: string;
     }>;
+    /** 当前订单已有其他客户时，由宿主复用客户组件完成确认及切换。 */
+    requestCustomerSwitch?: (customer: ICustomer) => Promise<boolean | null>;
     onNotify?: (type: 'success' | 'fail' | 'info', messageKey?: string) => void;
     refresh?: () => void;
 }

package/lib/solution/BookingTicket/utils/scan/applyGlobalScan.js

@@ -106,16 +106,12 @@ async function applyGlobalScan(host, formatted, bridge) {
     data,
     scanCode,
     customerId: formattedCustomerId,
-    isCrossShopWallet
+    isCrossShopWallet,
+    isWalletPassUnavailableAtStore
   } = formatted;
   if (searchType === 'wallet') {
     const currentCustomer = host.getOrderCustomerSnapshot();
-    if (getRealCustomerId(currentCustomer) !== undefined) {
-      return {
-        status: 'success',
-        kind: 'customer'
-      };
-    }
+    const currentCustomerId = getRealCustomerId(currentCustomer);
     let customer = data;
     if (isCrossShopWallet) {
       const sourceCustomerId = getRealCustomerId({
@@ -152,6 +148,36 @@ async function applyGlobalScan(host, formatted, bridge) {
       ...customer,
       id: customerId
     } : customer;
+    if (currentCustomerId === customerId) {
+      return {
+        status: 'success',
+        kind: 'customer'
+      };
+    }
+    if (currentCustomerId !== undefined) {
+      // 未接入新桥接的宿主保持原行为：已有客户时不直接覆盖。
+      if (!bridge?.requestCustomerSwitch) {
+        return {
+          status: 'success',
+          kind: 'customer'
+        };
+      }
+      try {
+        const switched = await bridge.requestCustomerSwitch(orderCustomer);
+        return switched ? {
+          status: 'success',
+          kind: 'customer'
+        } : {
+          status: 'cancelled'
+        };
+      } catch (error) {
+        bridge.onNotify?.('fail', getErrorMessage(error) || 'pisell2.text.scan-global-failed');
+        return {
+          status: 'failed',
+          reason: 'invalid_data'
+        };
+      }
+    }
     host.setOrderCustomer(orderCustomer);
     bridge?.onNotify?.('success', 'pisell2.text.add-client-success');
     return {
@@ -160,13 +186,20 @@ async function applyGlobalScan(host, formatted, bridge) {
     };
   }
   if (searchType === 'walletPass') {
+    if (isWalletPassUnavailableAtStore) {
+      bridge?.onNotify?.('fail', 'pisell2.text.wallet-pass-not-available-at-store');
+      return {
+        status: 'failed',
+        reason: 'invalid_data'
+      };
+    }
     const snapshot = host.getOrderCustomerSnapshot();
-    const currentCustomerIsWalkIn = getRealCustomerId(snapshot) === undefined;
     let activeCustomer = snapshot;
     const bindWalletPassCustomer = async asset => {
-      if (!currentCustomerIsWalkIn) {
+      if (getRealCustomerId(activeCustomer) !== undefined) {
         return {
-          resolveFailed: false
+          resolveFailed: false,
+          customerBound: false
         };
       }
       const assetCustomerId = getWalletAssetCustomerId(asset) ?? getRealCustomerId({
@@ -177,7 +210,8 @@ async function applyGlobalScan(host, formatted, bridge) {
         if (!host.resolveCustomerById) {
           bridge?.onNotify?.('fail', 'pisell2.text.scan-global-failed');
           return {
-            resolveFailed: true
+            resolveFailed: true,
+            customerBound: false
           };
         }
         try {
@@ -186,7 +220,8 @@ async function applyGlobalScan(host, formatted, bridge) {
           console.warn('[GlobalScan] Wallet asset customer lookup failed', error);
           bridge?.onNotify?.('fail', getErrorMessage(error) || 'pisell2.text.scan-global-failed');
           return {
-            resolveFailed: true
+            resolveFailed: true,
+            customerBound: false
           };
         }
       }
@@ -196,7 +231,8 @@ async function applyGlobalScan(host, formatted, bridge) {
           bridge?.onNotify?.('fail', 'pisell2.text.scan-global-failed');
         }
         return {
-          resolveFailed: assetCustomerId !== undefined
+          resolveFailed: assetCustomerId !== undefined,
+          customerBound: false
         };
       }
       const orderCustomer = customer.id === undefined || customer.id === null ? {
@@ -210,7 +246,8 @@ async function applyGlobalScan(host, formatted, bridge) {
         retainSearchResultCodes: [scanCode]
       });
       return {
-        resolveFailed: false
+        resolveFailed: false,
+        customerBound: true
       };
     };
     const trySelectWalletAsset = async () => {
@@ -242,24 +279,34 @@ async function applyGlobalScan(host, formatted, bridge) {
         reason: 'invalid_data'
       };
     };
+
+    // batch-search 可能返回来源门店客户；先映射到当前门店，确保 Wallet
+    // 支付资产查询使用本店客户上下文。
+    const bindResult = await bindWalletPassCustomer();
     const walletSelection = await trySelectWalletAsset();
     if (walletSelection) return walletSelection;
-
-    // 非支付类 Wallet Pass 仍可能由 batch-search 返回所属客户。
-    await bindWalletPassCustomer();
     if (!bridge?.applyPromotionCode) {
       return {
         status: 'failed',
         reason: 'no_bridge'
       };
     }
-    const promotionResult = await bridge.applyPromotionCode(scanCode, getRealCustomerId(activeCustomer));
+    const promotionCustomerId = getRealCustomerId(activeCustomer);
+    const promotionResult = bindResult.customerBound ? await bridge.applyPromotionCode(scanCode, promotionCustomerId, {
+      suppressFailureNotification: true
+    }) : await bridge.applyPromotionCode(scanCode, promotionCustomerId);
     if (promotionResult?.isAccepted ?? promotionResult?.isAvailable) {
       return {
         status: 'success',
         kind: 'promotion'
       };
     }
+    if (bindResult.customerBound) {
+      return {
+        status: 'success',
+        kind: 'customer'
+      };
+    }
     return {
       status: 'failed',
       reason: 'invalid_data'

package/lib/solution/BookingTicket/utils/scan/cloudSearch.js

@@ -15,7 +15,7 @@ const searchWalletPass = async (request, code) => {
     relation_product: 1,
     // 组装关联商品: 0不处理 1处理
     with_franchisor_data: 1,
-    with: ['customer'],
+    with: ['customer', 'franchiseeWalletPass:shop_id,source_shop_id,product_id,use'],
     tags: ['point_card',
     // 积分卡
     'gift_card',

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

@@ -10,6 +10,8 @@ export interface GlobalScanFormattedResult {
     customerId?: string | number;
     /** 仅 Wallet 返回；true 时禁止直接使用响应内的来源客户。 */
     isCrossShopWallet?: boolean;
+    /** 总店 Wallet Pass 未共享给当前子店。 */
+    isWalletPassUnavailableAtStore?: boolean;
 }
 interface RawScanSearchResult {
     searchType?: GlobalScanSearchType;

package/lib/solution/BookingTicket/utils/scan/formatGlobalScan.js

@@ -43,11 +43,15 @@ function formatGlobalScanResult(raw, scanCode) {
   }
   if (searchType === 'walletPass') {
     const firstResult = resultData?.[0];
+    const isWalletPassUnavailableAtStore = firstResult?.is_franchisor_pass === 1 && firstResult?.franchisee_wallet_pass?.use !== 'enabled';
     return {
       searchType,
       data: firstResult?.customer,
       scanCode,
-      customerId: firstResult?.customer_id ?? firstResult?.holder?.customer_id ?? firstResult?.customer?.id ?? firstResult?.customer?.customer_id
+      customerId: firstResult?.customer_id ?? firstResult?.holder?.customer_id ?? firstResult?.customer?.id ?? firstResult?.customer?.customer_id,
+      ...(isWalletPassUnavailableAtStore ? {
+        isWalletPassUnavailableAtStore: true
+      } : {})
     };
   }
   if (searchType === 'product' || searchType === 'local_product') {

package/package.json

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