@pisell/pisellos 0.0.516 → 0.0.518

package/dist/solution/ScanOrder/utils.js

@@ -483,10 +483,10 @@ export function normalizeOrderProduct(product) {
     metadata.unique_identification_number = resolvedIdentityKey;
   }
   var normalizedBundle = (product.product_bundle || []).map(function (item) {
-    var _ref2, _item$bundle_selling_, _ref3, _ref4, _item$custom_price;
+    var _ref2, _item$bundle_selling_;
     return _objectSpread(_objectSpread({}, item), {}, {
-      bundle_selling_price: (_ref2 = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref2 !== void 0 ? _ref2 : '0.00',
-      custom_price: (_ref3 = (_ref4 = (_item$custom_price = item.custom_price) !== null && _item$custom_price !== void 0 ? _item$custom_price : item.bundle_selling_price) !== null && _ref4 !== void 0 ? _ref4 : item.price) !== null && _ref3 !== void 0 ? _ref3 : '0.00'
+      bundle_selling_price: (_ref2 = (_item$bundle_selling_ = item.bundle_selling_price) !== null && _item$bundle_selling_ !== void 0 ? _item$bundle_selling_ : item.price) !== null && _ref2 !== void 0 ? _ref2 : '0.00'
+      // custom_price: item.custom_price ?? item.bundle_selling_price ?? item.price ?? '0.00',
     });
   });
   var normalizedOptions = product.product_option_item || [];
@@ -506,7 +506,7 @@ export function normalizeOrderProduct(product) {
   var variantPrice = Array.isArray(variantList) ? (_variantList$find = variantList.find(function (v) {
     return Number(v === null || v === void 0 ? void 0 : v.id) === variantId;
   })) === null || _variantList$find === void 0 ? void 0 : _variantList$find.price : undefined;
-  var resolvedSource = function (_product$_origin, _product$_origin2, _ref5, _product$original_pri) {
+  var resolvedSource = function (_product$_origin, _product$_origin2, _ref3, _product$original_pri) {
     if (metadata.source_product_price !== undefined) {
       return String(metadata.source_product_price);
     }
@@ -524,7 +524,7 @@ export function normalizeOrderProduct(product) {
     if (!isV2 && metadata.main_product_original_price !== undefined) {
       return String(metadata.main_product_original_price);
     }
-    return (_ref5 = (_product$original_pri = product.original_price) !== null && _product$original_pri !== void 0 ? _product$original_pri : product.selling_price) !== null && _ref5 !== void 0 ? _ref5 : '0.00';
+    return (_ref3 = (_product$original_pri = product.original_price) !== null && _product$original_pri !== void 0 ? _product$original_pri : product.selling_price) !== null && _ref3 !== void 0 ? _ref3 : '0.00';
   }();
 
   // 2) 派生 main_product_original_price（含 option、不含折扣）

package/dist/solution/VenueBooking/index.d.ts

@@ -41,6 +41,8 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     private loadOpenDataConfigInFlight;
     private static readonly OPEN_DATA_CACHE_TTL;
     private getLoggerContext;
+    private safeStringify;
+    private pickErrorMessage;
     private serializeError;
     private addVenueBookingLog;
     private logMethodStart;

package/dist/solution/VenueBooking/index.js

@@ -44,7 +44,7 @@ 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, buildPriceBreakdown } from "./utils/slotMerge";
+import { mergeConsecutiveSlots, expandMergedSlotToIndividual, buildVenueIdentityKey, buildVenueBookingEntry, buildVenueResourceMetadata, buildPriceBreakdown } from "./utils/slotMerge";
 import { composeLinePrice, createUuidV4, sumOptionUnitPrice } from "../../modules/Order/utils";
 import { OrderModule } from "../../modules/Order";
 import { RegisterAndLoginHooks } from "../RegisterAndLogin/types";
@@ -112,6 +112,26 @@ 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) {
@@ -122,6 +142,21 @@ 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)
       };
@@ -246,8 +281,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 _i = 0, _candidates = candidates; _i < _candidates.length; _i++) {
-        var candidate = _candidates[_i];
+      for (var _i2 = 0, _candidates2 = candidates; _i2 < _candidates2.length; _i2++) {
+        var candidate = _candidates2[_i2];
         var customerId = this.normalizeCustomerId(candidate);
         if (customerId) return customerId;
       }
@@ -503,7 +538,10 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                   } : {};
                   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: {}
