@pisell/pisellos 0.0.505 → 0.0.506

package/dist/solution/ScanOrder/index.js

@@ -87,11 +87,11 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
     key: "serializeError",
     value: function serializeError(error) {
       if (error instanceof Error) {
-        return {
+        return JSON.stringify({
           name: error.name,
           message: error.message,
           stack: error.stack
-        };
+        });
       }
       return {
         message: String(error)
@@ -761,8 +761,20 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
       var ruleProduct = this.enabledReservationRuleProducts[0];
       var resourceState = this.store.resource;
       var resourceSelectType = resourceState === null || resourceState === void 0 ? void 0 : resourceState.resourceSelectType;
+
+      // single 预约独占整张桌台，capacity 取 form_record.capacity；其他情况（multiple / capacity / undefined）占 1 个容量位
+      var resolveResourceCapacity = function resolveResourceCapacity() {
+        if (resourceSelectType === 'single') {
+          var _resourceState$table_;
+          var raw = resourceState === null || resourceState === void 0 || (_resourceState$table_ = resourceState.table_form_record) === null || _resourceState$table_ === void 0 ? void 0 : _resourceState$table_.capacity;
+          var num = Number(raw);
+          if (Number.isFinite(num) && num > 0) return num;
+          return 1;
+        }
+        return 1;
+      };
       return function (payload, _ref) {
-        var _tempOrder$resource_i, _ref2, _pickOriginal, _resourceState$table_, _resourceState$relati;
+        var _tempOrder$resource_i, _ref2, _pickOriginal, _resourceState$table_2, _resourceState$relati;
         var bookingUuid = _ref.bookingUuid,
           tempOrder = _ref.tempOrder;
         var resourceId = (_tempOrder$resource_i = tempOrder.resource_id) !== null && _tempOrder$resource_i !== void 0 ? _tempOrder$resource_i : resourceState === null || resourceState === void 0 ? void 0 : resourceState.relationId;
@@ -773,7 +785,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
           }
           return undefined;
         };
-        var mainField = (_ref2 = (_pickOriginal = pickOriginal(tempOrder.table_number)) !== null && _pickOriginal !== void 0 ? _pickOriginal : pickOriginal(resourceState === null || resourceState === void 0 || (_resourceState$table_ = resourceState.table_form_record) === null || _resourceState$table_ === void 0 ? void 0 : _resourceState$table_.name)) !== null && _ref2 !== void 0 ? _ref2 : '';
+        var mainField = (_ref2 = (_pickOriginal = pickOriginal(tempOrder.table_number)) !== null && _pickOriginal !== void 0 ? _pickOriginal : pickOriginal(resourceState === null || resourceState === void 0 || (_resourceState$table_2 = resourceState.table_form_record) === null || _resourceState$table_2 === void 0 ? void 0 : _resourceState$table_2.name)) !== null && _ref2 !== void 0 ? _ref2 : '';
         var resourceEntry = resourceState && resourceId ? {
           relation_type: 'form',
           like_status: 'common',
@@ -781,15 +793,22 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
           main_field: mainField,
           form_id: resourceState.tableFormId,
           relation_id: (_resourceState$relati = resourceState.relationId) !== null && _resourceState$relati !== void 0 ? _resourceState$relati : resourceId,
-          capacity: 1,
+          capacity: resolveResourceCapacity(),
           metadata: {}
         } : undefined;
         var ruleProductUid = ruleProduct ? createUuidV4() : undefined;
+        var bookingCapacityValue = resolveResourceCapacity();
         var nextBookings = (payload.bookings || []).map(function (booking, idx) {
           return _objectSpread(_objectSpread(_objectSpread({}, booking), {}, {
             appointment_status: 'started',
-            metadata: _objectSpread(_objectSpread({}, booking.metadata || {}), resourceSelectType ? {
+            metadata: _objectSpread(_objectSpread(_objectSpread({}, booking.metadata || {}), resourceSelectType ? {
               resource_select_type: resourceSelectType
+            } : {}), resourceSelectType ? {
+              capacity: [{
+                id: 0,
+                value: bookingCapacityValue,
+                name: ''
+              }]
             } : {})
           }, idx === 0 && resourceEntry ? {
             resources: [resourceEntry]
@@ -1789,20 +1808,17 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
         }
       } else if (lastOrderId) {
         // 如果有其他人点的单
-        // TODO: 是否独占？如果非独占，其他人点的单应该不影响我下单
-        availabilityInfo = allowSnack ? {
-          mode: deskmateValid ? 'additional_order_with_code' : 'additional_order',
-          order_id: lastOrderId,
-          relation_id: relationId,
-          table_form_id: tableFormId,
-          deskmate_valid: deskmateValid
-        } : {
-          mode: 'resource_busy',
-          order_id: lastOrderId,
-          relation_id: relationId,
-          table_form_id: tableFormId,
-          deskmate_valid: deskmateValid
-        };
+        // multiple 预约且容量仍有剩余时，其他人的单不影响当前用户下单，保持 idle 走正常下单流程
+        var canFallthroughToIdle = resourceSelectType === 'multiple' && !isFull;
+        if (!canFallthroughToIdle) {
+          availabilityInfo = {
+            mode: 'resource_busy',
+            order_id: '0',
+            relation_id: relationId,
+            table_form_id: tableFormId,
+            deskmate_valid: deskmateValid
+          };
+        }
       }
       return _objectSpread(_objectSpread({}, availabilityInfo), {}, {
         currentOrderId: currentOrderId,
@@ -2146,7 +2162,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
             case 78:
               _context28.prev = 78;
               _context28.t0 = _context28["catch"](1);
-              this.logMethodError('checkResourceAvailable', _context28.t0, {
+              this.logMethodError('checkResourceAvailable', _context28.t0.message, {
                 resourceId: resourceId
               });
               throw _context28.t0;
@@ -2225,7 +2241,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
             case 11:
               _context30.prev = 11;
               _context30.t0 = _context30["catch"](2);
-              this.logMethodError('getProductList', _context30.t0);
+              this.logMethodError('getProductList', _context30.t0.message);
               throw _context30.t0;
             case 15:
             case "end":

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

@@ -0,0 +1,49 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/model/strategy/adapter/promotion/index.ts
+var promotion_exports = {};
+__export(promotion_exports, {
+  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter: () => import_adapter.PromotionAdapter,
+  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
+  default: () => import_adapter2.default
+});
+module.exports = __toCommonJS(promotion_exports);
+var import_evaluator = require("./evaluator");
+var import_adapter = require("./adapter");
+var import_adapter2 = __toESM(require("./adapter"));
+var import_examples = require("./examples");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter,
+  PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY
+});

package/lib/solution/ScanOrder/index.js

@@ -84,11 +84,11 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
   }
   serializeError(error) {
     if (error instanceof Error) {
-      return {
+      return JSON.stringify({
         name: error.name,
         message: error.message,
         stack: error.stack
-      };
+      });
     }
     return {
       message: String(error)
@@ -503,6 +503,17 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
     const ruleProduct = this.enabledReservationRuleProducts[0];
     const resourceState = this.store.resource;
     const resourceSelectType = resourceState == null ? void 0 : resourceState.resourceSelectType;
+    const resolveResourceCapacity = () => {
+      var _a;
+      if (resourceSelectType === "single") {
+        const raw = (_a = resourceState == null ? void 0 : resourceState.table_form_record) == null ? void 0 : _a.capacity;
+        const num = Number(raw);
+        if (Number.isFinite(num) && num > 0)
+          return num;
+        return 1;
+      }
+      return 1;
+    };
     return (payload, { bookingUuid, tempOrder }) => {
       var _a;
       const resourceId = tempOrder.resource_id ?? (resourceState == null ? void 0 : resourceState.relationId);
@@ -521,16 +532,18 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         main_field: mainField,
         form_id: resourceState.tableFormId,
         relation_id: resourceState.relationId ?? resourceId,
-        capacity: 1,
+        capacity: resolveResourceCapacity(),
         metadata: {}
       } : void 0;
       const ruleProductUid = ruleProduct ? (0, import_utils2.createUuidV4)() : void 0;
+      const bookingCapacityValue = resolveResourceCapacity();
       const nextBookings = (payload.bookings || []).map((booking, idx) => ({
         ...booking,
         appointment_status: "started",
         metadata: {
           ...booking.metadata || {},
-          ...resourceSelectType ? { resource_select_type: resourceSelectType } : {}
+          ...resourceSelectType ? { resource_select_type: resourceSelectType } : {},
+          ...resourceSelectType ? { capacity: [{ id: 0, value: bookingCapacityValue, name: "" }] } : {}
         },
         ...idx === 0 && resourceEntry ? { resources: [resourceEntry] } : {},
         ...idx === 0 && ruleProductUid ? { product_uid: ruleProductUid } : {}
@@ -1054,19 +1067,16 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
         };
       }
     } else if (lastOrderId) {
-      availabilityInfo = allowSnack ? {
-        mode: deskmateValid ? "additional_order_with_code" : "additional_order",
-        order_id: lastOrderId,
-        relation_id: relationId,
-        table_form_id: tableFormId,
-        deskmate_valid: deskmateValid
-      } : {
-        mode: "resource_busy",
-        order_id: lastOrderId,
-        relation_id: relationId,
-        table_form_id: tableFormId,
-        deskmate_valid: deskmateValid
-      };
+      const canFallthroughToIdle = resourceSelectType === "multiple" && !isFull;
+      if (!canFallthroughToIdle) {
+        availabilityInfo = {
+          mode: "resource_busy",
+          order_id: "0",
+          relation_id: relationId,
+          table_form_id: tableFormId,
+          deskmate_valid: deskmateValid
+        };
+      }
     }
     return {
       ...availabilityInfo,
@@ -1319,7 +1329,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
       });
       return availabilityInfo;
     } catch (error) {
-      this.logMethodError("checkResourceAvailable", error, {
+      this.logMethodError("checkResourceAvailable", error.message, {
         resourceId
       });
       throw error;
@@ -1362,7 +1372,7 @@ var _ScanOrderImpl = class extends import_BaseModule.BaseModule {
       });
       return formattedRes;
     } catch (error) {
-      this.logMethodError("getProductList", error);
+      this.logMethodError("getProductList", error.message);
       throw error;
     }
   }

package/package.json

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