@pisell/pisellos 0.0.559 → 0.0.561

package/dist/model/strategy/adapter/dataVariant/adapter.d.ts

@@ -45,5 +45,6 @@ export declare class DataVariantAdapter implements BusinessAdapter {
      * 归一化客户 id：无效值返回 undefined，有效值统一为 number。
      */
     private normalizeCustomerId;
+    private normalizeNumberArray;
 }
 export default DataVariantAdapter;

package/dist/model/strategy/adapter/dataVariant/adapter.js

@@ -42,10 +42,12 @@ export var DataVariantAdapter = /*#__PURE__*/function () {
         orderType = businessData.orderType,
         businessCode = businessData.businessCode,
         customerId = businessData.customerId,
+        availableWalletIds = businessData.availableWalletIds,
         custom = businessData.custom;
 
       // customer_id 统一归一化为 number，避免 in 运算符因 string/number 不一致而误判
       var normalizedCustomerId = this.normalizeCustomerId(customerId);
+      var normalizedAvailableWalletIds = this.normalizeNumberArray(availableWalletIds !== null && availableWalletIds !== void 0 ? availableWalletIds : custom === null || custom === void 0 ? void 0 : custom.available_wallet_ids);
       var resolvedBusinessCode = businessCode || (custom === null || custom === void 0 ? void 0 : custom.business_code) || (custom === null || custom === void 0 ? void 0 : custom.businessCode) || '';
       return {
         entities: {
@@ -58,6 +60,8 @@ export var DataVariantAdapter = /*#__PURE__*/function () {
           // snake_case 与策略配置 field 对齐；customerId 保留兼容旧配置
           customer_id: normalizedCustomerId,
           customerId: normalizedCustomerId,
+          available_wallet_ids: normalizedAvailableWalletIds,
+          availableWalletIds: normalizedAvailableWalletIds,
           business_code: resolvedBusinessCode
         }),
         metadata: {
@@ -146,6 +150,17 @@ export var DataVariantAdapter = /*#__PURE__*/function () {
       var parsed = Number(value);
       return Number.isFinite(parsed) && parsed > 0 ? parsed : undefined;
     }
+  }, {
+    key: "normalizeNumberArray",
+    value: function normalizeNumberArray(value) {
+      if (!Array.isArray(value)) return [];
+      var ids = value.map(function (item) {
+        return Number(item);
+      }).filter(function (item) {
+        return Number.isFinite(item) && item > 0;
+      });
+      return Array.from(new Set(ids));
+    }
   }]);
   return DataVariantAdapter;
 }();

package/dist/model/strategy/adapter/dataVariant/evaluator.d.ts

@@ -64,6 +64,7 @@ export declare class DataVariantEvaluator {
     private createEngine;
     private evaluateScheduleMatch;
     private evaluateMenuMatch;
+    private evaluateArrayIntersects;
     private collectScheduleIdsFromStrategies;
     private extractTimePointsFromSchedules;
     private addDateTimePoint;
@@ -81,6 +82,7 @@ export declare class DataVariantEvaluator {
     private flattenConditionRules;
     private isConditionGroup;
     private normalizeNumberArray;
+    private normalizeComparableArray;
     private buildProductKey;
     private toNumber;
 }

package/dist/model/strategy/adapter/dataVariant/evaluator.js

@@ -416,6 +416,9 @@ export var DataVariantEvaluator = /*#__PURE__*/function () {
         },
         menu_match: function menu_match(fieldValue, compareValue) {
           return _this3.evaluateMenuMatch(fieldValue, compareValue, menuScopeMap);
+        },
+        array_intersects: function array_intersects(fieldValue, compareValue) {
+          return _this3.evaluateArrayIntersects(fieldValue, compareValue);
         }
       };
       return new StrategyEngine({
@@ -457,6 +460,17 @@ export var DataVariantEvaluator = /*#__PURE__*/function () {
       }
       return false;
     }
+  }, {
+    key: "evaluateArrayIntersects",
+    value: function evaluateArrayIntersects(fieldValue, compareValue) {
+      var fieldValues = this.normalizeComparableArray(fieldValue);
+      var compareValues = this.normalizeComparableArray(compareValue);
+      if (!fieldValues.length || !compareValues.length) return false;
+      var compareSet = new Set(compareValues);
+      return fieldValues.some(function (item) {
+        return compareSet.has(item);
+      });
+    }
   }, {
     key: "collectScheduleIdsFromStrategies",
     value: function collectScheduleIdsFromStrategies(strategyConfigs) {
@@ -738,6 +752,17 @@ export var DataVariantEvaluator = /*#__PURE__*/function () {
         return item > 0;
       });
     }
