@pisell/pisellos 0.10.4 → 0.10.5

package/dist/modules/Order/utils.js

@@ -1395,7 +1395,6 @@ export function productRequiresFormSubject(tempOrder, product) {
 }
 export function resolveIsFormSubject(tempOrder, product) {
   var _tempOrder$holder;
-  debugger;
   // 旧版预约维度的 holder 类型仍然生效；新版则从当前商品 holder_config 判断。
   if ((tempOrder === null || tempOrder === void 0 || (_tempOrder$holder = tempOrder.holder) === null || _tempOrder$holder === void 0 ? void 0 : _tempOrder$holder.type) === 'form') return true;
   if (product) return productRequiresFormSubject(tempOrder, product);

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 | 5 | 2 | 1 | 6 | 4 | 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 orderCustomerPromotionRefreshInFlight;
     private loadOpenDataConfigInFlight;
     /**
      * 在 BaseSales 默认模块清单（products/order/salesSummary/schedule）基础上追加 customer + bookingContext。
@@ -282,7 +283,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 +447,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;
   }
@@ -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();
           }
@@ -1532,7 +1535,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 +1565,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 +1605,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 +1618,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 +1681,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 +1702,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 +1728,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,9 +1921,9 @@ 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, this.getSubmitOrderSalesChannel());
       var safeCallback = function safeCallback(d) {
@@ -2375,7 +2399,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,7 +2417,7 @@ 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, this.getSubmitOrderSalesChannel());
               _context28.next = 9;
@@ -2417,35 +2441,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 +2608,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 +2623,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/UnifiedBookingSales/index.d.ts

@@ -75,6 +75,12 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
     protected getRegisteredModuleNames(): readonly string[];
     protected createSubModule(moduleName: string): Module | null;
     addNewOrder(): Promise<import("../../modules/Order/types").OrderTempOrder>;
+    syncAuthenticatedOrderCustomer(): Promise<boolean>;
+    private isAuthenticatedCustomerUserPlatform;
+    private resolveDiscountOrderIdentity;
+    private resolveDiscountAction;
+    private resetCachedCustomerDiscountState;
+    private refreshLegacySessionCustomerDiscounts;
     /**
      * Loads OpenData without borrowing BookingTicket. Cache ownership is tied to the exact
      * business/channel target so a reused solution instance cannot leak another entry's menus.