@pisell/pisellos 2.3.36 → 2.3.38

package/dist/solution/BookingTicket/index.js

@@ -337,11 +337,10 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     key: "getOpenData",
     value: function () {
       var _getOpenData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-        var _this$store$openData;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              return _context3.abrupt("return", (_this$store$openData = this.store.openData) === null || _this$store$openData === void 0 ? void 0 : _this$store$openData.getOpenData());
+              return _context3.abrupt("return", this.loadOpenDataConfig());
             case 1:
             case "end":
               return _context3.stop();
@@ -352,7 +351,15 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
         return _getOpenData.apply(this, arguments);
       }
       return getOpenData;
-    }()
+    }() /** 清除店铺级 OpenData；下一次 getOpenData 时会重新拉取。 */
+  }, {
+    key: "clearOpenDataCache",
+    value: function clearOpenDataCache() {
+      var _this$store$openData;
+      this.loadOpenDataConfigInFlight = null;
+      this.otherParams.openData = null;
+      (_this$store$openData = this.store.openData) === null || _this$store$openData === void 0 || _this$store$openData.clearCache();
+    }
   }, {
     key: "getShortNumberOrDeviceId",
     value: function () {
@@ -397,49 +404,52 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
+              // 业务码切换或配置失败时不能复用上一次初始化的短号。
+              this.setPaymentNumberDevicePrefix(null);
               openDataConfig = null;
-              _context5.prev = 1;
-              _context5.next = 4;
+              _context5.prev = 2;
+              _context5.next = 5;
               return this.loadOpenDataConfig();
-            case 4:
+            case 5:
               openDataConfig = _context5.sent;
-              _context5.next = 11;
+              _context5.next = 12;
               break;
-            case 7:
-              _context5.prev = 7;
-              _context5.t0 = _context5["catch"](1);
+            case 8:
+              _context5.prev = 8;
+              _context5.t0 = _context5["catch"](2);
               console.warn('[BookingTicket] OpenData 配置加载失败，跳过 idGenerator 配置', _context5.t0);
               return _context5.abrupt("return");
-            case 11:
+            case 12:
               // if (!openDataConfig) return;
               idGenerator = this.getIdGeneratorPlugin();
               if (idGenerator !== null && idGenerator !== void 0 && idGenerator.configure) {
-                _context5.next = 15;
+                _context5.next = 16;
                 break;
               }
               console.warn('[BookingTicket] idGenerator 插件不可用，跳过配置');
               return _context5.abrupt("return");
-            case 15:
+            case 16:
               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'], '');
               shopOrderPrefix = this.normalizeIdPrefix((_openDataConfig4 = openDataConfig) === null || _openDataConfig4 === void 0 ? void 0 : _openDataConfig4['sale.sale_number_prefix'], '');
               resetReceiptSequenceDaily = typeof ((_openDataConfig5 = openDataConfig) === null || _openDataConfig5 === void 0 ? void 0 : _openDataConfig5['sale.short_number_daily_reset']) === 'boolean' ? (_openDataConfig6 = openDataConfig) === null || _openDataConfig6 === void 0 ? void 0 : _openDataConfig6['sale.short_number_daily_reset'] : false;
               operatingDayBoundary = this.getAppData('operating_day_boundary');
-              _context5.next = 23;
+              _context5.next = 24;
               return this.getShortNumberOrDeviceId();
-            case 23:
+            case 24:
               deviceId = _context5.sent;
+              this.setPaymentNumberDevicePrefix(deviceId);
               businessCode = this.getBookingTicketBusinessCode();
               if (businessCode) {
-                _context5.next = 28;
+                _context5.next = 30;
                 break;
               }
               console.warn('[BookingTicket] businessCode 缺失，跳过 idGenerator 配置');
               return _context5.abrupt("return");
-            case 28:
-              _context5.prev = 28;
-              _context5.next = 31;
+            case 30:
+              _context5.prev = 30;
+              _context5.next = 33;
               return idGenerator.configure({
                 biz: businessCode,
                 config: {
@@ -454,18 +464,18 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                   shopOrderPrefix: shopOrderPrefix
                 }
               });
-            case 31:
-              _context5.next = 36;
-              break;
             case 33:
-              _context5.prev = 33;
-              _context5.t1 = _context5["catch"](28);
+              _context5.next = 38;
+              break;
+            case 35:
+              _context5.prev = 35;
+              _context5.t1 = _context5["catch"](30);
               console.warn('[BookingTicket] idGenerator 配置失败', _context5.t1);
-            case 36:
+            case 38:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[1, 7], [28, 33]]);
+        }, _callee5, this, [[2, 8], [30, 35]]);
       }));
       function configureIdGeneratorFromOpenData() {
         return _configureIdGeneratorFromOpenData.apply(this, arguments);
@@ -1260,24 +1270,88 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     }
 
     /**
-     * 通过 ids 获取商品列表（不加载到模块中）
-     * @returns 商品列表
+     * 通过 ids 获取商品列表；默认只读取内存，显式开启 loadMissing 时按当前订单上下文补查缺失商品。
+     * 补查直接写入 ProductList，不更新 BookingTicket.productCatalog，避免当前商品列表被查询子集覆盖。
      */
   }, {
     key: "getProductByIds",
     value: (function () {
-      var _getProductByIds = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(ids) {
+      var _getProductByIds = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(ids, options) {
+        var _this$getOrderCustome, _this$getOrderCustome2, _this$getOrderCustome3;
+        var normalizedIds, localProducts, localProductIds, missingIds, rawBookingDate, bookingDate, customerId, loadedProducts, productById;
         return _regeneratorRuntime().wrap(function _callee18$(_context18) {
           while (1) switch (_context18.prev = _context18.next) {
             case 0:
-              return _context18.abrupt("return", this.store.products.getProductByIds(ids));
-            case 1:
+              normalizedIds = Array.from(new Set((ids || []).map(function (id) {
+                return Number(id);
+              }).filter(function (id) {
+                return Number.isFinite(id);
+              })));
+              _context18.next = 3;
+              return this.store.products.getProductByIds(normalizedIds);
+            case 3:
+              _context18.t0 = _context18.sent;
+              if (_context18.t0) {
+                _context18.next = 6;
+                break;
+              }
+              _context18.t0 = [];
+            case 6:
+              localProducts = _context18.t0;
+              if (options !== null && options !== void 0 && options.loadMissing) {
+                _context18.next = 9;
+                break;
+              }
+              return _context18.abrupt("return", localProducts);
+            case 9:
+              localProductIds = new Set(localProducts.map(function (product) {
+                return Number(product.id);
+              }));
+              missingIds = normalizedIds.filter(function (id) {
+                return !localProductIds.has(id);
+              });
+              if (missingIds.length) {
+                _context18.next = 13;
+                break;
+              }
+              return _context18.abrupt("return", localProducts);
+            case 13:
+              rawBookingDate = this.getBookingDate();
+              bookingDate = rawBookingDate && dayjs(rawBookingDate).isValid() ? dayjs(rawBookingDate) : null;
+              customerId = Number((_this$getOrderCustome = (_this$getOrderCustome2 = this.getOrderCustomerSnapshot()) === null || _this$getOrderCustome2 === void 0 ? void 0 : _this$getOrderCustome2.id) !== null && _this$getOrderCustome !== void 0 ? _this$getOrderCustome : (_this$getOrderCustome3 = this.getOrderCustomer()) === null || _this$getOrderCustome3 === void 0 ? void 0 : _this$getOrderCustome3.customer_id);
+              _context18.next = 18;
+              return this.store.products.loadProducts(_objectSpread(_objectSpread({
+                product_ids: missingIds,
+                with_count: ['bundleGroup', 'optionGroup'],
+                with_schedule: 1,
+                cacheId: this.cacheId
+              }, bookingDate ? {
+                schedule_date: bookingDate.format('YYYY-MM-DD'),
+                schedule_datetime: bookingDate.format('YYYY-MM-DD HH:mm:ss')
+              } : {}), Number.isFinite(customerId) && customerId > 0 ? {
+                customer_id: customerId
+              } : {}));
+            case 18:
+              loadedProducts = _context18.sent;
+              productById = new Map();
+              [].concat(_toConsumableArray(localProducts), _toConsumableArray(loadedProducts || [])).forEach(function (product) {
+                var productId = Number(product.id);
+                if (Number.isFinite(productId)) {
+                  productById.set(productId, product);
+                }
+              });
+              return _context18.abrupt("return", normalizedIds.map(function (id) {
+                return productById.get(id);
+              }).filter(function (product) {
+                return Boolean(product);
+              }));
+            case 22:
             case "end":
               return _context18.stop();
           }
         }, _callee18, this);
       }));
-      function getProductByIds(_x13) {
+      function getProductByIds(_x13, _x14) {
         return _getProductByIds.apply(this, arguments);
       }
       return getProductByIds;
@@ -1311,7 +1385,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
           }
         }, _callee19, this);
       }));