+  }, {
+    key: "normalizeComparableArray",
+    value: function normalizeComparableArray(value) {
+      var list = Array.isArray(value) ? value : value == null || value === '' ? [] : [value];
+      var normalized = list.map(function (item) {
+        if (item == null || item === '') return '';
+        var parsed = Number(item);
+        return Number.isFinite(parsed) ? String(parsed) : String(item).trim();
+      }).filter(Boolean);
+      return Array.from(new Set(normalized));
+    }
   }, {
     key: "buildProductKey",
     value: function buildProductKey(productId, variantId) {

package/dist/model/strategy/adapter/dataVariant/type.d.ts

@@ -102,6 +102,8 @@ export interface DataVariantBusinessData {
     /** 当前业务编码，对应策略条件 field: business_code */
     businessCode?: string;
     customerId?: number | string;
+    /** 当前客户可用 wallet/pass id 合并列表，对应策略条件 field: available_wallet_ids */
+    availableWalletIds?: Array<number | string>;
     custom?: Record<string, any>;
 }
 /**

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

@@ -1,6 +1,6 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { Discount, DiscountModuleAPI, DiscountWithReason } from './types';
+import { Discount, DiscountModuleAPI, DiscountWithReason, DiscountPrepareConfigResult } from './types';
 export declare class DiscountModule extends BaseModule implements Module, DiscountModuleAPI {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -22,9 +22,12 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
         with_discount_card: 0 | 1;
         customer_id: number;
         with_wallet_pass_holder: 0 | 1;
+        with_available_wallet_flag?: 0 | 1;
+        with_available_wallet_pass_flag?: 0 | 1;
         request_timezone: string;
         order_id?: number;
-    }): Promise<Discount[]>;
+    }): Promise<DiscountPrepareConfigResult>;
+    private extractAvailableWalletIds;
     batchSearch(code: string, options?: {
         customerId?: number;
         orderId?: number;

package/dist/modules/Discount/index.js

@@ -163,7 +163,10 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
             case 2:
               prepareConfig = _context4.sent;
               goodPassList = this.filterEnabledDiscountList([].concat(_toConsumableArray((prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data = prepareConfig.data) === null || _prepareConfig$data === void 0 ? void 0 : _prepareConfig$data.good_pass_list) || []), _toConsumableArray((prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data2 = prepareConfig.data) === null || _prepareConfig$data2 === void 0 ? void 0 : _prepareConfig$data2.discount_card_list) || []))) || []; // this.setDiscountList(goodPassList);
-              return _context4.abrupt("return", goodPassList);
+              return _context4.abrupt("return", {
+                discountList: goodPassList,
+                availableWalletIds: this.extractAvailableWalletIds(prepareConfig === null || prepareConfig === void 0 ? void 0 : prepareConfig.data)
+              });
             case 5:
             case "end":
               return _context4.stop();
@@ -175,6 +178,23 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
       }
       return loadPrepareConfig;
     }()
+  }, {
+    key: "extractAvailableWalletIds",
+    value: function extractAvailableWalletIds(data) {
+      var availableWalletList = Array.isArray(data === null || data === void 0 ? void 0 : data.avaiable_wallet_list) ? data.avaiable_wallet_list : Array.isArray(data === null || data === void 0 ? void 0 : data.available_wallet_list) ? data.available_wallet_list : [];
+      var availableWalletPassList = Array.isArray(data === null || data === void 0 ? void 0 : data.available_wallet_pass_list) ? data.available_wallet_pass_list : [];
+      var walletIds = availableWalletList.map(function (item) {
+        return Number(item === null || item === void 0 ? void 0 : item.id);
+      }).filter(function (id) {
+        return Number.isFinite(id) && id > 0;
+      });
+      var walletPassProductIds = availableWalletPassList.map(function (item) {
+        return Number(item === null || item === void 0 ? void 0 : item.product_id);
+      }).filter(function (id) {
+        return Number.isFinite(id) && id > 0;
+      });
+      return Array.from(new Set([].concat(_toConsumableArray(walletIds), _toConsumableArray(walletPassProductIds))));
+    }
   }, {
     key: "batchSearch",
     value: function () {

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

@@ -68,6 +68,10 @@ export interface DiscountWithReason {
     discountList: Discount[];
     unavailableReasonKey: DiscountFilterRejectKey | null;
 }
+export interface DiscountPrepareConfigResult {
+    discountList: Discount[];
+    availableWalletIds: number[];
+}
 interface ExtensionData {
     id: number;
     shop_id: number;

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

@@ -42,6 +42,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         action?: 'create';
     }): Promise<void>;
     getDiscountList(): Discount[];
+    getAvailableWalletIds(): number[];
     scanCode(code: string, customerId?: number): Promise<{
         isAvailable: boolean;
         discountList: Discount[];

package/dist/modules/Order/index.js

@@ -66,6 +66,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (!this.store.tempOrder) {
                 this.store.tempOrder = null;
               }
+              if (!Array.isArray(this.store.availableWalletIds)) {
+                this.store.availableWalletIds = [];
+              }
               this.request = this.core.getPlugin('request');
               this.window = this.core.getPlugin('window');
               otherParams = options.otherParams || {};
@@ -81,7 +84,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               app = appPlugin === null || appPlugin === void 0 ? void 0 : appPlugin.getApp();
               if (app) this.logger = app.logger;
               this.logInfo('OrderModule initialized successfully');
-            case 16:
+            case 17:
             case "end":
               return _context.stop();
           }
@@ -182,7 +185,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _loadDiscountConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
         var _this$store$discount, _this$store$tempOrder;
-        var discountList, _this$store$discount2;
+        var prepareConfig, discountList, _this$store$discount2;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -193,17 +196,21 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 with_good_pass: 1,
                 with_discount_card: 1,
                 with_wallet_pass_holder: 1,
+                with_available_wallet_flag: 1,
+                with_available_wallet_pass_flag: 1,
                 request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
               });
             case 2:
-              discountList = _context2.sent;
+              prepareConfig = _context2.sent;
+              discountList = prepareConfig === null || prepareConfig === void 0 ? void 0 : prepareConfig.discountList;
+              this.store.availableWalletIds = (prepareConfig === null || prepareConfig === void 0 ? void 0 : prepareConfig.availableWalletIds) || [];
               if (discountList) {
                 (_this$store$discount2 = this.store.discount) === null || _this$store$discount2 === void 0 || _this$store$discount2.setDiscountList(discountList);
               }
               if ((_this$store$tempOrder = this.store.tempOrder) !== null && _this$store$tempOrder !== void 0 && (_this$store$tempOrder = _this$store$tempOrder.products) !== null && _this$store$tempOrder !== void 0 && _this$store$tempOrder.length) {
                 this.applyDiscount();
               }
-            case 5:
+            case 7:
             case "end":
               return _context2.stop();
           }
@@ -220,6 +227,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var _this$store$discount3;
       return ((_this$store$discount3 = this.store.discount) === null || _this$store$discount3 === void 0 ? void 0 : _this$store$discount3.getDiscountList()) || [];
     }
+  }, {
+    key: "getAvailableWalletIds",
+    value: function getAvailableWalletIds() {
+      return this.store.availableWalletIds || [];
+    }
   }, {
     key: "scanCode",
     value: function () {

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

@@ -15,6 +15,7 @@ export interface OrderState {
     discountList: any[];
     discount: DiscountModule | null;
     rules: RulesModule | null;
+    availableWalletIds?: number[];
 }
 /** 更新购物车行：仅传 SKU 时命中同 SKU 第一行；多行同 SKU 须传 identity_key / 选项指纹等 */
 export interface UpdateProductInOrderParams {
@@ -250,5 +251,6 @@ export interface OrderModuleAPI {
         action?: 'create';
     }) => Promise<void>;
     getDiscountList: () => Discount[];
+    getAvailableWalletIds: () => number[];
     applyDiscount: () => void;
 }

package/dist/modules/ProductList/index.js

@@ -91,7 +91,8 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
     key: "loadProducts",
     value: function () {
       var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref, options) {
-        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, _ref$menu_list_ids, menu_list_ids, paramsCustomerId, _ref$with_count, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, _ref$with_extra, with_extra, userPlugin, customer_id, _userPlugin$get, productsData, sortedList;
+        var _this$otherParams, _this$otherParams2;
+        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, _ref$menu_list_ids, menu_list_ids, paramsCustomerId, _ref$with_count, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, _ref$with_extra, with_extra, userPlugin, customer_id, _userPlugin$get, channelMap, saleChannel, productsData, sortedList;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -115,8 +116,15 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               } catch (error) {
                 console.error(error);
               }
-              _context3.prev = 4;
-              _context3.next = 7;
+              channelMap = {
+                'online_store': 'online-store',
+                'scan_to_order': 'online-store',
+                'scan_to_order_2': 'online-store',
+                'scan_to_order_3': 'online-store'
+              };
+              saleChannel = channelMap[(_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.channel] || ((_this$otherParams2 = this.otherParams) === null || _this$otherParams2 === void 0 ? void 0 : _this$otherParams2.channel);
+              _context3.prev = 6;
+              _context3.next = 9;
               return this.request.post("/product/query", {
                 open_quotation: 1,
                 open_bundle: 0,
@@ -136,7 +144,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 schedule_date: schedule_date,
                 schedule_datetime: schedule_datetime,
                 // application_code: this.otherParams?.channel === 'online_store' ? 'online-store' : this.otherParams?.channel,
-                application_code: 'online-store',
+                application_code: saleChannel,
                 with_schedule: with_schedule,
                 is_eject: 1,
                 open_deposit: 1
@@ -147,7 +155,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 useCache: true,
                 customToast: function customToast() {}
               });
-            case 7:
+            case 9:
               productsData = _context3.sent;
               sortedList = (productsData.data.list || []).slice().sort(function (a, b) {
                 return Number(b.sort) - Number(a.sort);
@@ -160,15 +168,15 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               // }
               this.addProduct(sortedList);
               return _context3.abrupt("return", sortedList);
-            case 13:
-              _context3.prev = 13;
-              _context3.t0 = _context3["catch"](4);
+            case 15:
+              _context3.prev = 15;
+              _context3.t0 = _context3["catch"](6);
               return _context3.abrupt("return", _context3.t0);
-            case 16:
+            case 18:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[4, 13]]);
+        }, _callee3, this, [[6, 15]]);
       }));
       function loadProducts(_x5, _x6) {
         return _loadProducts.apply(this, arguments);

package/dist/modules/Rules/index.js

@@ -605,6 +605,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
         });
       }
