@pisell/pisellos 0.10.42 → 0.10.44

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

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 orderCustomerDiscountRefreshTarget;
     private orderCustomerPromotionRefreshInFlight;
     protected loadOpenDataInFlight: Promise<OpenDataConfig> | null;
     protected loadOpenDataInFlightTarget: string | null;

package/dist/solution/BookingTicket/index.js

@@ -180,6 +180,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     _defineProperty(_assertThisInitialized(_this), "addTimeProductsCatalog", []);
     _defineProperty(_assertThisInitialized(_this), "orderCustomerDiscountRefreshInFlight", null);
     _defineProperty(_assertThisInitialized(_this), "orderCustomerDiscountRefreshCustomerId", null);
+    _defineProperty(_assertThisInitialized(_this), "orderCustomerDiscountRefreshTarget", null);
     _defineProperty(_assertThisInitialized(_this), "orderCustomerPromotionRefreshInFlight", null);
     _defineProperty(_assertThisInitialized(_this), "loadOpenDataInFlight", null);
     _defineProperty(_assertThisInitialized(_this), "loadOpenDataInFlightTarget", null);
@@ -1884,15 +1885,24 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "refreshDiscountConfigAfterOrderCustomerChange",
     value: function refreshDiscountConfigAfterOrderCustomerChange(customerId) {
-      var _this5 = this;
+      var _this$store$order$get4,
+        _this$store$order6,
+        _this$getOrderIdentit,
+        _this5 = this;
       if (!customerId || customerId === 1) return Promise.resolve();
-      if (this.orderCustomerDiscountRefreshInFlight && this.orderCustomerDiscountRefreshCustomerId === customerId) {
+      var tempOrder = (_this$store$order$get4 = (_this$store$order6 = this.store.order).getTempOrder) === null || _this$store$order$get4 === void 0 ? void 0 : _this$store$order$get4.call(_this$store$order6);
+      var orderIdentity = (_this$getOrderIdentit = this.getOrderIdentity) === null || _this$getOrderIdentit === void 0 ? void 0 : _this$getOrderIdentit.call(this);
+      var orderId = (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.order_id) || (orderIdentity === null || orderIdentity === void 0 ? void 0 : orderIdentity.orderId);
+      var action = !orderId || String(orderId).startsWith('local_order') ? 'create' : 'edit';
+      var orderTarget = orderId ? "order:".concat(String(orderId)) : "external:".concat(String((tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.external_sale_number) || (orderIdentity === null || orderIdentity === void 0 ? void 0 : orderIdentity.externalSaleNumber) || (orderIdentity === null || orderIdentity === void 0 ? void 0 : orderIdentity.localId) || 'new'));
+      var refreshTarget = "".concat(customerId, ":").concat(action, ":").concat(orderTarget);
+      if (this.orderCustomerDiscountRefreshInFlight && this.orderCustomerDiscountRefreshTarget === refreshTarget) {
         return this.orderCustomerDiscountRefreshInFlight;
       }
       var previousRefresh = this.orderCustomerDiscountRefreshInFlight;
       var refreshTask = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25() {
         var _this5$store$order$ge, _this5$store$order, _this5$getOrderIdenti;
-        var currentCustomer, tempOrder, orderId, action;
+        var currentCustomer, currentTempOrder, currentOrderIdentity, currentOrderId, currentAction, currentOrderTarget;
         return _regeneratorRuntime().wrap(function _callee25$(_context25) {
           while (1) switch (_context25.prev = _context25.next) {
             case 0:
@@ -1912,15 +1922,24 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               }
               return _context25.abrupt("return");
             case 6:
-              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';
-              _context25.next = 11;
+              currentTempOrder = (_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);
+              currentOrderIdentity = (_this5$getOrderIdenti = _this5.getOrderIdentity) === null || _this5$getOrderIdenti === void 0 ? void 0 : _this5$getOrderIdenti.call(_this5);
+              currentOrderId = (currentTempOrder === null || currentTempOrder === void 0 ? void 0 : currentTempOrder.order_id) || (currentOrderIdentity === null || currentOrderIdentity === void 0 ? void 0 : currentOrderIdentity.orderId);
+              currentAction = !currentOrderId || String(currentOrderId).startsWith('local_order') ? 'create' : 'edit';
+              currentOrderTarget = currentOrderId ? "order:".concat(String(currentOrderId)) : "external:".concat(String((currentTempOrder === null || currentTempOrder === void 0 ? void 0 : currentTempOrder.external_sale_number) || (currentOrderIdentity === null || currentOrderIdentity === void 0 ? void 0 : currentOrderIdentity.externalSaleNumber) || (currentOrderIdentity === null || currentOrderIdentity === void 0 ? void 0 : currentOrderIdentity.localId) || 'new'));
+              if (!("".concat(customerId, ":").concat(currentAction, ":").concat(currentOrderTarget) !== refreshTarget)) {
+                _context25.next = 13;
+                break;
+              }
+              return _context25.abrupt("return");
+            case 13:
+              _context25.next = 15;
               return _this5.loadDiscountConfig({
                 customerId: customerId,
-                action: action
+                action: action,
+                force: true
               });
-            case 11:
+            case 15:
             case "end":
               return _context25.stop();
           }
@@ -1928,12 +1947,14 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
       }))();
       this.orderCustomerDiscountRefreshInFlight = refreshTask;
       this.orderCustomerDiscountRefreshCustomerId = customerId;
+      this.orderCustomerDiscountRefreshTarget = refreshTarget;
       refreshTask.catch(function (error) {
         console.error('Failed to load discount config after customer change:', error);
       }).finally(function () {
         if (_this5.orderCustomerDiscountRefreshInFlight !== refreshTask) return;
         _this5.orderCustomerDiscountRefreshInFlight = null;
         _this5.orderCustomerDiscountRefreshCustomerId = null;
+        _this5.orderCustomerDiscountRefreshTarget = null;
       });
       return refreshTask;
     }