-      function getScheduleTimePoints(_x14) {
+      function getScheduleTimePoints(_x15) {
         return _getScheduleTimePoints.apply(this, arguments);
       }
       return getScheduleTimePoints;
@@ -1701,7 +1775,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
           }
         }, _callee23, this, [[0, 7]]);
       }));
-      function changeCustomerPage(_x15, _x16) {
+      function changeCustomerPage(_x16, _x17) {
         return _changeCustomerPage.apply(this, arguments);
       }
       return changeCustomerPage;
@@ -2155,10 +2229,10 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "buildAddProductCtx",
     value: function buildAddProductCtx(extra) {
-      var _extra$date2, _ref12, _this$getOrderCustome, _this$getOrderCustome2, _this$store$order$get4, _extra$presetStartTim2;
+      var _extra$date2, _ref12, _this$getOrderCustome4, _this$getOrderCustome5, _this$store$order$get4, _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$getOrderCustome = (_this$getOrderCustome2 = this.getOrderCustomerSnapshot()) === null || _this$getOrderCustome2 === void 0 ? void 0 : _this$getOrderCustome2.id) !== null && _this$getOrderCustome !== void 0 ? _this$getOrderCustome : (_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$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;
       return _objectSpread({
         bookingConfig: bookingContextState.bookingConfig,
         resourcesOrigin: bookingContextState.resourcesOrigin,
@@ -2275,7 +2349,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
           }
         }, _callee27, this);
       }));