+      // 检查商品是否被排除（全品类）
+      var isProductIncludedByLimitedData = function isProductIncludedByLimitedData(limitedData, productId) {
+        var excludedIds = (limitedData === null || limitedData === void 0 ? void 0 : limitedData.exclude_product_ids) || [];
+        var isExcluded = (limitedData === null || limitedData === void 0 ? void 0 : limitedData.filter) === 1 && excludedIds.some(function (id) {
+          return String(id) === String(productId);
+        });
+        return !isExcluded;
+      };
 
       /**
       // 对productList按价格降序排序（用于应用优惠券时优先选择高价商品） 价格相同时使用quantity 排序
@@ -1101,9 +1109,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 判断优惠券是否适用于该商品
           if (limitedData.type === 'product_all') {
-            if (limitedData.filter === 1 && limitedData.exclude_product_ids.includes(product.id)) {
+            if (!isProductIncludedByLimitedData(limitedData, product.id)) {
               return false;
             }
+
             // 检查 package_sub_item_usage_rules
             if (!_this3.checkPackageSubItemUsageRules(discount, flatItem)) {
               return false;

package/dist/modules/Schedule/getDateIsInSchedule.js

@@ -6,6 +6,11 @@ function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 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; }
 import dayjs from "dayjs";
+import isSameOrAfter from "dayjs/plugin/isSameOrAfter";
+import isSameOrBefore from "dayjs/plugin/isSameOrBefore";
+dayjs.extend(isSameOrAfter);
+dayjs.extend(isSameOrBefore);
+
 // 获取时间是否在日程范围内
 export var getDateIsInSchedule = function getDateIsInSchedule(dateTime, scheduleList) {
   if (!dateTime || !scheduleList || scheduleList.length === 0) {

package/dist/modules/Summary/utils.js

@@ -616,6 +616,27 @@ export var calculateTaxFee = function calculateTaxFee(shopInfo, items) {
   }, new Decimal(0));
   return totalTaxFee;
 };
+var getCartItemDepositData = function getCartItemDepositData(item) {
+  var _target$_productOrigi, _target$_origin, _target$_origin2;
+  var target = item;
+  return (target === null || target === void 0 || (_target$_productOrigi = target._productOrigin) === null || _target$_productOrigi === void 0 ? void 0 : _target$_productOrigi.custom_deposit_data) || (target === null || target === void 0 || (_target$_origin = target._origin) === null || _target$_origin === void 0 ? void 0 : _target$_origin.custom_deposit_data) || (target === null || target === void 0 || (_target$_origin2 = target._origin) === null || _target$_origin2 === void 0 || (_target$_origin2 = _target$_origin2.product) === null || _target$_origin2 === void 0 ? void 0 : _target$_origin2.custom_deposit_data);
+};
+var getCartItemQuantity = function getCartItemQuantity(item) {
+  return new Decimal((item === null || item === void 0 ? void 0 : item.num) || 1);
+};
+var calculateCartItemDepositTotal = function calculateCartItemDepositTotal(item) {
+  var _item$deposit;
+  var depositData = getCartItemDepositData(item);
+  if ((depositData === null || depositData === void 0 ? void 0 : depositData.has_deposit) == 1 && typeof (depositData === null || depositData === void 0 ? void 0 : depositData.deposit_fixed) === 'string' && typeof (depositData === null || depositData === void 0 ? void 0 : depositData.deposit_percentage) === 'string') {
+    var _ref7, _summaryTotal;
+    var lineTotal = new Decimal((_ref7 = (_summaryTotal = item.summaryTotal) !== null && _summaryTotal !== void 0 ? _summaryTotal : item.total) !== null && _ref7 !== void 0 ? _ref7 : 0);
+    var quantity = getCartItemQuantity(item);
+    var fixedTotal = new Decimal(depositData.deposit_fixed || 0).times(quantity);
+    var percentageTotal = new Decimal(depositData.deposit_percentage || 0).times(lineTotal);
+    return fixedTotal.plus(percentageTotal);
+  }
+  return new Decimal((item === null || item === void 0 || (_item$deposit = item.deposit) === null || _item$deposit === void 0 ? void 0 : _item$deposit.total) || 0);
+};
 
 /**
  * @title: 计算定金
@@ -630,9 +651,9 @@ export var calculateDeposit = function calculateDeposit(items) {
   var hasDeposit = false;
   var total = items.reduce(function (sum, item) {
     if (item !== null && item !== void 0 && item.deposit) {
-      var _item$deposit, _item$deposit2;
+      var _item$deposit2;
       hasDeposit = true;
-      var cartItemTotalPrice = new Decimal((item === null || item === void 0 || (_item$deposit = item.deposit) === null || _item$deposit === void 0 ? void 0 : _item$deposit.total) || 0);
+      var cartItemTotalPrice = calculateCartItemDepositTotal(item);
       // 将协议数据去重合并
       item === null || item === void 0 || (_item$deposit2 = item.deposit) === null || _item$deposit2 === void 0 || (_item$deposit2 = _item$deposit2.protocols) === null || _item$deposit2 === void 0 || _item$deposit2.forEach(function (protocol) {
         if (protocols.findIndex(function (p) {
@@ -669,9 +690,9 @@ export var calculateDeposit = function calculateDeposit(items) {
  * @param options.isEdit 是否处于“编辑中”。`false` 时会优先走后端金额直取逻辑（若存在）
  * @returns 订单附加费金额（number，金额单位与商品价格一致）
  */