+                    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'
+                    }
                   };
                   _this4.core.registerModule(targetModule, {
                     initialState: initialState,
@@ -828,24 +866,28 @@ 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 = 9;
+                _context11.next = 12;
                 break;
               }
+              this.logMethodError('loadAllProducts', new Error('未获取到餐牌配置（menu.associated_menus），请检查 OpenData 配置'));
               throw new Error('未获取到餐牌配置（menu.associated_menus），请检查 OpenData 配置');
-            case 9:
+            case 12:
               menuListIds = associatedMenus.map(function (n) {
                 return Number(n.value);
               });
-              _context11.next = 12;
+              _context11.next = 15;
               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 12:
+            case 15:
               allProducts = _context11.sent;
               list = Array.isArray(allProducts) ? allProducts : [];
               venueList = list.filter(function (p) {
@@ -873,16 +915,16 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 venueProducts: venueList,
                 addonProducts: addonList
               });
-            case 25:
-              _context11.prev = 25;
+            case 28:
+              _context11.prev = 28;
               _context11.t0 = _context11["catch"](1);
               this.logMethodError('loadAllProducts', _context11.t0);
               throw _context11.t0;
-            case 29:
+            case 32:
             case "end":
               return _context11.stop();
           }
-        }, _callee11, this, [[1, 25]]);
+        }, _callee11, this, [[1, 28]]);
       }));
       function _doLoadAllProducts() {
         return _doLoadAllProducts2.apply(this, arguments);
@@ -994,7 +1036,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, _i2, _rawData, _item, mappings, _iterator3, _step3, mapping;
+        var venueProducts, resourceIds, config, crossDay, effectiveEndDate, res, rawData, _iterator2, _step2, item, _i3, _rawData, _item, mappings, _iterator3, _step3, mapping;
         return _regeneratorRuntime().wrap(function _callee15$(_context15) {
           while (1) switch (_context15.prev = _context15.next) {
             case 0:
@@ -1062,13 +1104,13 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 }
               }
               this.store.rawResourceData = rawData;
-              _i2 = 0, _rawData = rawData;
+              _i3 = 0, _rawData = rawData;
             case 24:
-              if (!(_i2 < _rawData.length)) {
+              if (!(_i3 < _rawData.length)) {
                 _context15.next = 34;
                 break;
               }
-              _item = _rawData[_i2];
+              _item = _rawData[_i3];
               mappings = this.resourceProductMap.get(_item.resourceId);
               if (mappings) {
                 _context15.next = 29;
@@ -1089,7 +1131,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 _iterator3.f();
               }
             case 31:
-              _i2++;
+              _i3++;
               _context15.next = 24;
               break;
             case 34:
@@ -1627,7 +1669,10 @@ 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: {}
+                  metadata: buildVenueResourceMetadata({
+                    mapping: mapping,
+                    rawResource: rawResource
+                  })
                 };
                 if (childRawResources && childRawResources.length) {
                   resourceEntry.children = childRawResources.map(function (child) {
@@ -2590,8 +2635,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadOpenDataConfig",
     value: function () {
       var _loadOpenDataConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29() {
-        var _this11 = this;
-        var lastFetchedAt, cachedData;
+        var lastFetchedAt, cachedData, openDataConfig;
         return _regeneratorRuntime().wrap(function _callee29$(_context29) {
           while (1) switch (_context29.prev = _context29.next) {
             case 0:
@@ -2611,27 +2655,35 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
               return _context29.abrupt("return", cachedData);
             case 7:
               if (!this.loadOpenDataConfigInFlight) {
-                _context29.next = 9;
+                _context29.next = 11;
                 break;
               }
-              return _context29.abrupt("return", this.loadOpenDataConfigInFlight);
-            case 9:
+              _context29.next = 10;
+              return this.loadOpenDataConfigInFlight;
+            case 10:
+              return _context29.abrupt("return", _context29.sent);
+            case 11:
               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;
               });
-              return _context29.abrupt("return", this.loadOpenDataConfigInFlight);
-            case 11:
+              _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:
             case "end":
               return _context29.stop();
           }
-        }, _callee29, this);
+        }, _callee29, this, [[12,, 18, 21]]);
       }));
       function loadOpenDataConfig() {
         return _loadOpenDataConfig.apply(this, arguments);
@@ -2777,8 +2829,8 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                   var key = buildProductKey(productId, normalizedVariantId);
                   if (!sourceMap.has(key)) sourceMap.set(key, node);
                 }