-      function updateProductInOrder(_x17) {
+      function updateProductInOrder(_x18) {
         return _updateProductInOrder.apply(this, arguments);
       }
       return updateProductInOrder;
@@ -2363,6 +2437,12 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                 },
                 addProductToOrder: function addProductToOrder(product, booking) {
                   return _this6.addProductToOrder(product, booking);
+                },
+                refreshWalletAssets: function refreshWalletAssets(params) {
+                  return _this6.refreshWalletAssets(params);
+                },
+                scanWalletAsset: function scanWalletAsset(scanCode) {
+                  return _this6.scanWalletAsset(scanCode);
                 }
               }, formatted, bridge);
             case 16:
@@ -2384,7 +2464,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
           }
         }, _callee28, this, [[4, 21]]);
       }));
-      function handleGlobalScanCode(_x18, _x19) {
+      function handleGlobalScanCode(_x19, _x20) {
         return _handleGlobalScanCode.apply(this, arguments);
       }
       return handleGlobalScanCode;
@@ -2482,7 +2562,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
           }
         }, _callee29, this);
       }));
-      function addAddTimeProductToBooking(_x20) {
+      function addAddTimeProductToBooking(_x21) {
         return _addAddTimeProductToBooking.apply(this, arguments);
       }
       return addAddTimeProductToBooking;
@@ -2585,7 +2665,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
           }
         }, _callee30, this, [[13, 31, 34, 37]]);
       }));
-      function addAddTimeProductsToBooking(_x21) {
+      function addAddTimeProductsToBooking(_x22) {
         return _addAddTimeProductsToBooking.apply(this, arguments);
       }
       return addAddTimeProductsToBooking;
@@ -2602,22 +2682,24 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
           while (1) switch (_context31.prev = _context31.next) {
             case 0:
               _ref19 = _args31.length > 1 && _args31[1] !== undefined ? _args31[1] : {}, _ref19$cover = _ref19.cover, cover = _ref19$cover === void 0 ? false : _ref19$cover;
-              _get(_getPrototypeOf(BookingTicketImpl.prototype), "setOtherParams", this).call(this, params, {
+              _context31.next = 3;
+              return _get(_getPrototypeOf(BookingTicketImpl.prototype), "setOtherParams", this).call(this, params, {
                 cover: cover
               });
-              if (!(params !== null && params !== void 0 && params.businessCode)) {
-                _context31.next = 5;
+            case 3:
+              if (!((params === null || params === void 0 ? void 0 : params.businessCode) !== undefined || (params === null || params === void 0 ? void 0 : params.business_code) !== undefined)) {
+                _context31.next = 6;
                 break;
               }
-              _context31.next = 5;
+              _context31.next = 6;
               return this.configureIdGeneratorFromOpenData();
-            case 5:
+            case 6:
             case "end":
               return _context31.stop();
           }
         }, _callee31, this);
       }));
