@pisell/pisellos 2.2.242 → 2.2.244

package/dist/solution/VenueBooking/index.js

@@ -44,8 +44,8 @@ import { ItemRuleEvaluator } from "../../model/strategy/adapter/itemRule";
 import { extractResourceIds, buildResourceProductMap } from "./utils/resource";
 import { buildTimeSlotGrid, isBusinessHoursCrossDay, generateTimeLabels } from "./utils/timeSlot";
 import { buildDateRangeSummary } from "./utils/dateSummary";
-import { mergeConsecutiveSlots, expandMergedSlotToIndividual, buildVenueIdentityKey, buildVenueBookingEntry, buildVenueResourceMetadata, buildPriceBreakdown } from "./utils/slotMerge";
-import { composeLinePrice, createUuidV4, getProductSkuOptions, sumOptionUnitPrice } from "../../modules/Order/utils";
+import { mergeConsecutiveSlots, expandMergedSlotToIndividual, buildVenueIdentityKey, buildVenueBookingEntry, buildPriceBreakdown } from "./utils/slotMerge";
+import { composeLinePrice, createUuidV4, sumOptionUnitPrice } from "../../modules/Order/utils";
 import { OrderModule } from "../../modules/Order";
 import { RegisterAndLoginHooks } from "../RegisterAndLogin/types";
 import Decimal from 'decimal.js';
@@ -112,26 +112,6 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
         moduleName: 'venueBooking'
       };
     }
-  }, {
-    key: "safeStringify",
-    value: function safeStringify(value) {
-      try {
-        return JSON.stringify(value);
-      } catch (_unused) {
-        return undefined;
-      }
-    }
-  }, {
-    key: "pickErrorMessage",
-    value: function pickErrorMessage(error) {
-      var _error$data, _error$response, _error$error;
-      var candidates = [error.message, (_error$data = error.data) === null || _error$data === void 0 ? void 0 : _error$data.message, (_error$response = error.response) === null || _error$response === void 0 || (_error$response = _error$response.data) === null || _error$response === void 0 ? void 0 : _error$response.message, (_error$error = error.error) === null || _error$error === void 0 ? void 0 : _error$error.message];
-      for (var _i = 0, _candidates = candidates; _i < _candidates.length; _i++) {
-        var candidate = _candidates[_i];
-        if (typeof candidate === 'string' && candidate.trim()) return candidate;
-      }
-      return undefined;
-    }
   }, {
     key: "serializeError",
     value: function serializeError(error) {
@@ -142,21 +122,6 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
           stack: error.stack
         };
       }
-      if (error && _typeof(error) === 'object') {
-        var raw = error;
-        var message = this.pickErrorMessage(raw) || this.safeStringify(raw) || String(error);
-        return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, typeof raw.name === 'string' ? {
-          name: raw.name
-        } : {}), {}, {
-          message: message
-        }, 'code' in raw ? {
-          code: raw.code
-        } : {}), 'status' in raw ? {
-          status: raw.status
-        } : {}), this.safeStringify(raw) ? {
-          raw: this.safeStringify(raw)
-        } : {});
-      }
       return {
         message: String(error)
       };