-export var getSurchargeAmount = function getSurchargeAmount(_ref7, surcharge, options) {
-  var bookingDetail = _ref7.bookingDetail,
-    bookingId = _ref7.bookingId;
+export var getSurchargeAmount = function getSurchargeAmount(_ref8, surcharge, options) {
+  var bookingDetail = _ref8.bookingDetail,
+    bookingId = _ref8.bookingId;
   var isEdit = options.isEdit;
   // 订单未变更过
   if (!isEdit) {
@@ -716,17 +737,17 @@ var getDiscountAmount = function getDiscountAmount(discounts) {
  * 获取主商品加价减价后的总价 (主商品价格 + 子商品加价减价)
  */
 var getMainProductTotal = function getMainProductTotal(item) {
-  var _ref8, _ref9, _item$main_product_se, _item$metadata, _item$metadata2, _item$metadata3, _item$metadata4;
+  var _ref9, _ref10, _item$main_product_se, _item$metadata, _item$metadata2, _item$metadata3, _item$metadata4;
   // 新语义 v2 下 `main_product_selling_price` / `metadata.main_product_selling_price`
   // 已经是"含 option、含主商品折扣"的主价，直接作为主商品基准，无需再减折扣或加 option。
   // 仅需叠加 markup / markdown 类 bundle（原价 bundle 的税费单独处理）。
-  var total = new Decimal((_ref8 = (_ref9 = (_item$main_product_se = item === null || item === void 0 ? void 0 : item.main_product_selling_price) !== null && _item$main_product_se !== void 0 ? _item$main_product_se : item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.main_product_selling_price) !== null && _ref9 !== void 0 ? _ref9 : item === null || item === void 0 || (_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.main_product_original_price) !== null && _ref8 !== void 0 ? _ref8 : 0);
+  var total = new Decimal((_ref9 = (_ref10 = (_item$main_product_se = item === null || item === void 0 ? void 0 : item.main_product_selling_price) !== null && _item$main_product_se !== void 0 ? _item$main_product_se : item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.main_product_selling_price) !== null && _ref10 !== void 0 ? _ref10 : item === null || item === void 0 || (_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.main_product_original_price) !== null && _ref9 !== void 0 ? _ref9 : 0);
 
   // 做个兜底 如果新语义价格字段都没有，则切换回老逻辑
   var hasMainProductPrice = (item === null || item === void 0 ? void 0 : item.main_product_selling_price) != null || (item === null || item === void 0 || (_item$metadata3 = item.metadata) === null || _item$metadata3 === void 0 ? void 0 : _item$metadata3.main_product_selling_price) != null || (item === null || item === void 0 || (_item$metadata4 = item.metadata) === null || _item$metadata4 === void 0 ? void 0 : _item$metadata4.main_product_original_price) != null;
   if (!hasMainProductPrice) {
-    var _ref10, _ref11, _item$main_product_se2, _item$metadata5, _item$_origin3, _item$_originData;
-    total = new Decimal((_ref10 = (_ref11 = (_item$main_product_se2 = item === null || item === void 0 ? void 0 : item.main_product_selling_price) !== null && _item$main_product_se2 !== void 0 ? _item$main_product_se2 : item === null || item === void 0 || (_item$metadata5 = item.metadata) === null || _item$metadata5 === void 0 ? void 0 : _item$metadata5.main_product_selling_price) !== null && _ref11 !== void 0 ? _ref11 : item.price) !== null && _ref10 !== void 0 ? _ref10 : 0);
+    var _ref11, _ref12, _item$main_product_se2, _item$metadata5, _item$_origin3, _item$_originData;
+    total = new Decimal((_ref11 = (_ref12 = (_item$main_product_se2 = item === null || item === void 0 ? void 0 : item.main_product_selling_price) !== null && _item$main_product_se2 !== void 0 ? _item$main_product_se2 : item === null || item === void 0 || (_item$metadata5 = item.metadata) === null || _item$metadata5 === void 0 ? void 0 : _item$metadata5.main_product_selling_price) !== null && _ref12 !== void 0 ? _ref12 : item.price) !== null && _ref11 !== void 0 ? _ref11 : 0);
     var discount = (item === null || item === void 0 || (_item$_origin3 = item._origin) === null || _item$_origin3 === void 0 || (_item$_origin3 = _item$_origin3.product) === null || _item$_origin3 === void 0 ? void 0 : _item$_origin3.discount_list) || (item === null || item === void 0 || (_item$_originData = item._originData) === null || _item$_originData === void 0 || (_item$_originData = _item$_originData.product) === null || _item$_originData === void 0 || (_item$_originData = _item$_originData.discount_list) === null || _item$_originData === void 0 ? void 0 : _item$_originData.filter(function (item) {
       var _item$metadata6;
       return !(item !== null && item !== void 0 && (_item$metadata6 = item.metadata) !== null && _item$metadata6 !== void 0 && _item$metadata6.custom_product_bundle_map_id);
@@ -747,9 +768,9 @@ var getMainProductTotal = function getMainProductTotal(item) {
     for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
       var bundleItem = _step4.value;
       if (getBundleItemIsMarkupOrDiscountPrice(bundleItem)) {
-        var _ref12, _bundleItem$bundle_se2;
+        var _ref13, _bundleItem$bundle_se2;
         // IMPORTANT: 套餐子商品如果应用了 discount，bundle_selling_price 和 price 其实都已经是折后价格了，不需要单独再减一次
-        var bundleItemTotal = new Decimal((_ref12 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref12 !== void 0 ? _ref12 : 0);
+        var bundleItemTotal = new Decimal((_ref13 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref13 !== void 0 ? _ref13 : 0);
         total = total.add(bundleItemTotal);
       }
     }
@@ -869,12 +890,12 @@ var isProductMatchSurchargeCondition = function isProductMatchSurchargeCondition
  * @param options.scheduleById schedule 映射表：`{ [scheduleId]: schedule }`（用于根据配置的 `available_schedule_ids` 做日程匹配）
  * @returns 附加费列表（仅返回金额 > 0 的项）
  */
-export var getSurcharge = function getSurcharge(_ref13, options) {
+export var getSurcharge = function getSurcharge(_ref14, options) {
   var _service$filter;
-  var service = _ref13.service,
-    addons = _ref13.addons,
-    bookingDetail = _ref13.bookingDetail,
-    bookingId = _ref13.bookingId;
+  var service = _ref14.service,
+    addons = _ref14.addons,
+    bookingDetail = _ref14.bookingDetail,
+    bookingId = _ref14.bookingId;
   var isEdit = options.isEdit,
     isInScheduleByDate = options.isInScheduleByDate,
     surcharge_list = options.surcharge_list,
@@ -996,11 +1017,11 @@ export var getSurcharge = function getSurcharge(_ref13, options) {
                 scheduleById: scheduleById || {},
                 isInScheduleByDate: isInScheduleByDate
               })) {
-                var _ref14, _bundleItem$bundle_se3;
+                var _ref15, _bundleItem$bundle_se3;
                 var _mainQuantity = item.num || 1;
                 matchedItems.push({
                   isMain: false,
-                  total: Number((_ref14 = (_bundleItem$bundle_se3 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se3 !== void 0 ? _bundleItem$bundle_se3 : bundleItem.price) !== null && _ref14 !== void 0 ? _ref14 : 0),
+                  total: Number((_ref15 = (_bundleItem$bundle_se3 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se3 !== void 0 ? _bundleItem$bundle_se3 : bundleItem.price) !== null && _ref15 !== void 0 ? _ref15 : 0),
                   quantity: bundleItem.num || bundleItem.quantity || 1,
                   item: bundleItem,
                   mainQuantity: _mainQuantity // 子商品的mainQuantity是所属主商品的quantity
@@ -1216,9 +1237,9 @@ export var getSurcharge = function getSurcharge(_ref13, options) {
   }
   return surchargeWithAmount;
 };
-function resetItemsSurchargeSideEffects(_ref15) {
-  var service = _ref15.service,
-    addons = _ref15.addons;
+function resetItemsSurchargeSideEffects(_ref16) {
+  var service = _ref16.service,
+    addons = _ref16.addons;
   var resetItem = function resetItem(item) {
     if (!item) return;
     item.surcharge_fee = 0;

package/dist/solution/ShopDiscount/index.js

@@ -800,7 +800,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadPrepareConfig",
     value: function () {
       var _loadPrepareConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(params) {
-        var _this$getCustomer2, _this$store$discount8, _this$getDiscountList, _this$store$discount9, _this$store$productLi2, orderId, customerId, goodPassList, scanDiscount, scanDiscountIds, newGoodPassList, newDiscountList, filteredDiscountList, _result3;
+        var _this$getCustomer2, _this$store$discount8, _this$getDiscountList, _this$store$discount9, _this$store$productLi2, orderId, customerId, prepareConfig, goodPassList, scanDiscount, scanDiscountIds, newGoodPassList, newDiscountList, filteredDiscountList, _result3;
         return _regeneratorRuntime().wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
             case 0:
@@ -821,47 +821,48 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 order_id: orderId
               } : {}));
             case 5:
-              goodPassList = _context10.sent;
+              prepareConfig = _context10.sent;
+              goodPassList = (prepareConfig === null || prepareConfig === void 0 ? void 0 : prepareConfig.discountList) || [];
               scanDiscount = (_this$getDiscountList = this.getDiscountList()) === null || _this$getDiscountList === void 0 ? void 0 : _this$getDiscountList.filter(function (item) {
                 return item.isScan;
               }); // goodPassList 里可能有 scanDiscount 重合的部分，goodPassList 需要剔除
               scanDiscountIds = scanDiscount.map(function (n) {
                 return n.id;
               });
-              newGoodPassList = goodPassList === null || goodPassList === void 0 ? void 0 : goodPassList.filter(function (n) {
+              newGoodPassList = goodPassList.filter(function (n) {
                 return !scanDiscountIds.includes(n.id);
               });
               newDiscountList = [].concat(_toConsumableArray(scanDiscount), _toConsumableArray(newGoodPassList || [])); // 存储原始优惠券列表
               this.store.originalDiscountList = newDiscountList;
-              _context10.next = 13;
+              _context10.next = 14;
               return (_this$store$discount9 = this.store.discount) === null || _this$store$discount9 === void 0 ? void 0 : _this$store$discount9.setOriginalDiscountList(newDiscountList);
-            case 13:
+            case 14:
               // 根据当前预约时间过滤优惠券列表
               filteredDiscountList = this.filterDiscountListByBookingTime(newDiscountList, this.store.currentBookingTime);
               this.store.filteredDiscountList = filteredDiscountList;
               this.setDiscountList(filteredDiscountList || []);
               if (!((_this$store$productLi2 = this.store.productList) !== null && _this$store$productLi2 !== void 0 && _this$store$productLi2.length)) {
-                _context10.next = 20;
+                _context10.next = 21;
                 break;
               }
               _result3 = this.calcDiscount(this.store.productList);
-              _context10.next = 20;
+              _context10.next = 21;
               return this.core.effects.emit("".concat(this.name, ":onLoadPrepareCalcResult"), _result3);
-            case 20:
-              _context10.next = 22;
+            case 21:
+              _context10.next = 23;
               return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), filteredDiscountList);
-            case 22:
-              _context10.next = 27;
+            case 23:
+              _context10.next = 28;
               break;
-            case 24:
-              _context10.prev = 24;
+            case 25:
+              _context10.prev = 25;
               _context10.t0 = _context10["catch"](0);
               console.error('[ShopDiscount] 加载准备配置出错:', _context10.t0);
-            case 27:
+            case 28:
             case "end":
               return _context10.stop();
           }
-        }, _callee10, this, [[0, 24]]);
+        }, _callee10, this, [[0, 25]]);
       }));
       function loadPrepareConfig(_x10) {
         return _loadPrepareConfig.apply(this, arguments);

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

@@ -84,6 +84,7 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     private clearSlotPriceMapCache;
     /** 读取当前登录 customerId */
     private resolveCustomerIdForSmartPricing;
+    private resolveAvailableWalletIdsForSmartPricing;
     /** 读取 schedule 全量列表，供智能定价 schedule_match 使用 */
     private getScheduleListForSmartPricing;
     /** 构建智能定价上下文，对齐 OS Server buildProductFormatterContext */