-      function setOtherParams(_x22) {
+      function setOtherParams(_x23) {
         return _setOtherParams.apply(this, arguments);
       }
       return setOtherParams;
@@ -2688,7 +2770,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
           }
         }, _callee32, this);
       }));
-      function handlePrintWristband(_x23) {
+      function handlePrintWristband(_x24) {
         return _handlePrintWristband.apply(this, arguments);
       }
       return handlePrintWristband;
@@ -2763,7 +2845,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
           }
         }, _callee33, this);
       }));
-      function handleRedeem(_x24) {
+      function handleRedeem(_x25) {
         return _handleRedeem.apply(this, arguments);
       }
       return handleRedeem;

package/dist/solution/BookingTicket/utils/addProductDecision.js

@@ -7,6 +7,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import dayjs from 'dayjs';
 import { cacheItemToBookingInput, derivePresetStartTimeFromDate, getProductExtend, getIsAutoClose, isSessionProduct, isBookingProduct, applySessionTimesToExtend, hasActualResourceSelection, productNeedsResourceExtend } from "../../../modules/BookingContext";
 import { transformBaseProductToOrderProduct } from "../../BaseSales/utils/transformBaseProductToOrderProduct";
+import { buildProductSkuFromCacheItem } from "./weighingProductSku";
 
 /**
  * cart.addProduct 两阶段决策（与 ticketBooking `handleSelectProduct` 对齐）：
@@ -322,11 +323,16 @@ function buildBasePayloadFromCacheItem(cacheItem, ctx) {
   var quantity = (ctx === null || ctx === void 0 ? void 0 : ctx.quantity) != null && ctx.quantity > 0 ? ctx.quantity : (_cacheItem$_extend$qu = cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend2 = cacheItem._extend) === null || _cacheItem$_extend2 === void 0 ? void 0 : _cacheItem$_extend2.quantity) !== null && _cacheItem$_extend$qu !== void 0 ? _cacheItem$_extend$qu : 1;
   var resolvedPid = (_cacheItem$product_id = cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.product_id) !== null && _cacheItem$product_id !== void 0 ? _cacheItem$product_id : cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.id;
   var extend = (cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem._extend) || {};
+  var productSku = buildProductSkuFromCacheItem(cacheItem);
   return {
     id: (_cacheItem$id = cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.id) !== null && _cacheItem$id !== void 0 ? _cacheItem$id : cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.product_id,
     product_id: resolvedPid,
     variant_id: (_ref5 = (_other$product_varian = other === null || other === void 0 ? void 0 : other.product_variant_id) !== null && _other$product_varian !== void 0 ? _other$product_varian : other === null || other === void 0 ? void 0 : other.variant_id) !== null && _ref5 !== void 0 ? _ref5 : 0,
     quantity: quantity,
+    // 规格弹窗本次选择是 option 权威源，避免目录/旧订单里的空 option 覆盖它。
+    product_sku: productSku ? _objectSpread(_objectSpread({}, productSku), {}, {
+      option: (other === null || other === void 0 ? void 0 : other.option) || []
+    }) : undefined,
     option: (other === null || other === void 0 ? void 0 : other.option) || [],
     bundle: (other === null || other === void 0 ? void 0 : other.bundle) || (extend === null || extend === void 0 || (_extend$skuValue = extend.skuValue) === null || _extend$skuValue === void 0 ? void 0 : _extend$skuValue.bundle) || (extend === null || extend === void 0 || (_extend$_skuValue = extend._skuValue) === null || _extend$_skuValue === void 0 ? void 0 : _extend$_skuValue.bundle) || [],
     unique: other === null || other === void 0 ? void 0 : other.unique,

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

@@ -24,6 +24,14 @@ export interface GlobalScanApplyHost {
         cacheItem: any;
     };
     addProductToOrder(product: any, booking?: any): Promise<any>;
+    refreshWalletAssets?(params?: {
+        preserveSelection?: boolean;
+    }): Promise<any>;
+    scanWalletAsset?(code: string): Promise<{
+        type: 'walletCode' | 'normalCode';
+        asset?: any;
+        selected: boolean;
+    }>;
 }
 /**
  * 应用全局扫码格式化结果：设客户 / 加车 / 开单 / 弹窗链。