@@ -2497,10 +2518,10 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "buildAddProductCtx",
     value: function buildAddProductCtx(extra) {
-      var _extra$date2, _ref12, _this$getOrderCustome4, _this$getOrderCustome5, _this$store$order$get4, _extra$presetStartTim2;
+      var _extra$date2, _ref12, _this$getOrderCustome4, _this$getOrderCustome5, _this$store$order$get5, _extra$presetStartTim2;
       var bookingContextState = this.store.bookingContext.getState();
       var date = (_extra$date2 = extra === null || extra === void 0 ? void 0 : extra.date) !== null && _extra$date2 !== void 0 ? _extra$date2 : bookingContextState.date;
-      var orderCustomerId = (_ref12 = (_this$getOrderCustome4 = (_this$getOrderCustome5 = this.getOrderCustomerSnapshot()) === null || _this$getOrderCustome5 === void 0 ? void 0 : _this$getOrderCustome5.id) !== null && _this$getOrderCustome4 !== void 0 ? _this$getOrderCustome4 : (_this$store$order$get4 = this.store.order.getTempOrder()) === null || _this$store$order$get4 === void 0 ? void 0 : _this$store$order$get4.customer_id) !== null && _ref12 !== void 0 ? _ref12 : undefined;
+      var orderCustomerId = (_ref12 = (_this$getOrderCustome4 = (_this$getOrderCustome5 = this.getOrderCustomerSnapshot()) === null || _this$getOrderCustome5 === void 0 ? void 0 : _this$getOrderCustome5.id) !== null && _this$getOrderCustome4 !== void 0 ? _this$getOrderCustome4 : (_this$store$order$get5 = this.store.order.getTempOrder()) === null || _this$store$order$get5 === void 0 ? void 0 : _this$store$order$get5.customer_id) !== null && _ref12 !== void 0 ? _ref12 : undefined;
       return _objectSpread(_objectSpread({
         bookingConfig: bookingContextState.bookingConfig,
         resourcesOrigin: bookingContextState.resourcesOrigin,
@@ -2996,7 +3017,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     key: "handlePrintWristband",
     value: function () {
       var _handlePrintWristband = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(params) {
-        var _this$getOrderIdentit;
+        var _this$getOrderIdentit2;
         var deviceTask, deviceId, idempotencyKey;
         return _regeneratorRuntime().wrap(function _callee36$(_context36) {
           while (1) switch (_context36.prev = _context36.next) {
@@ -3033,7 +3054,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                 payload: {
                   type: 'WRISTBAND',
                   data: {
-                    order_id: (_this$getOrderIdentit = this.getOrderIdentity()) === null || _this$getOrderIdentit === void 0 ? void 0 : _this$getOrderIdentit.orderId,
+                    order_id: (_this$getOrderIdentit2 = this.getOrderIdentity()) === null || _this$getOrderIdentit2 === void 0 ? void 0 : _this$getOrderIdentit2.orderId,
                     voucher_ids: Array.isArray(params.voucher_ids) ? params.voucher_ids : [params.voucher_ids]
                   }
                 },
@@ -3058,7 +3079,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     key: "handleRedeem",
     value: function () {
       var _handleRedeem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee37(params) {
-        var _this$store$order6, _this$store$order6$ge, _this$store$order7, _ref20, _tempOrder$order_id2;
+        var _this$store$order7, _this$store$order7$ge, _this$store$order8, _ref20, _tempOrder$order_id2;
         var voucherIds, status, voucherIdSet, tempOrder, vouchers, hasUpdatedVoucher, nextVouchers, identity, externalSaleNumber, orderId, orderLookup;
         return _regeneratorRuntime().wrap(function _callee37$(_context37) {
           while (1) switch (_context37.prev = _context37.next) {
@@ -3074,8 +3095,8 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                 }
               });
               voucherIdSet = new Set(voucherIds);
-              tempOrder = (_this$store$order6 = this.store.order) === null || _this$store$order6 === void 0 || (_this$store$order6$ge = _this$store$order6.getTempOrder) === null || _this$store$order6$ge === void 0 ? void 0 : _this$store$order6$ge.call(_this$store$order6);
-              vouchers = (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.vouchers) || ((_this$store$order7 = this.store.order) === null || _this$store$order7 === void 0 ? void 0 : _this$store$order7.getVouchers()) || [];
+              tempOrder = (_this$store$order7 = this.store.order) === null || _this$store$order7 === void 0 || (_this$store$order7$ge = _this$store$order7.getTempOrder) === null || _this$store$order7$ge === void 0 ? void 0 : _this$store$order7$ge.call(_this$store$order7);
+              vouchers = (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.vouchers) || ((_this$store$order8 = this.store.order) === null || _this$store$order8 === void 0 ? void 0 : _this$store$order8.getVouchers()) || [];
               hasUpdatedVoucher = false;
               nextVouchers = vouchers.map(function (voucher) {
                 if (!voucherIdSet.has(voucher.voucher_id)) return voucher;

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/orderCustomer.js

@@ -18,8 +18,9 @@ function resolveCustomerDisplayName(customer) {
 
 /** 将 ICustomer 格式化为写入 tempOrder 的协议字段。 */
 export function formatOrderCustomerPatch(customer) {
-  var _customer$phone, _customer$email, _country_calling_code, _country_calling_code2;
-  var rawId = customer.id;
+  var _ref, _c$customer_id, _customer$phone, _customer$email, _country_calling_code, _country_calling_code2;
+  var c = customer;
+  var rawId = (_ref = (_c$customer_id = c.customer_id) !== null && _c$customer_id !== void 0 ? _c$customer_id : c.customerId) !== null && _ref !== void 0 ? _ref : customer.id;
   var numericId = typeof rawId === 'number' ? rawId : rawId !== undefined && rawId !== null && rawId !== '' ? Number(rawId) : null;
   return {
     customer_id: Number.isFinite(numericId) ? numericId : null,