-                for (var _i3 = 0, _Object$values = Object.values(node); _i3 < _Object$values.length; _i3++) {
-                  var childValue = _Object$values[_i3];
+                for (var _i4 = 0, _Object$values = Object.values(node); _i4 < _Object$values.length; _i4++) {
+                  var childValue = _Object$values[_i4];
                   if (childValue && _typeof(childValue) === 'object') collectFromValue(childValue);
                 }
               };
@@ -2811,7 +2863,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
     key: "ensureItemRuleConfigsLoaded",
     value: function () {
       var _ensureItemRuleConfigsLoaded = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34() {
-        var _this12 = this;
+        var _this11 = this;
         return _regeneratorRuntime().wrap(function _callee34$(_context34) {
           while (1) switch (_context34.prev = _context34.next) {
             case 0:
@@ -2832,19 +2884,19 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 return _regeneratorRuntime().wrap(function _callee33$(_context33) {
                   while (1) switch (_context33.prev = _context33.next) {
                     case 0:
-                      runtimeConfig = _this12.getItemRuleRuntimeConfig();
+                      runtimeConfig = _this11.getItemRuleRuntimeConfig();
                       staticConfigs = normalizeItemRuleStrategies(runtimeConfig.strategyConfigs);
                       if (!(staticConfigs.length > 0)) {
                         _context33.next = 6;
                         break;
                       }
-                      _this12.itemRuleConfigs = staticConfigs;
-                      _this12.itemRuleEvaluator.setStrategyConfigs(staticConfigs);
-                      return _context33.abrupt("return", _this12.itemRuleConfigs);
+                      _this11.itemRuleConfigs = staticConfigs;
+                      _this11.itemRuleEvaluator.setStrategyConfigs(staticConfigs);
+                      return _context33.abrupt("return", _this11.itemRuleConfigs);
                     case 6:
-                      _this12.itemRuleConfigs = [];
-                      _this12.itemRuleEvaluator.setStrategyConfigs([]);
-                      return _context33.abrupt("return", _this12.itemRuleConfigs);
+                      _this11.itemRuleConfigs = [];
+                      _this11.itemRuleEvaluator.setStrategyConfigs([]);
+                      return _context33.abrupt("return", _this11.itemRuleConfigs);
                     case 9:
                     case "end":
                       return _context33.stop();
@@ -3305,7 +3357,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 (_unused2) {
+      } catch (_unused3) {
         return {};
       }
     }

package/dist/solution/VenueBooking/types.d.ts

@@ -96,6 +96,7 @@ export interface VenueResourceRawData {
 export interface ResourceProductMapping {
     productId: number;
     productTitle: string;
+    formName?: string;
     resourceName: string;
     formId: number | string;
     price: string;

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

@@ -93,6 +93,7 @@ export function buildResourceProductMap(products) {
               var mapping = {
                 productId: product.id,
                 productTitle: product.title,
+                formName: resource.title,
                 resourceName: resource.title,
                 formId: resource.id,
                 price: product.price || '0.00',

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

@@ -25,6 +25,10 @@ export interface BuildVenueBookingParams {
      */
     childResources?: VenueResourceRawData[];
 }
+export declare function buildVenueResourceMetadata(params: {
+    mapping: ResourceProductMapping;
+    rawResource: VenueResourceRawData | undefined;
+}): Record<string, any>;
 export declare function buildVenueBookingEntry(params: BuildVenueBookingParams): Record<string, any>;
 /**
  * 从一条已合并的订单商品还原出独立的时段列表。

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

@@ -89,6 +89,18 @@ export function buildPriceBreakdown(params) {
   }
   return entries;
 }
+export function buildVenueResourceMetadata(params) {
+  var _mapping$formName, _rawResource$main_fie;
+  var mapping = params.mapping,
+    rawResource = params.rawResource;
+  var combined = rawResource === null || rawResource === void 0 ? void 0 : rawResource.combined_resource;
+  var isCombined = !!(combined && combined.status === 1 && Array.isArray(combined.resource_ids));
+  return {
+    form_name: (_mapping$formName = mapping.formName) !== null && _mapping$formName !== void 0 ? _mapping$formName : mapping.resourceName,
+    resource_name: (_rawResource$main_fie = rawResource === null || rawResource === void 0 ? void 0 : rawResource.main_field) !== null && _rawResource$main_fie !== void 0 ? _rawResource$main_fie : mapping.resourceName,
+    combined_resource: isCombined ? combined : null
+  };
+}
 export function buildVenueBookingEntry(params) {
   var _rawResource$form_id;
   var group = params.group,
@@ -109,7 +121,10 @@ export function buildVenueBookingEntry(params) {
     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: {}
+    metadata: buildVenueResourceMetadata({
+      mapping: mapping,
+      rawResource: rawResource
+    })
   };
   if (childResources && childResources.length) {
     resourceEntry.children = childResources.map(function (child) {

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

@@ -341,7 +341,7 @@ var formatBundleToOrigin = (bundle) => {
       option: formatOptionsToOrigin(getBundleValueByKey("option")),
       discount_list: d.discount_list,
       "bundle_selling_price": d == null ? void 0 : d.price,
-      "custom_price": d == null ? void 0 : d.price,
+      // "custom_price": d?.price,
       metadata: {
         custom_product_bundle_map_id: d._id,
         product_discount_difference

package/lib/modules/Order/index.d.ts

@@ -82,7 +82,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/lib/modules/Order/utils.js

@@ -166,7 +166,7 @@ function createDefaultOrderRulesHooks() {
         product_bundle: nextBundle,
         metadata: {
           ...metadataAny,
-          source_product_price: nextSourceSellingPrice,
+          source_product_price: nextSourceOriginalPrice,
           main_product_selling_price: nextMainSellingPrice,
           main_product_original_price: nextMainOriginalPrice,
           price_schema_version: 2
@@ -246,14 +246,6 @@ function toBundleNumber(value, fallback = 0) {
   const parsed = Number(value);
   return Number.isFinite(parsed) ? parsed : fallback;
 }
-function toBundleCustomPriceString(value) {
-  const parsed = Number(value);
-  if (Number.isFinite(parsed))
-    return parsed.toFixed(2);
-  if (value === null || value === void 0 || value === "")
-    return "0.00";
-  return String(value);
-}
 function formatSubmitBundleItems(bundle) {
   if (!Array.isArray(bundle))
     return [];
@@ -266,9 +258,6 @@ function formatSubmitBundleItems(bundle) {
     );
     const priceNum = toBundleNumber(rawBundle.price, sellingPriceNum);
     const priceType = rawBundle.price_type ?? "";
-    const customPriceStr = toBundleCustomPriceString(
-      rawBundle.custom_price ?? rawBundle.bundle_selling_price ?? rawBundle.price
-    );
     const relationSurchargeIds = Array.isArray(rawBundle.relation_surcharge_ids) ? rawBundle.relation_surcharge_ids : Array.isArray(existedMetadata.relation_surcharge_ids) ? existedMetadata.relation_surcharge_ids : [];
     const surchargeFee = toBundleNumber(
       rawBundle.surcharge_fee ?? existedMetadata.surcharge_fee,
@@ -289,7 +278,7 @@ function formatSubmitBundleItems(bundle) {
       price: priceNum,
       price_type: priceType,
       price_type_ext: rawBundle.price_type_ext ?? "",
-      custom_price: customPriceStr,
+      // custom_price: customPriceStr,
       custom_price_type: rawBundle.custom_price_type ?? priceType ?? "",
       bundle_selling_price: sellingPriceNum,
       option: formatSubmitOptionItems(rawBundle.option),

package/lib/modules/ProductList/index.js

@@ -95,10 +95,11 @@ var ProductList = class extends import_BaseModule.BaseModule {
         with_count,
         // client_schedule_ids: schedule_ids,
         schedule_date,
+        // application_code: this.otherParams?.channel === 'online_store' ? 'online-store' : this.otherParams?.channel,
+        application_code: "online-store",
         with_schedule,
         schedule_datetime,
         // application_code: this.otherParams?.channel,
-        application_code: "online-store",
         is_eject: 1
       },
       { osServer: true, callback: options == null ? void 0 : options.callback, subscriberId: options == null ? void 0 : options.subscriberId, useCache: true, customToast: () => {

package/lib/modules/Quotation/index.d.ts

@@ -19,7 +19,7 @@ export declare class QuotationModule extends BaseModule implements Module {
      * Look up the quotation price for a specific product (+ optional variant) at a given datetime.
      * Returns the price as a string (e.g. "300.00"), or null if no quotation applies.
      *
-     * Priority: iterates quotations already sorted by `sort` ascending (lowest = highest priority).
+     * Priority: iterates quotations already sorted by `sort` descending (highest = highest priority).
      * First matching quotation whose schedule covers `datetime` and whose product_data contains
      * the requested productId wins.
      */

package/lib/modules/Quotation/index.js

@@ -52,7 +52,7 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
       { useCache: false }
     );
     const list = ((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.list) || (res == null ? void 0 : res.list) || [];
-    list.sort((a, b) => a.sort - b.sort);
+    list.sort((a, b) => b.sort - a.sort);
     this.store.list = list;
   }
   getQuotationList() {
@@ -62,7 +62,7 @@ var QuotationModule = class extends import_BaseModule.BaseModule {
    * Look up the quotation price for a specific product (+ optional variant) at a given datetime.
    * Returns the price as a string (e.g. "300.00"), or null if no quotation applies.
    *
-   * Priority: iterates quotations already sorted by `sort` ascending (lowest = highest priority).
+   * Priority: iterates quotations already sorted by `sort` descending (highest = highest priority).
    * First matching quotation whose schedule covers `datetime` and whose product_data contains
    * the requested productId wins.
    */

package/lib/modules/Rules/index.js

@@ -931,6 +931,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                 } : {
                   _id: product._id.split("___")[0] + "___" + index,
                   total,
+                  original_price: product.original_price,
                   price: product.price,
                   main_product_selling_price,
                   options: restoredOptions

package/lib/modules/ScanOrderLogger/index.d.ts

@@ -11,10 +11,12 @@ export declare class ScanOrderLoggerModule extends BaseModule implements Module,
     protected defaultName: string;
     protected defaultVersion: string;
     private store;
+    private window?;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     setContext(context: ScanOrderLoggerContext): void;
     setProvider(provider: ScanOrderLoggerProviderType): void;
     setProviderConfig(providerConfig: ScanOrderLoggerProviderConfig): void;
+    private getCurrentHost;
     private buildRecord;
     addLog(params: ScanOrderLogInput): Promise<void>;
 }

package/lib/modules/ScanOrderLogger/index.js

@@ -60,6 +60,7 @@ var ScanOrderLoggerModule = class extends import_BaseModule.BaseModule {
     var _a, _b, _c;
     this.core = core;
     this.store = options.store;
+    this.window = core.getPlugin("window") || void 0;
     const provider = ((_a = options.otherParams) == null ? void 0 : _a.provider) || "feishu";
     const providerConfig = ((_b = options.otherParams) == null ? void 0 : _b.providerConfig) || {};
     const context = ((_c = options.otherParams) == null ? void 0 : _c.context) || {};
@@ -101,14 +102,25 @@ var ScanOrderLoggerModule = class extends import_BaseModule.BaseModule {
       }
     };
   }
+  getCurrentHost() {
+    var _a, _b;
+    const host = (_b = (_a = this.window) == null ? void 0 : _a.location) == null ? void 0 : _b.host;
+    if (typeof host === "string" && host.length > 0)
+      return host;
+    return void 0;
+  }
   buildRecord(params) {
+    const host = this.getCurrentHost();
     return {
       level: params.level || "info",
       title: params.title,
       timestamp: params.timestamp || (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss"),
       payload: params.payload || {},
       extra: params.extra || {},
-      context: this.store.context || {}
+      context: {
+        ...this.store.context || {},
+        ...host ? { host } : {}
+      }
     };
   }
   async addLog(params) {

package/lib/modules/ScanOrderLogger/providers/feishu.js

@@ -112,20 +112,29 @@ async function flushQueue() {
 }
 var feishuLoggerProvider = {
   async send(payload) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f;
     cachedProviderConfig = payload.providerConfig;
     const webhook = (_b = (_a = payload.providerConfig) == null ? void 0 : _a.feishu) == null ? void 0 : _b.webhook;
+    const errorHook = (_d = (_c = payload.providerConfig) == null ? void 0 : _c.feishu) == null ? void 0 : _d.errorHook;
+    if (typeof fetch !== "function") {
+      console.warn("[ScanOrderLogger] 当前环境不支持 fetch，跳过 Feishu 日志上报");
+      return;
+    }
+    if (payload.record.level === "error" && isWebhookUsable(errorHook)) {
+      try {
+        await postToFeishu(errorHook, buildFeishuBody([payload.record]));
+      } catch (error) {
+        console.warn("[ScanOrderLogger] Feishu errorHook 上报失败", error);
+      }
+      return;
+    }
     if (!webhook) {
       console.warn("[ScanOrderLogger] Feishu webhook 未配置，跳过日志上报");
       return;
     }
     if (!isWebhookUsable(webhook))
       return;
-    if (typeof fetch !== "function") {
-      console.warn("[ScanOrderLogger] 当前环境不支持 fetch，跳过 Feishu 日志上报");
-      return;
-    }
-    const throttleMs = ((_d = (_c = payload.providerConfig) == null ? void 0 : _c.feishu) == null ? void 0 : _d.throttleMs) ?? DEFAULT_THROTTLE_MS;
+    const throttleMs = ((_f = (_e = payload.providerConfig) == null ? void 0 : _e.feishu) == null ? void 0 : _f.throttleMs) ?? DEFAULT_THROTTLE_MS;
     if (throttleMs <= 0) {
       try {
         await postToFeishu(webhook, buildFeishuBody([payload.record]));

package/lib/modules/ScanOrderLogger/types.d.ts

@@ -2,6 +2,7 @@ export type ScanOrderLogLevel = 'info' | 'warning' | 'error' | 'debug';
 export type ScanOrderLoggerProviderType = 'feishu' | 'grafana';
 export interface ScanOrderLoggerProviderFeishuConfig {
     webhook?: string;
+    errorHook?: string;
     /**
      * 节流窗口毫秒数，默认 3000ms
      * - >0：首条日志进入队列并启动定时器，窗口结束后合并成一条 Feishu post 统一发送

package/lib/solution/BookingByStep/index.d.ts

@@ -302,7 +302,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     autoSelectAllProductResources(resources_code: string, timeSlots?: TimeSliceItem): {
         errorList: any[];
     };
-    getTimeSlotByAllResources(resources_code: string): any[];
+    getTimeSlotByAllResources(resources_code: string, split?: number): any[];
     getTimeSlotByAllResourcesForDate({ resources_code, startDate, endDate }: {
         resources_code: string;
         startDate: string;
@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 5 | 3 | 2 | 4 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 5 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/BookingByStep/index.js

@@ -1409,7 +1409,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     return { errorList };
   }
   // 从购物车中获取已经分配好第一步资源的所有时间片
-  getTimeSlotByAllResources(resources_code) {
+  getTimeSlotByAllResources(resources_code, split = 10) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     let dateRange = this.store.date.getDateRange();
     const resources = [];
@@ -1567,7 +1567,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       resourcesMap,
       duration,
       currentDate: dateRange[0].date,
-      split: 10,
+      split,
       resourcesUseableMap,
       capacity: maxCapacity,
       cut_off_time: maxCutOffTime,