@pisell/pisellos 0.10.55 → 0.10.57

package/dist/modules/Order/utils.js

@@ -22,9 +22,11 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 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); }
-import dayjs from 'dayjs';
+import dayjs from "dayjs";
 import customParseFormat from 'dayjs/plugin/customParseFormat';
 import Decimal from 'decimal.js';
+import { withOriginalBundleOptionPrices } from "./utils/weighedProduct";
+import { hasManualProductDiscountFlag } from "./utils/manualProductDiscount";
 import { getProductHolderConfig } from "../Holder/utils";
 import { buildProductLineFingerprint, createEmptySummary } from "../../solution/ScanOrder/utils";
 import { createUuidV4 } from "./utils/orderCollectionIdentity";
@@ -898,7 +900,7 @@ export function createDefaultOrderRulesHooks(getBookings) {
       };
     },
     setProduct: function setProduct(product, values) {
-      var _ref32, _values$quantity, _ref33, _metadataAny$source_p, _values$discount_list, _values$quantity2;
+      var _ref32, _values$quantity, _ref33, _metadataAny$source_p, _product$product_sku, _values$discount_list, _values$quantity2;
       var nextNum = Number((_ref32 = (_values$quantity = values.quantity) !== null && _values$quantity !== void 0 ? _values$quantity : product.num) !== null && _ref32 !== void 0 ? _ref32 : 1) || 1;
       var metadataAny = product.metadata || {};
       var existedSource = (_ref33 = (_metadataAny$source_p = metadataAny.source_product_price) !== null && _metadataAny$source_p !== void 0 ? _metadataAny$source_p : product.selling_price) !== null && _ref33 !== void 0 ? _ref33 : '0';
@@ -924,7 +926,7 @@ export function createDefaultOrderRulesHooks(getBookings) {
       });
       var composedOriginalPrice = composeLinePrice({
         mainPrice: nextMainOriginalPrice,
-        bundle: nextBundle,
+        bundle: Number((_product$product_sku = product.product_sku) === null || _product$product_sku === void 0 ? void 0 : _product$product_sku.open_sold_weight) === 1 && hasManualProductDiscountFlag(metadataAny) ? withOriginalBundleOptionPrices(nextBundle) : nextBundle,
         useOriginalBundle: true
       });
       var finalOriginalPrice = resolveManualOverrideLineOriginalPrice({
@@ -1026,6 +1028,7 @@ export function ensureCartItemOriginHolder(cartItem, window) {
     form_record: [formRecordId]
   };
 }
+;
 export var getAllDiscountList = function getAllDiscountList(cartItem) {
   var _cartItem$_origin2, _cartItem$_origin3;
   var discountList = (cartItem === null || cartItem === void 0 || (_cartItem$_origin2 = cartItem._origin) === null || _cartItem$_origin2 === void 0 || (_cartItem$_origin2 = _cartItem$_origin2.product) === null || _cartItem$_origin2 === void 0 ? void 0 : _cartItem$_origin2.discount_list) || [];
@@ -1513,7 +1516,7 @@ export function buildSubmitPayload(params) {
     shop_discount: tempOrder.shop_discount || '0.00',
     surcharge_fee: tempOrder.surcharge_fee || '0.00',
     note: tempOrder.note || '',
-    delivery_type: tempOrder.delivery_type || 'nil',
+    delivery_type: tempOrder.delivery_type || 'shop_service',
     schedule_date: scheduleDate,
     // created_at: tempOrder.created_at || formatDateTime(now), 和后端协定这个字段先不提交到接口
     bookings: (tempOrder.bookings || []).filter(function (booking) {
@@ -1636,11 +1639,11 @@ export function mapPaymentItemsToOrderPayments(paymentItems) {
  */
 export function formatV1Product(products) {
   return products.map(function (product) {
-    var _product$product_sku, _product$note;
+    var _product$product_sku2, _product$note;
     return {
       bundle: product.product_bundle,
       key: product.product_id,
-      option: ((_product$product_sku = product.product_sku) === null || _product$product_sku === void 0 ? void 0 : _product$product_sku.option) || [],
+      option: ((_product$product_sku2 = product.product_sku) === null || _product$product_sku2 === void 0 ? void 0 : _product$product_sku2.option) || [],
       product_id: product.product_id,
       product_variant_id: product.product_variant_id,
       num: product.product_quantity,

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

@@ -171,11 +171,6 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
      * 获取钱包支付方式
      */
     getWalletPaymentMethod(): Promise<PaymentMethod | null>;
-    /**
-     * 确保支付模块所需的数据库表已创建
-     */
-    /** @deprecated */
-    private ensurePaymentTables;
     /**
      * 获取部分支付的订单
      */

package/dist/modules/Payment/index.js

@@ -199,10 +199,6 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               this.app = this.appPlugin.getApp();
               this.dbManager = this.app.dbManager;
               this.logger = this.app.logger;
-
-              // 确保支付模块所需的对象存储已创建
-              // await this.ensurePaymentTables();
-
               this.registerNetworkHandlers();
 
               // // 预连接数据库
@@ -1739,7 +1735,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               _context21.prev = 0;
               _context21.next = 3;
-              return this.dbManager.getAll('pay_method');
+              return this.getPayMethodListAsync();
             case 3:
               payMethods = _context21.sent;
               return _context21.abrupt("return", payMethods.find(function (method) {
@@ -1775,7 +1771,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               _context22.prev = 0;
               _context22.next = 3;
-              return this.dbManager.getAll('pay_method');
+              return this.getPayMethodListAsync();
             case 3:
               payMethods = _context22.sent;
               return _context22.abrupt("return", payMethods.find(function (method) {
@@ -1811,7 +1807,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               _context23.prev = 0;
               _context23.next = 3;
-              return this.dbManager.getAll('pay_method');
+              return this.getPayMethodListAsync();
             case 3:
               payMethods = _context23.sent;
               return _context23.abrupt("return", payMethods.find(function (method) {
@@ -1834,82 +1830,36 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
       return getWalletPaymentMethod;
     }()
     /**
-     * 确保支付模块所需的数据库表已创建
+     * 获取部分支付的订单
      */
     /** @deprecated */
     )
   }, {
-    key: "ensurePaymentTables",
+    key: "getPartiallyPaidOrdersAsync",
     value: (function () {
-      var _ensurePaymentTables = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24() {
+      var _getPartiallyPaidOrdersAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24() {
+        var allOrders;
         return _regeneratorRuntime().wrap(function _callee24$(_context24) {
           while (1) switch (_context24.prev = _context24.next) {
             case 0:
               _context24.prev = 0;
               _context24.next = 3;
-              return this.dbManager.getAll('pay_method');
-            case 3:
-              _context24.next = 9;
-              break;
-            case 5:
-              _context24.prev = 5;
-              _context24.t0 = _context24["catch"](0);
-              console.warn('[PaymentModule] pay_method 表不存在，请在数据库配置中添加以下配置：');
-              console.warn('{ name: "pay_method", keyPath: "id" }');
-            case 9:
-              _context24.prev = 9;
-              _context24.next = 12;
-              return this.dbManager.getAll('order');
-            case 12:
-              _context24.next = 18;
-              break;
-            case 14:
-              _context24.prev = 14;
-              _context24.t1 = _context24["catch"](9);
-              console.warn('[PaymentModule] order 表不存在，请在数据库配置中添加以下配置：');
-              console.warn('{ name: "order", keyPath: "uuid" }');
-            case 18:
-            case "end":
-              return _context24.stop();
-          }
-        }, _callee24, this, [[0, 5], [9, 14]]);
-      }));
-      function ensurePaymentTables() {
-        return _ensurePaymentTables.apply(this, arguments);
-      }
-      return ensurePaymentTables;
-    }()
-    /**
-     * 获取部分支付的订单
-     */
-    /** @deprecated */
-    )
-  }, {
-    key: "getPartiallyPaidOrdersAsync",
-    value: (function () {
-      var _getPartiallyPaidOrdersAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25() {
-        var allOrders;
-        return _regeneratorRuntime().wrap(function _callee25$(_context25) {
-          while (1) switch (_context25.prev = _context25.next) {
-            case 0:
-              _context25.prev = 0;
-              _context25.next = 3;
               return this.dbManager.getAll('order');
             case 3:
-              allOrders = _context25.sent;
-              return _context25.abrupt("return", allOrders.filter(function (order) {
+              allOrders = _context24.sent;
+              return _context24.abrupt("return", allOrders.filter(function (order) {
                 return order.payment_status === PaymentStatus.PartiallyPaid;
               }));
             case 7:
-              _context25.prev = 7;
-              _context25.t0 = _context25["catch"](0);
-              console.error('[PaymentModule] 获取部分支付订单失败', _context25.t0);
-              return _context25.abrupt("return", []);
+              _context24.prev = 7;
+              _context24.t0 = _context24["catch"](0);
+              console.error('[PaymentModule] 获取部分支付订单失败', _context24.t0);
+              return _context24.abrupt("return", []);
             case 11:
             case "end":
-              return _context25.stop();
+              return _context24.stop();
           }
-        }, _callee25, this, [[0, 7]]);
+        }, _callee24, this, [[0, 7]]);
       }));
       function getPartiallyPaidOrdersAsync() {
         return _getPartiallyPaidOrdersAsync.apply(this, arguments);
@@ -1930,17 +1880,17 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "roundAmountAsync",
     value: function () {
-      var _roundAmountAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(originalAmount, interval, rule) {
+      var _roundAmountAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(originalAmount, interval, rule) {
         var amount, roundingInterval, supportedIntervals, intervalValue, baseValue, roundedValue, finalAmount, originalAmountStr, roundedAmountStr, roundingDifference, roundingDifferenceStr;
-        return _regeneratorRuntime().wrap(function _callee26$(_context26) {
-          while (1) switch (_context26.prev = _context26.next) {
+        return _regeneratorRuntime().wrap(function _callee25$(_context25) {
+          while (1) switch (_context25.prev = _context25.next) {
             case 0:
-              _context26.prev = 0;
+              _context25.prev = 0;
               // 参数验证
               amount = new Decimal(originalAmount);
               roundingInterval = new Decimal(interval);
               if (!roundingInterval.lte(0)) {
-                _context26.next = 5;
+                _context25.next = 5;
                 break;
               }
               throw new Error('舍入间隔必须大于 0');
@@ -1954,25 +1904,25 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
 
               // 计算基础值：x / interval
               baseValue = amount.div(roundingInterval);
-              _context26.t0 = rule;
-              _context26.next = _context26.t0 === RoundingRule.Standard ? 12 : _context26.t0 === 'standard' ? 12 : _context26.t0 === RoundingRule.StandardDown ? 14 : _context26.t0 === 'standard_rounding_midpoint_down' ? 14 : _context26.t0 === RoundingRule.AlwaysUp ? 16 : _context26.t0 === 'always_up' ? 16 : _context26.t0 === RoundingRule.AlwaysDown ? 18 : _context26.t0 === 'always_down' ? 18 : 20;
+              _context25.t0 = rule;
+              _context25.next = _context25.t0 === RoundingRule.Standard ? 12 : _context25.t0 === 'standard' ? 12 : _context25.t0 === RoundingRule.StandardDown ? 14 : _context25.t0 === 'standard_rounding_midpoint_down' ? 14 : _context25.t0 === RoundingRule.AlwaysUp ? 16 : _context25.t0 === 'always_up' ? 16 : _context25.t0 === RoundingRule.AlwaysDown ? 18 : _context25.t0 === 'always_down' ? 18 : 20;
               break;
             case 12:
               // 标准舍入（中点向上）
               roundedValue = this.standardRound(baseValue, true);
-              return _context26.abrupt("break", 21);
+              return _context25.abrupt("break", 21);
             case 14:
               // 标准舍入（中点向下）
               roundedValue = this.standardRound(baseValue, false);
-              return _context26.abrupt("break", 21);
+              return _context25.abrupt("break", 21);
             case 16:
               // 总是向上舍入
               roundedValue = baseValue.ceil();
-              return _context26.abrupt("break", 21);
+              return _context25.abrupt("break", 21);
             case 18:
               // 总是向下舍入
               roundedValue = baseValue.floor();
-              return _context26.abrupt("break", 21);
+              return _context25.abrupt("break", 21);
             case 20:
               throw new Error("\u4E0D\u652F\u6301\u7684\u820D\u5165\u89C4\u5219: ".concat(rule));
             case 21:
@@ -1980,10 +1930,10 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               finalAmount = roundedValue.mul(roundingInterval);
               originalAmountStr = amount.toFixed(2); // 如果最终金额是 0 元，则不采用舍入金额，返回原始金额
               if (!finalAmount.eq(0)) {
-                _context26.next = 25;
+                _context25.next = 25;
                 break;
               }
-              return _context26.abrupt("return", {
+              return _context25.abrupt("return", {
                 originalAmount: originalAmountStr,
                 roundedAmount: originalAmountStr,
                 roundingDifference: '0.00'
@@ -1992,21 +1942,21 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               roundedAmountStr = finalAmount.toFixed(2); // 计算舍入差额
               roundingDifference = finalAmount.sub(amount);
               roundingDifferenceStr = roundingDifference.toFixed(2);
-              return _context26.abrupt("return", {
+              return _context25.abrupt("return", {
                 originalAmount: originalAmountStr,
                 roundedAmount: roundedAmountStr,
                 roundingDifference: roundingDifferenceStr
               });
             case 31:
-              _context26.prev = 31;
-              _context26.t1 = _context26["catch"](0);
-              console.error('[PaymentModule] 金额舍入失败:', _context26.t1);
-              throw new Error("\u91D1\u989D\u820D\u5165\u5931\u8D25: ".concat(_context26.t1 instanceof Error ? _context26.t1.message : String(_context26.t1)));
+              _context25.prev = 31;
+              _context25.t1 = _context25["catch"](0);
+              console.error('[PaymentModule] 金额舍入失败:', _context25.t1);
+              throw new Error("\u91D1\u989D\u820D\u5165\u5931\u8D25: ".concat(_context25.t1 instanceof Error ? _context25.t1.message : String(_context25.t1)));
             case 35:
             case "end":
-              return _context26.stop();
+              return _context25.stop();
           }
-        }, _callee26, this, [[0, 31]]);
+        }, _callee25, this, [[0, 31]]);
       }));
       function roundAmountAsync(_x27, _x28, _x29) {
         return _roundAmountAsync.apply(this, arguments);

package/dist/modules/ProductList/index.js

@@ -156,7 +156,10 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
         var _this$otherParams,
+          _this$otherParams$bus,
           _this$otherParams2,
+          _this$otherParams3,
+          _this$otherParams4,
           _this2 = this;
         var _ref,
           _ref$category_ids,
@@ -185,6 +188,8 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
           channelMap,
           rawApplicationCode,
           mappedApplicationCode,
+          configuredBusinessCode,
+          resolvedStrategyContext,
           queryPayload,
           handledByOsServer,
           originalCallback,
@@ -227,7 +232,15 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               };
               rawApplicationCode = (_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.channel;
               mappedApplicationCode = typeof rawApplicationCode === 'string' ? channelMap[rawApplicationCode] || rawApplicationCode : rawApplicationCode;
-              queryPayload = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, isCustomerUserPlatform((_this$otherParams2 = this.otherParams) === null || _this$otherParams2 === void 0 ? void 0 : _this$otherParams2.platform) ? {} : {
+              configuredBusinessCode = (_this$otherParams$bus = (_this$otherParams2 = this.otherParams) === null || _this$otherParams2 === void 0 ? void 0 : _this$otherParams2.businessCode) !== null && _this$otherParams$bus !== void 0 ? _this$otherParams$bus : (_this$otherParams3 = this.otherParams) === null || _this$otherParams3 === void 0 ? void 0 : _this$otherParams3.business_code; // application_code 是后端商品筛选字段；智能定价评估器则只读取
+              // strategy_context 中的 channel / business_code。默认补齐两者，
+              // 但允许调用方显式传入的上下文覆盖默认值。
+              resolvedStrategyContext = _objectSpread(_objectSpread(_objectSpread({}, mappedApplicationCode ? {
+                channel: mappedApplicationCode
+              } : {}), configuredBusinessCode ? {
+                business_code: configuredBusinessCode
+              } : {}), strategy_context || {});
+              queryPayload = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, isCustomerUserPlatform((_this$otherParams4 = this.otherParams) === null || _this$otherParams4 === void 0 ? void 0 : _this$otherParams4.platform) ? {} : {
                 open_quotation: 1
               }), {}, {
                 open_bundle: 0,
@@ -256,7 +269,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 with_schedule: with_schedule,
                 schedule_datetime: schedule_datetime,
                 extension_type: extension_type,
-                strategy_context: strategy_context
+                strategy_context: Object.keys(resolvedStrategyContext).length ? resolvedStrategyContext : undefined
               });
               handledByOsServer = isProductQueryHandledByOsServer(this.core, this.request);
               originalCallback = typeof (options === null || options === void 0 ? void 0 : options.callback) === 'function' ? options.callback : undefined;
@@ -305,14 +318,14 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                   return _ref2.apply(this, arguments);
                 };
               }()) : undefined;
-              _context5.next = 14;
+              _context5.next = 16;
               return this.request.post("/product/query", queryPayload, {
                 osServer: true,
                 callback: subscriptionCallback,
                 subscriberId: options === null || options === void 0 ? void 0 : options.subscriberId,
                 customToast: function customToast() {}
               });
-            case 14:
+            case 16:
               productsData = _context5.sent;
               if (!handledByOsServer && Array.isArray(productsData.data.list)) {
                 this.replaceRawProductQueryResult(productsData.data.list, product_ids);
@@ -335,7 +348,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               // }
               this.addProduct(sortedList);
               return _context5.abrupt("return", sortedList);
-            case 20:
+            case 22:
             case "end":
               return _context5.stop();
           }

package/dist/modules/ResourcePlanner/planner.js

@@ -436,7 +436,7 @@ function normalizeOccupancy(occupancy, coverage, timezoneName, fixedOffsetMinute
 }
 function normalizeRequirementGroup(product, requirementGroup) {
   var _requirementGroup$for;
-  var resourceType = 'single';
+  var resourceType = requirementGroup.resourceType === 'multiple' || requirementGroup.resourceType === 'capacity' ? requirementGroup.resourceType : 'single';
   var required = requirementGroup.required !== false;
   var min = required ? 1 : 0;
   return _objectSpread(_objectSpread({}, requirementGroup), {}, {
@@ -482,7 +482,7 @@ function normalizeProducts(products) {
 function normalizeResources(resources) {
   return resources.map(function (resource) {
     return _objectSpread(_objectSpread({}, resource), {}, {
-      resourceType: 'single',
+      resourceType: resource.resourceType === 'multiple' || resource.resourceType === 'capacity' ? resource.resourceType : 'single',
       capacity: Math.max(1, Number(resource.capacity || 1) || 1),
       windows: (resource.windows || []).map(function (window) {
         return _objectSpread({}, window);
@@ -637,7 +637,8 @@ function buildCells(projection) {
           var usedCapacity = segmentOccupancies.reduce(function (sum, occupancy) {
             return sum + Math.max(1, Number(occupancy.pax || 1) || 1);
           }, 0);
-          var remainingCapacity = Math.max(0, resource.capacity - usedCapacity);
+          // 预约模式来自商品资源组；v2 资源记录可能不包含 type。
+          var remainingCapacity = requirementGroup.resourceType === 'single' && segmentOccupancies.length > 0 ? 0 : Math.max(0, resource.capacity - usedCapacity);
           var requiredCapacity = resolveRequiredCapacity(requirementGroup, product);
           var reasonCodes = Array.from(new Set(segmentOccupancies.flatMap(function (occupancy) {
             var source = occupancy.source || 'remote';
@@ -671,7 +672,7 @@ function buildCells(projection) {
             requirementFormId: requirementGroup.formId,
             resourceId: resource.id,
             resourceName: resource.name,
-            resourceType: resource.resourceType,
+            resourceType: requirementGroup.resourceType,
             startAt: formatDateTime(start, timezoneName, fixedOffsetMinutes),
             endAt: formatDateTime(end, timezoneName, fixedOffsetMinutes),
             date: formatDate(start, timezoneName),
@@ -679,7 +680,7 @@ function buildCells(projection) {
             endTime: formatTime(end, timezoneName),
             timezone: projection.meta.timezone,
             status: status,
-            // 资源组当前统一单选；具体资源仍用 capacity 表达可承载的预约数量。
+            // capacity 表示人数；single 被占用时不再贡献可用容量。
             remainingCapacity: remainingCapacity,
             maxCapacity: resource.capacity,
             reasonCodes: Array.from(new Set(reasonCodes)),
@@ -1739,7 +1740,7 @@ function evaluateCandidate(projection, candidate, request) {
           resourceName: resource.name,
           resourceFormId: resource.formId,
           policyId: (_resource$raw = resource.raw) === null || _resource$raw === void 0 ? void 0 : _resource$raw.policy_id,
-          resourceType: resource.resourceType,
+          resourceType: requirementGroup.resourceType,
           status: _isPast ? 'past' : 'unavailable',
           maxPartySize: 0,
           reasonCodes: _isPast ? ['past'] : [].concat(_toConsumableArray(isExcludedScheduleDate ? ['schedule_excluded_date'] : []), ['outside_resource_window'])
@@ -1763,7 +1764,7 @@ function evaluateCandidate(projection, candidate, request) {
         resourceName: resource.name,
         resourceFormId: resource.formId,
         policyId: (_resource$raw2 = resource.raw) === null || _resource$raw2 === void 0 ? void 0 : _resource$raw2.policy_id,
-        resourceType: resource.resourceType,
+        resourceType: requirementGroup.resourceType,
         status: status,
         remainingCapacity: remainingCapacity,
         maxCapacity: maxCapacity,
@@ -2330,7 +2331,8 @@ export function validateAvailabilitySelection(projection, params) {
       var remainingCapacity = matchedCell === null || matchedCell === void 0 ? void 0 : matchedCell.remainingCapacity;
       if (option && (option.status === 'available' || option.status === 'limited') && remainingCapacity !== undefined) {
         var capacityPerBooking = normalizedPartySize !== null && normalizedPartySize !== void 0 ? normalizedPartySize : 1;
-        var availableQuantity = Math.max(0, Math.floor(remainingCapacity / capacityPerBooking));
+        var capacityQuantity = Math.max(0, Math.floor(remainingCapacity / capacityPerBooking));
+        var availableQuantity = matchedGroup.resourceType === 'single' ? Math.min(1, capacityQuantity) : capacityQuantity;
         if (normalizedBookingCount > availableQuantity) {
           conflicts.push({
             code: 'resource_capacity_exceeded',

package/dist/modules/Rules/index.js

@@ -387,7 +387,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       }) && productList.find(function (n) {
         return !n.booking_id;
       });
-      var reapplyBookingDiscountProductUids = new Set(((options === null || options === void 0 ? void 0 : options.reapplyBookingDiscountProductUids) || []).filter(function (uid) {
+      var reapplyWeighedDiscountProductUids = new Set(((options === null || options === void 0 ? void 0 : options.reapplyWeighedDiscountProductUids) || []).map(String));
+      var reapplyBookingDiscountProductUids = new Set([].concat(_toConsumableArray((options === null || options === void 0 ? void 0 : options.reapplyBookingDiscountProductUids) || []), _toConsumableArray(reapplyWeighedDiscountProductUids)).filter(function (uid) {
         return uid !== undefined && uid !== null && uid !== '';
       }).map(String));
       var getOriginProductUid = function getOriginProductUid(originProduct) {
@@ -400,8 +401,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         if (!selectedDiscount) return false;
         var uid = getOriginProductUid(originProduct);
         if (!uid || !reapplyBookingDiscountProductUids.has(uid)) return false;
-        var discountType = selectedDiscount.tag || selectedDiscount.type || '';
-        return selectedDiscount.isEditMode === true && selectedDiscount.isSelected === true && ['entitlement_pass', 'good_pass', 'discount_card', 'product_discount_card'].includes(discountType);
+        var discountType = selectedDiscount.tag || selectedDiscount.type;
+        return selectedDiscount.isEditMode === true && selectedDiscount.isSelected === true && ['entitlement_pass', 'good_pass', 'discount_card', 'product_discount_card'].includes(discountType !== null && discountType !== void 0 ? discountType : '');
       };
       var resolveReapplyBookingDiscountPercent = function resolveReapplyBookingDiscountPercent(originProduct, selectedDiscount) {
         var _discount2;
@@ -454,8 +455,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         };
       }
       var canUseEditModeDiscountForReapply = function canUseEditModeDiscountForReapply(discount) {
-        var discountType = discount.tag || discount.type || '';
-        return reapplyBookingDiscountProductUids.size > 0 && discount.isEditMode === true && discount.isSelected === true && ['entitlement_pass', 'good_pass', 'discount_card', 'product_discount_card'].includes(discountType);
+        var discountType = discount.tag || discount.type;
+        return reapplyBookingDiscountProductUids.size > 0 && discount.isEditMode === true && discount.isSelected === true && ['entitlement_pass', 'good_pass', 'discount_card', 'product_discount_card'].includes(discountType !== null && discountType !== void 0 ? discountType : '');
       };
 
       // 过滤掉手动取消false的优惠券，但仅用于应用优惠逻辑。
@@ -695,9 +696,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         addModeDiscount.forEach(function (discount) {
           // 即使没有匹配的动态策略，服务端状态和次数限制也不能被覆盖为可用。
           if (discount.reasonCode) return;
-          var discountType = discount.tag || discount.type || '';
+          var discountType = discount.tag || discount.type;
           // 对两类全额抵扣卡和折扣卡执行附加策略检查。
-          if (['entitlement_pass', 'good_pass', 'discount_card', 'product_discount_card'].includes(discountType)) {
+          if (['entitlement_pass', 'good_pass', 'discount_card', 'product_discount_card'].includes(discountType !== null && discountType !== void 0 ? discountType : '')) {
             var _discount$unified_ava, _discount$limited_rel, _discount$limited_rel2;
             var entitlementQuota = isEntitlementPass(discount) ? resolveEntitlementQuota(discount) : null;
             if (isEntitlementPass(discount) && !entitlementQuota) {
@@ -1319,7 +1320,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         }));
 
         // 已持久化且已有钱包券/折扣卡的商品行跳过，保留后端历史折扣结果。
-        if (isPersistedProduct && hasExistingWalletDiscount) {
+        var isReweighedProduct = reapplyWeighedDiscountProductUids.has(getOriginProductUid(originProduct) || '');
+        if (isPersistedProduct && hasExistingWalletDiscount && !isReweighedProduct) {
           if (flatItem.type === 'main') {
             processedProductsMap.set(product._id, [originProduct]);
           }
@@ -1334,7 +1336,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var _product$discount_lis3, _product$discount_lis4;
           if (_this4.isItemRewardProductDiscount(product)) return false;
           // 🔥 检查策略可用性（针对全额抵扣卡和折扣卡）
-          var discountType = discount.tag || discount.type || '';
+          var discountType = discount.tag || discount.type;
           var currentOriginUid = getOriginProductUid(originProduct);
           var isReapplyEditModeDiscountForProduct = discount.isEditMode && reapplyBookingDiscountProductUids.size > 0 && currentOriginUid && reapplyBookingDiscountProductUids.has(String(currentOriginUid)) && discount.isSelected === true;
           if (discount.isEditMode && reapplyBookingDiscountProductUids.size > 0) {
@@ -1342,7 +1344,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             if (!uid || !reapplyBookingDiscountProductUids.has(uid)) return false;
             if (!discount.isSelected) return false;
           }
-          if (['entitlement_pass', 'good_pass', 'discount_card', 'product_discount_card'].includes(discountType) && !isReapplyEditModeDiscountForProduct) {
+          if (['entitlement_pass', 'good_pass', 'discount_card', 'product_discount_card'].includes(discountType !== null && discountType !== void 0 ? discountType : '') && !isReapplyEditModeDiscountForProduct) {
             var _discount$config4;
             // 如果策略检查后没有config，说明不可用
             if (discount.config === undefined || !(discount !== null && discount !== void 0 && (_discount$config4 = discount.config) !== null && _discount$config4 !== void 0 && _discount$config4.isAvailable)) {
@@ -1418,8 +1420,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         // 识别用户本次显式选择的卡券，供次卡和折扣卡各自的优先级使用。
         // 目标仍必须在当前商品的 applicableDiscounts 中，因此不会绕过 Holder、时间或商品范围校验。
         var explicitlySelectedDiscount = (options === null || options === void 0 ? void 0 : options.isSelected) === true && options.discountId !== undefined ? applicableDiscounts.find(function (discount) {
-          var discountType = discount.tag || discount.type || '';
-          return String(discount.id) === String(options.discountId) && ['entitlement_pass', 'good_pass', 'discount_card', 'product_discount_card'].includes(discountType);
+          var discountType = discount.tag || discount.type;
+          return String(discount.id) === String(options.discountId) && ['entitlement_pass', 'good_pass', 'discount_card', 'product_discount_card'].includes(discountType !== null && discountType !== void 0 ? discountType : '');
         }) : undefined;
         // 折扣卡会复用于整条商品行；商品券必须继续按单张拆分，不能复用该分支。
         var explicitlySelectedDiscountCard = explicitlySelectedDiscount && !isFullCoveragePass(explicitlySelectedDiscount) ? explicitlySelectedDiscount : undefined;
@@ -1435,8 +1437,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           return id !== undefined && id !== null;
         }).map(String));
         var appliedDiscountCard = options !== null && options !== void 0 && options.scan ? undefined : applicableDiscounts.find(function (discount) {
-          var discountType = discount.tag || discount.type || '';
-          return discount.isSelected === true && ['discount_card', 'product_discount_card'].includes(discountType) && appliedWalletDiscountIds.has(String(discount.id));
+          var discountType = discount.tag || discount.type;
+          return discount.isSelected === true && ['discount_card', 'product_discount_card'].includes(discountType !== null && discountType !== void 0 ? discountType : '') && appliedWalletDiscountIds.has(String(discount.id));
         });
         var appliedEntitlementPass = options !== null && options !== void 0 && options.scan || (options === null || options === void 0 ? void 0 : options.preserveEntitlementSelection) === false ? undefined : applicableDiscounts.find(function (discount) {
           return isEntitlementPass(discount) && discount.isSelected === true && appliedWalletDiscountIds.has(String(discount.id));

package/dist/modules/Rules/types.d.ts

@@ -35,6 +35,8 @@ export interface RulesCalcDiscountOptions {
     preserveEntitlementSelection?: boolean;
     /** Change time 重报价目标行：允许已选编辑态折扣卡重新应用到这些 booking 商品。 */
     reapplyBookingDiscountProductUids?: string[];
+    /** Reweighed order lines only: reapply selected wallet discounts against their new amount. */
+    reapplyWeighedDiscountProductUids?: string[];
 }
 export interface RulesModuleAPI {
     setRulesList: (rulesList: Rules[]) => Promise<void>;

package/dist/plugins/request.d.ts

@@ -56,6 +56,10 @@ export interface CacheProps {
  * 请求配置
  */
 export interface RequestOptions {
+    /** Customer-only, credential-free GET /open/document/{id} on picoding. */
+    publicInvoiceDocument?: boolean;
+    /** Route through the host's configured picoding environment. */
+    pisell2?: boolean;
     /** Let the caller handle read-only preview failures without host navigation/toasts. */
     manualErrorHandling?: boolean;
     skipErrorHandler?: boolean;