@@ -281,8 +246,8 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
     value: function resolveCustomerIdFromLoginPayload(payload) {
       var _payload$user, _payload$user2, _payload$user3, _payload$user4, _payload$account, _payload$account2, _payload$account3, _payload$_origin;
       var candidates = [payload === null || payload === void 0 ? void 0 : payload.customerId, payload === null || payload === void 0 ? void 0 : payload.customer_id, payload === null || payload === void 0 ? void 0 : payload.id, payload === null || payload === void 0 || (_payload$user = payload.user) === null || _payload$user === void 0 ? void 0 : _payload$user.customerId, payload === null || payload === void 0 || (_payload$user2 = payload.user) === null || _payload$user2 === void 0 ? void 0 : _payload$user2.customer_id, payload === null || payload === void 0 || (_payload$user3 = payload.user) === null || _payload$user3 === void 0 ? void 0 : _payload$user3.id, payload === null || payload === void 0 || (_payload$user4 = payload.user) === null || _payload$user4 === void 0 || (_payload$user4 = _payload$user4._origin) === null || _payload$user4 === void 0 ? void 0 : _payload$user4.customer_id, payload === null || payload === void 0 || (_payload$account = payload.account) === null || _payload$account === void 0 ? void 0 : _payload$account.customerId, payload === null || payload === void 0 || (_payload$account2 = payload.account) === null || _payload$account2 === void 0 ? void 0 : _payload$account2.customer_id, payload === null || payload === void 0 || (_payload$account3 = payload.account) === null || _payload$account3 === void 0 ? void 0 : _payload$account3.id, payload === null || payload === void 0 || (_payload$_origin = payload._origin) === null || _payload$_origin === void 0 ? void 0 : _payload$_origin.customer_id];
-      for (var _i2 = 0, _candidates2 = candidates; _i2 < _candidates2.length; _i2++) {
-        var candidate = _candidates2[_i2];
+      for (var _i = 0, _candidates = candidates; _i < _candidates.length; _i++) {
+        var candidate = _candidates[_i];
         var customerId = this.normalizeCustomerId(candidate);
         if (customerId) return customerId;
       }
@@ -534,14 +499,12 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                   var _this4$store$order, _this4$otherParams, _this4$otherParams2, _this4$otherParams3, _this4$otherParams4;
                   _this4.store[step] = targetModule;
                   var initialState = step === 'salesSummary' ? {
+                    // TODO(Order types): VenueBooking should read OrderState.summary instead of tempOrder.summary.
                     summary: ((_this4$store$order = _this4.store.order) === null || _this4$store$order === void 0 || (_this4$store$order = _this4$store$order.getTempOrder()) === null || _this4$store$order === void 0 ? void 0 : _this4$store$order.summary) || createEmptySummary()
                   } : {};
                   var loggerProvider = ((_this4$otherParams = _this4.otherParams) === null || _this4$otherParams === void 0 ? void 0 : _this4$otherParams.loggerProvider) || 'feishu';
                   var loggerConfig = ((_this4$otherParams2 = _this4.otherParams) === null || _this4$otherParams2 === void 0 ? void 0 : _this4$otherParams2.loggerConfig) || {
-                    feishu: {
-                      webhook: 'https://open.feishu.cn/open-apis/bot/v2/hook/8f069b14-9d39-4728-8f78-b56f393bfde8',
-                      errorHook: 'https://open.feishu.cn/open-apis/bot/v2/hook/bdefae5e-f233-4705-8688-946887d9543d'
-                    }
+                    feishu: {}
                   };
                   _this4.core.registerModule(targetModule, {
                     initialState: initialState,
@@ -866,28 +829,24 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error('addonProducts 模块未初始化');
             case 6:
-              _context11.next = 8;
-              return this.loadOpenDataConfig();
-            case 8:
               associatedMenus = ((_this$otherParams7 = this.otherParams) === null || _this$otherParams7 === void 0 || (_this$otherParams7 = _this$otherParams7.openData) === null || _this$otherParams7 === void 0 ? void 0 : _this$otherParams7['menu.associated_menus']) || [];
               if (associatedMenus.length) {
-                _context11.next = 12;
+                _context11.next = 9;
                 break;
               }
-              this.logMethodError('loadAllProducts', new Error('未获取到餐牌配置（menu.associated_menus），请检查 OpenData 配置'));
               throw new Error('未获取到餐牌配置（menu.associated_menus），请检查 OpenData 配置');
-            case 12:
+            case 9:
               menuListIds = associatedMenus.map(function (n) {
                 return Number(n.value);
               });
-              _context11.next = 15;
+              _context11.next = 12;
               return this.store.venueProducts.loadProducts({
                 menu_list_ids: menuListIds,
                 cacheId: this.cacheId,
                 schedule_date: dayjs().format('YYYY-MM-DD'),
                 schedule_datetime: dayjs().format('YYYY-MM-DD HH:mm:ss')
               });
-            case 15:
+            case 12:
               allProducts = _context11.sent;
               list = Array.isArray(allProducts) ? allProducts : [];
               venueList = list.filter(function (p) {
@@ -915,16 +874,16 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 venueProducts: venueList,
                 addonProducts: addonList
               });
-            case 28:
-              _context11.prev = 28;
+            case 25:
+              _context11.prev = 25;
               _context11.t0 = _context11["catch"](1);
               this.logMethodError('loadAllProducts', _context11.t0);
               throw _context11.t0;
-            case 32:
+            case 29:
             case "end":
               return _context11.stop();
           }
-        }, _callee11, this, [[1, 28]]);
+        }, _callee11, this, [[1, 25]]);
       }));
       function _doLoadAllProducts() {
         return _doLoadAllProducts2.apply(this, arguments);
@@ -1036,7 +995,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
     key: "fetchResourceAvailability",
     value: function () {
       var _fetchResourceAvailability = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(params) {
-        var venueProducts, resourceIds, config, crossDay, effectiveEndDate, res, rawData, _iterator2, _step2, item, _i3, _rawData, _item, mappings, _iterator3, _step3, mapping;
+        var venueProducts, resourceIds, config, crossDay, effectiveEndDate, res, rawData, _iterator2, _step2, item, _i2, _rawData, _item, mappings, _iterator3, _step3, mapping;
         return _regeneratorRuntime().wrap(function _callee15$(_context15) {
           while (1) switch (_context15.prev = _context15.next) {
             case 0:
@@ -1104,13 +1063,13 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 }
               }
               this.store.rawResourceData = rawData;
-              _i3 = 0, _rawData = rawData;
+              _i2 = 0, _rawData = rawData;
             case 24:
-              if (!(_i3 < _rawData.length)) {
+              if (!(_i2 < _rawData.length)) {
                 _context15.next = 34;
                 break;
               }
-              _item = _rawData[_i3];
+              _item = _rawData[_i2];
               mappings = this.resourceProductMap.get(_item.resourceId);
               if (mappings) {
                 _context15.next = 29;
@@ -1131,7 +1090,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 _iterator3.f();
               }
             case 31:
-              _i3++;
+              _i2++;
               _context15.next = 24;
               break;
             case 34:
@@ -1669,10 +1628,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                   form_id: (_rawResource$form_id = rawResource === null || rawResource === void 0 ? void 0 : rawResource.form_id) !== null && _rawResource$form_id !== void 0 ? _rawResource$form_id : mapping.formId,
                   relation_id: resourceId,
                   capacity: 1,
-                  metadata: buildVenueResourceMetadata({
-                    mapping: mapping,
-                    rawResource: rawResource
-                  })
+                  metadata: {}
                 };
                 if (childRawResources && childRawResources.length) {
                   resourceEntry.children = childRawResources.map(function (child) {
@@ -1726,9 +1682,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                       product_variant_id: 0,
                       num: 1,
                       product_bundle: [],
-                      product_sku: {
-                        option: []
-                      },
+                      product_option_item: [],
                       discount_list: [],
                       custom_deposit_data: customDepositData,
                       metadata: {}
@@ -2185,7 +2139,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
               totalPerUnitDiscount = (product.discount_list || []).reduce(function (sum, pd) {
                 return sum + (pd.amount || 0);
               }, 0);
-              optionSum = sumOptionUnitPrice(getProductSkuOptions(product));
+              optionSum = sumOptionUnitPrice(product.product_option_item);
               sourcePrice = (_product$metadata$sou = (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.source_product_price) !== null && _product$metadata$sou !== void 0 ? _product$metadata$sou : ((_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.main_product_original_price) != null ? new Decimal(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : (_product$original_pri = product.original_price) !== null && _product$original_pri !== void 0 ? _product$original_pri : '0';
               newSourceSellingPrice = new Decimal(Number(sourcePrice) || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
               newMainSellingPrice = new Decimal(Number(newSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
@@ -2228,6 +2182,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 50:
               this.store.order.persistTempOrder();
+              // TODO(Order types): VenueBooking should read OrderState.summary instead of tempOrder.summary.
               finalSummary = ((_this$store$order$get = this.store.order.getTempOrder()) === null || _this$store$order$get === void 0 ? void 0 : _this$store$order$get.summary) || null;
               finalProduct = ((_this$store$order$get2 = this.store.order.getTempOrder()) === null || _this$store$order$get2 === void 0 || (_this$store$order$get2 = _this$store$order$get2.products) === null || _this$store$order$get2 === void 0 ? void 0 : _this$store$order$get2[0]) || null;
               this.logMethodSuccess('setDiscountSelected', params);
@@ -2295,8 +2250,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
     key: "getOrderProducts",
     value: function getOrderProducts() {
       if (!this.store.order) throw new Error('order 模块未初始化');
-      var products = this.store.order.getOrderProducts();
-      return products;
+      return this.store.order.getOrderProducts();
     }
   }, {
     key: "getSummary",
@@ -2451,14 +2405,14 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
       return addProductToOrder;
     }()
   }, {
-    key: "updateOrderProduct",
+    key: "updateProductInOrder",
     value: function () {
-      var _updateOrderProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(params) {
+      var _updateProductInOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(params) {
         var products;
         return _regeneratorRuntime().wrap(function _callee26$(_context26) {
           while (1) switch (_context26.prev = _context26.next) {
             case 0:
-              this.logMethodStart('updateOrderProduct', {
+              this.logMethodStart('updateProductInOrder', {
                 product_id: params.product_id,
                 product_variant_id: params.product_variant_id
               });
@@ -2470,7 +2424,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
               throw new Error('order 模块未初始化');
             case 4:
               _context26.next = 6;
-              return this.store.order.updateOrderProduct(params);
+              return this.store.order.updateProductInOrder(params);
             case 6:
               products = _context26.sent;
               _context26.next = 9;
@@ -2479,14 +2433,14 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
               _context26.next = 11;
               return this.refreshCartValidationPassed();
             case 11:
-              this.logMethodSuccess('updateOrderProduct', {
+              this.logMethodSuccess('updateProductInOrder', {
                 productCount: products.length
               });
               return _context26.abrupt("return", products);
             case 15:
               _context26.prev = 15;
               _context26.t0 = _context26["catch"](1);
-              this.logMethodError('updateOrderProduct', _context26.t0);
+              this.logMethodError('updateProductInOrder', _context26.t0);
               throw _context26.t0;
             case 19:
             case "end":
@@ -2494,10 +2448,10 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee26, this, [[1, 15]]);
       }));
-      function updateOrderProduct(_x17) {
-        return _updateOrderProduct.apply(this, arguments);
+      function updateProductInOrder(_x17) {
+        return _updateProductInOrder.apply(this, arguments);
       }
-      return updateOrderProduct;
+      return updateProductInOrder;
     }()
   }, {
     key: "removeProductFromOrder",
@@ -2544,6 +2498,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
               }
               return _context27.abrupt("continue", 20);
             case 18:
+              // TODO(Order types): VenueBooking should use metadata.unique_identification_number only.
               if (product.identity_key) venueProductUids.add(String(product.identity_key));
               if ((_product$metadata7 = product.metadata) !== null && _product$metadata7 !== void 0 && _product$metadata7.booking_uid) {
                 venueBookingUids.add(String(product.metadata.booking_uid));
@@ -2638,7 +2593,8 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadOpenDataConfig",
     value: function () {
       var _loadOpenDataConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29() {
-        var lastFetchedAt, cachedData, openDataConfig;
+        var _this11 = this;
+        var lastFetchedAt, cachedData;
         return _regeneratorRuntime().wrap(function _callee29$(_context29) {
           while (1) switch (_context29.prev = _context29.next) {
             case 0:
@@ -2658,35 +2614,27 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
               return _context29.abrupt("return", cachedData);
             case 7:
               if (!this.loadOpenDataConfigInFlight) {
-                _context29.next = 11;
+                _context29.next = 9;
                 break;
               }
-              _context29.next = 10;
-              return this.loadOpenDataConfigInFlight;
-            case 10:
-              return _context29.abrupt("return", _context29.sent);
-            case 11:
+              return _context29.abrupt("return", this.loadOpenDataConfigInFlight);
+            case 9:
               this.loadOpenDataConfigInFlight = this.store.openData.fetchOpenData({
                 scope: 'board',
                 target: 'venue_booking+online_store',
                 section_code: [].concat(OPEN_DATA_SECTION_CODES)
+              }).then(function (openDataConfig) {
+                _this11.otherParams.openData = openDataConfig;
+                return openDataConfig;
+              }).finally(function () {
+                _this11.loadOpenDataConfigInFlight = null;
               });
-              _context29.prev = 12;
-              _context29.next = 15;
-              return this.loadOpenDataConfigInFlight;
-            case 15:
-              openDataConfig = _context29.sent;
-              this.otherParams.openData = openDataConfig;
-              return _context29.abrupt("return", openDataConfig);
-            case 18:
-              _context29.prev = 18;
-              this.loadOpenDataConfigInFlight = null;
-              return _context29.finish(18);
-            case 21:
+              return _context29.abrupt("return", this.loadOpenDataConfigInFlight);
+            case 11:
             case "end":
               return _context29.stop();
           }
-        }, _callee29, this, [[12,, 18, 21]]);
+        }, _callee29, this);
       }));
       function loadOpenDataConfig() {
         return _loadOpenDataConfig.apply(this, arguments);
@@ -2832,8 +2780,8 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                   var key = buildProductKey(productId, normalizedVariantId);
                   if (!sourceMap.has(key)) sourceMap.set(key, node);
                 }
-                for (var _i4 = 0, _Object$values = Object.values(node); _i4 < _Object$values.length; _i4++) {
-                  var childValue = _Object$values[_i4];
+                for (var _i3 = 0, _Object$values = Object.values(node); _i3 < _Object$values.length; _i3++) {
+                  var childValue = _Object$values[_i3];
                   if (childValue && _typeof(childValue) === 'object') collectFromValue(childValue);
                 }
               };
@@ -2866,7 +2814,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
     key: "ensureItemRuleConfigsLoaded",
     value: function () {
       var _ensureItemRuleConfigsLoaded = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34() {
-        var _this11 = this;
+        var _this12 = this;
         return _regeneratorRuntime().wrap(function _callee34$(_context34) {
           while (1) switch (_context34.prev = _context34.next) {
             case 0:
@@ -2887,19 +2835,19 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 return _regeneratorRuntime().wrap(function _callee33$(_context33) {
                   while (1) switch (_context33.prev = _context33.next) {
                     case 0:
-                      runtimeConfig = _this11.getItemRuleRuntimeConfig();
+                      runtimeConfig = _this12.getItemRuleRuntimeConfig();
                       staticConfigs = normalizeItemRuleStrategies(runtimeConfig.strategyConfigs);
                       if (!(staticConfigs.length > 0)) {
                         _context33.next = 6;
                         break;
                       }
-                      _this11.itemRuleConfigs = staticConfigs;
-                      _this11.itemRuleEvaluator.setStrategyConfigs(staticConfigs);
-                      return _context33.abrupt("return", _this11.itemRuleConfigs);
+                      _this12.itemRuleConfigs = staticConfigs;
+                      _this12.itemRuleEvaluator.setStrategyConfigs(staticConfigs);
+                      return _context33.abrupt("return", _this12.itemRuleConfigs);
                     case 6:
-                      _this11.itemRuleConfigs = [];
-                      _this11.itemRuleEvaluator.setStrategyConfigs([]);
-                      return _context33.abrupt("return", _this11.itemRuleConfigs);
+                      _this12.itemRuleConfigs = [];
+                      _this12.itemRuleEvaluator.setStrategyConfigs([]);
+                      return _context33.abrupt("return", _this12.itemRuleConfigs);
                     case 9:
                     case "end":
                       return _context33.stop();
@@ -3080,6 +3028,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                   item_rule_prefill: true,
                   item_rule_id: prefillItem.ruleId
                 }),
+                // TODO(Order types): migrate VenueBooking prefill origin runtime into tempOrder._extend.
                 _origin: sourceItem ? _objectSpread(_objectSpread({}, targetProduct._origin || {}), sourceItem) : targetProduct._origin
               });
               if (delta > 0 || Boolean(sourceItem && (!targetProduct._origin || ((_origin2 = targetProduct._origin) === null || _origin2 === void 0 ? void 0 : _origin2.price) !== (sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.price)))) {
@@ -3360,7 +3309,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
         var raw = this.window.sessionStorage.getItem(key) || '{}';
         var parsed = JSON.parse(raw);
         return parsed && _typeof(parsed) === 'object' ? parsed : {};
-      } catch (_unused3) {
+      } catch (_unused2) {
         return {};
       }
     }

package/dist/solution/VenueBooking/sales-section-4-annotated.json

@@ -71,6 +71,8 @@
         "num__comment": "数量；int；↕；必填。统一使用 num，不再使用 product_quantity。",
         "product_variant_id": 0,
         "product_variant_id__comment": "多规格 ID；int；↕；可选。",
+        "product_option_item": [],
+        "product_option_item__comment": "选项配置；array；↕；可选。",
         "selling_price": "50.00",
         "selling_price__comment": "销售单价（交易快照）；string；←；服务端返回，不能依赖基准数据回填。",
         "original_price": "60.00",

package/dist/solution/VenueBooking/utils/slotMerge.d.ts

@@ -12,10 +12,6 @@ export declare function buildPriceBreakdown(params: {
         }) => number;
     };
 }): PriceBreakdownEntry[];
-export declare function buildVenueResourceMetadata(params: {
-    mapping: ResourceProductMapping;
-    rawResource: VenueResourceRawData | undefined;
-}): Record<string, any>;
 export interface BuildVenueBookingParams {
     group: MergedSlotGroup;
     resourceId: number | string;

package/dist/solution/VenueBooking/utils/slotMerge.js

@@ -89,16 +89,6 @@ export function buildPriceBreakdown(params) {
   }
   return entries;
 }
-export function buildVenueResourceMetadata(params) {
-  var _rawResource$form_nam, _ref, _rawResource$main_fie, _rawResource$combined;
-  var mapping = params.mapping,
-    rawResource = params.rawResource;
-  return {
-    form_name: (_rawResource$form_nam = rawResource === null || rawResource === void 0 ? void 0 : rawResource.form_name) !== null && _rawResource$form_nam !== void 0 ? _rawResource$form_nam : '',
-    resource_name: (_ref = (_rawResource$main_fie = rawResource === null || rawResource === void 0 ? void 0 : rawResource.main_field) !== null && _rawResource$main_fie !== void 0 ? _rawResource$main_fie : mapping.resourceName) !== null && _ref !== void 0 ? _ref : '',
-    combined_resource: (_rawResource$combined = rawResource === null || rawResource === void 0 ? void 0 : rawResource.combined_resource) !== null && _rawResource$combined !== void 0 ? _rawResource$combined : null
-  };
-}
 export function buildVenueBookingEntry(params) {
   var _rawResource$form_id;
   var group = params.group,

package/dist/types/index.d.ts

@@ -14,16 +14,6 @@ export interface Module {
     name: string;
     version: string;
     initialize: (core: PisellCore, options: ModuleOptions) => Promise<void> | void;
-    /**
-     * 父级解决方案运行时更新 otherParams 后，显式通知子模块刷新自己的运行态参数。
-     *
-     * @example
-     * await module.updateOtherParams?.({ channel: 'pos' }, { changedParams: { channel: 'pos' } });
-     */
-    updateOtherParams?: (params: Record<string, any>, meta?: {
-        changedParams?: Record<string, any>;
-        cover?: boolean;
-    }) => Promise<void> | void;
     destroy?: () => Promise<void> | void;
     exports?: Record<string, any>;
     isSolution?: boolean;

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

@@ -528,8 +528,7 @@ var PromotionEvaluator = class {
       return b.price - a.price;
     });
     const totalUnits = unitProducts.length;
-    const isCumulative = cumulative !== false;
-    const groupCount = isCumulative ? Math.floor(totalUnits / x) : totalUnits >= x ? 1 : 0;
+    const groupCount = cumulative ? Math.floor(totalUnits / x) : totalUnits >= x ? 1 : 0;
     const promotionUnits = groupCount * x;
     const inPromotionUnits = unitProducts.slice(0, promotionUnits);
     const notInPromotionUnits = unitProducts.slice(promotionUnits);

package/lib/model/strategy/adapter/walletPass/utils.js

@@ -346,8 +346,7 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
     );
     const maxDeduction = import_decimal.default.min(
       new import_decimal.default(usageAmount),
-      new import_decimal.default(maxDeductionAmount),
-      remainingOrderAmount
+      new import_decimal.default(maxDeductionAmount)
     );
     let deductionLeft = maxDeduction;
     const deductionDetails = [];
@@ -489,7 +488,7 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
       });
       return;
     }
-    const usageAmount = typeof selectedVoucher.edit_current_amount === "number" ? selectedVoucher.edit_current_amount : selectedVoucher._available_max_amount ?? getRecommendedAmount(selectedVoucher);
+    const usageAmount = typeof selectedVoucher.edit_current_amount === "number" ? selectedVoucher.edit_current_amount : getRecommendedAmount(selectedVoucher);
     const maxDeduction = import_decimal.default.min(
       new import_decimal.default(usageAmount),
       new import_decimal.default(maxDeductionAmount),

package/lib/modules/Cart/utils/cartProduct.js

@@ -46,7 +46,6 @@ var import_decimal = __toESM(require("decimal.js"));
 var import_utils = require("../../Product/utils");
 var import_utils2 = require("../../../solution/ShopDiscount/utils");
 var import_utils3 = require("../../Summary/utils");
-var import_utils4 = require("../../Order/utils");
 var toDiscountPayload = (discountItem) => {
   var _a, _b;
   return {
@@ -186,7 +185,7 @@ var formatProductToCartItemOrigin = (params) => {
       product_id: product.id,
       product_variant_id: product_variant_id || 0,
       product_bundle: ((_b = origin.product) == null ? void 0 : _b.product_bundle) || [],
-      product_sku: ((_c = origin.product) == null ? void 0 : _c.product_sku) || { option: [] },
+      product_option_item: ((_c = origin.product) == null ? void 0 : _c.product_option_item) || [],
       metadata: {
         product_discount_difference
       }
@@ -197,14 +196,7 @@ var formatProductToCartItemOrigin = (params) => {
       origin.product.product_bundle = formatBundleToOrigin(bundle);
     }
     if (options == null ? void 0 : options.length) {
-      origin.product.product_sku = {
-        ...origin.product.product_sku || {},
-        option: formatOptionsToOrigin(options).map((option) => {
-          const next = { ...option, add_price: option.add_price ?? option.price };
-          delete next.price;
-          return next;
-        })
-      };
+      origin.product.product_option_item = formatOptionsToOrigin(options);
     }
   }
   return origin;
@@ -338,15 +330,6 @@ var formatBundleToOrigin = (bundle) => {
       var _a;
       return pre + (((_a = cur == null ? void 0 : cur.metadata) == null ? void 0 : _a.product_discount_difference) || 0);
     }, 0);
-    const normalizedBundle = {
-      ...d,
-      // 计算 markdown 净额时只传真实毛价；若仅有 bundle_selling_price，则由 helper 当历史净额兜底。
-      price: (d == null ? void 0 : d.price) ?? (d == null ? void 0 : d.custom_price),
-      bundle_selling_price: d == null ? void 0 : d.bundle_selling_price,
-      price_type: (d == null ? void 0 : d.price_type) ?? (d == null ? void 0 : d.custom_price_type),
-      price_type_ext: (d == null ? void 0 : d.price_type_ext) ?? (d == null ? void 0 : d.custom_price_type_ext),
-      option: getBundleValueByKey("option")
-    };
     return {
       bundle_group_id: getBundleValueByKey("group_id"),
       bundle_id: d.id,
@@ -357,7 +340,7 @@ var formatBundleToOrigin = (bundle) => {
       extension_type: getBundleValueByKey("extension_type"),
       option: formatOptionsToOrigin(getBundleValueByKey("option")),
       discount_list: d.discount_list,
-      "bundle_selling_price": (0, import_utils4.getBundleSellingMagnitude)(normalizedBundle).toFixed(2),
+      "bundle_selling_price": d == null ? void 0 : d.price,
       "custom_price": d == null ? void 0 : d.price,
       metadata: {
         custom_product_bundle_map_id: d._id,

package/lib/modules/Cart/utils/changePrice.js

@@ -1,6 +1,8 @@
+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)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   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/modules/Cart/utils/changePrice.ts
@@ -22,7 +32,7 @@ __export(changePrice_exports, {
   updateAllCartItemPrice: () => updateAllCartItemPrice
 });
 module.exports = __toCommonJS(changePrice_exports);
-var import_utils = require("../../Order/utils");
+var import_decimal = __toESM(require("decimal.js"));
 async function updateAllCartItemPrice(cartItems, priceData, getProduct, updateCart, updateItemInitInfo) {
   var _a, _b;
   for (const item of cartItems) {
@@ -47,20 +57,18 @@ async function updateAllCartItemPrice(cartItems, priceData, getProduct, updateCa
         const targetBundleItem = targetBundle.bundle_item.find(
           (m) => m.id === n.id
         );
+        if (targetBundleItem.price_type === "markdown") {
+          targetBundleItem.price = new import_decimal.default(targetBundleItem.price || 0).mul(-1).toNumber();
+        }
+        if (n.option) {
+          targetBundleItem.price = new import_decimal.default(targetBundleItem.price || 0).add(n.option.reduce((pre, cur) => {
+            return pre + new import_decimal.default(cur.price || 0).mul(cur.num || 1).toNumber();
+          }, 0)).toNumber();
+        }
         if (targetBundleItem) {
-          const normalizedBundle = {
-            ...n,
-            price: targetBundleItem.price,
-            custom_price: targetBundleItem.price,
-            price_type: targetBundleItem.price_type,
-            price_type_ext: targetBundleItem.price_type_ext
-          };
-          const bundleSellingPrice = (0, import_utils.getBundleSellingMagnitude)(normalizedBundle).toFixed(2);
           return {
             ...n,
-            custom_price: targetBundleItem.price,
-            price: targetBundleItem.price_type === "markdown" ? bundleSellingPrice : targetBundleItem.price,
-            bundle_selling_price: bundleSellingPrice,
+            price: targetBundleItem.price,
             base_price: targetBundleItem.base_price
           };
         }