@pisell/pisellos 0.0.559 → 0.0.561

package/dist/solution/VenueBooking/index.js

@@ -501,32 +501,32 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 return _regeneratorRuntime().wrap(function _callee5$(_context5) {
                   while (1) switch (_context5.prev = _context5.next) {
                     case 0:
+                      _context5.next = 2;
+                      return _this3.store.order.loadDiscountConfig({
+                        customerId: params.customerId
+                      });
+                    case 2:
                       _this3.clearSlotPriceMapCache();
                       _this3.recalculateOrderPricesFromSmartPricing();
                       // 刷新 holder 表单数据
                       if (!_this3.store.holder) {
-                        _context5.next = 5;
+                        _context5.next = 7;
                         break;
                       }
-                      _context5.next = 5;
+                      _context5.next = 7;
                       return _this3.store.holder.refreshAllFormRecords({
                         customer_id: params.customerId,
                         useCache: false
                       });
-                    case 5:
+                    case 7:
                       if (!_this3.store.quotation) {
-                        _context5.next = 8;
+                        _context5.next = 10;
                         break;
                       }
-                      _context5.next = 8;
+                      _context5.next = 10;
                       return _this3.store.quotation.loadQuotations({
                         channel: (_this3$otherParams = _this3.otherParams) === null || _this3$otherParams === void 0 ? void 0 : _this3$otherParams.channel
                       });
-                    case 8:
-                      _context5.next = 10;
-                      return _this3.store.order.loadDiscountConfig({
-                        customerId: params.customerId
-                      });
                     case 10:
                       _context5.next = 12;
                       return _this3.store.order.recalculateSummary({
@@ -970,6 +970,21 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
         return undefined;
       }
     }
+  }, {
+    key: "resolveAvailableWalletIdsForSmartPricing",
+    value: function resolveAvailableWalletIdsForSmartPricing() {
+      var _this$store$order3, _this$store$order3$ge, _this$otherParams9, _this$otherParams10, _this$otherParams11, _this$otherParams12;
+      var orderWalletIds = (_this$store$order3 = this.store.order) === null || _this$store$order3 === void 0 || (_this$store$order3$ge = _this$store$order3.getAvailableWalletIds) === null || _this$store$order3$ge === void 0 ? void 0 : _this$store$order3$ge.call(_this$store$order3);
+      var fallbackWalletIds = ((_this$otherParams9 = this.otherParams) === null || _this$otherParams9 === void 0 ? void 0 : _this$otherParams9.available_wallet_ids) || ((_this$otherParams10 = this.otherParams) === null || _this$otherParams10 === void 0 ? void 0 : _this$otherParams10.availableWalletIds) || ((_this$otherParams11 = this.otherParams) === null || _this$otherParams11 === void 0 || (_this$otherParams11 = _this$otherParams11.strategy_context) === null || _this$otherParams11 === void 0 ? void 0 : _this$otherParams11.available_wallet_ids) || ((_this$otherParams12 = this.otherParams) === null || _this$otherParams12 === void 0 || (_this$otherParams12 = _this$otherParams12.strategy_context) === null || _this$otherParams12 === void 0 ? void 0 : _this$otherParams12.availableWalletIds);
+      var source = Array.isArray(orderWalletIds) && orderWalletIds.length ? orderWalletIds : fallbackWalletIds;
+      if (!Array.isArray(source)) return [];
+      var ids = source.map(function (item) {
+        return Number(item);
+      }).filter(function (item) {
+        return Number.isFinite(item) && item > 0;
+      });
+      return Array.from(new Set(ids));
+    }
 
     /** 读取 schedule 全量列表，供智能定价 schedule_match 使用 */
   }, {
@@ -985,17 +1000,18 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildSmartPricingContext",
     value: function buildSmartPricingContext(customerId) {
-      var _this$core5, _this$otherParams9, _this$otherParams10, _this$otherParams11, _this$otherParams12, _this$otherParams13, _this$otherParams14, _this$otherParams15;
+      var _this$core5, _this$otherParams13, _this$otherParams14, _this$otherParams15, _this$otherParams16, _this$otherParams17, _this$otherParams18, _this$otherParams19;
       var evaluator = (_this$core5 = this.core) === null || _this$core5 === void 0 || (_this$core5 = _this$core5.context) === null || _this$core5 === void 0 ? void 0 : _this$core5.dataVariantEvaluator;
       return {
         evaluator: evaluator,
         scheduleList: this.getScheduleListForSmartPricing(),
-        menuList: ((_this$otherParams9 = this.otherParams) === null || _this$otherParams9 === void 0 ? void 0 : _this$otherParams9.menuList) || ((_this$otherParams10 = this.otherParams) === null || _this$otherParams10 === void 0 || (_this$otherParams10 = _this$otherParams10.openData) === null || _this$otherParams10 === void 0 ? void 0 : _this$otherParams10.menuList) || [],
+        menuList: ((_this$otherParams13 = this.otherParams) === null || _this$otherParams13 === void 0 ? void 0 : _this$otherParams13.menuList) || ((_this$otherParams14 = this.otherParams) === null || _this$otherParams14 === void 0 || (_this$otherParams14 = _this$otherParams14.openData) === null || _this$otherParams14 === void 0 ? void 0 : _this$otherParams14.menuList) || [],
         customerId: customerId !== null && customerId !== void 0 ? customerId : this.resolveCustomerIdForSmartPricing(),
-        channel: (_this$otherParams11 = this.otherParams) === null || _this$otherParams11 === void 0 ? void 0 : _this$otherParams11.channel,
-        businessCode: (_this$otherParams12 = this.otherParams) === null || _this$otherParams12 === void 0 ? void 0 : _this$otherParams12.businessCode,
-        orderType: ((_this$otherParams13 = this.otherParams) === null || _this$otherParams13 === void 0 ? void 0 : _this$otherParams13.orderType) || ((_this$otherParams14 = this.otherParams) === null || _this$otherParams14 === void 0 ? void 0 : _this$otherParams14.type),
-        strategy_context: (_this$otherParams15 = this.otherParams) === null || _this$otherParams15 === void 0 ? void 0 : _this$otherParams15.strategy_context
+        availableWalletIds: this.resolveAvailableWalletIdsForSmartPricing(),
+        channel: (_this$otherParams15 = this.otherParams) === null || _this$otherParams15 === void 0 ? void 0 : _this$otherParams15.channel,
+        businessCode: (_this$otherParams16 = this.otherParams) === null || _this$otherParams16 === void 0 ? void 0 : _this$otherParams16.businessCode,
+        orderType: ((_this$otherParams17 = this.otherParams) === null || _this$otherParams17 === void 0 ? void 0 : _this$otherParams17.orderType) || ((_this$otherParams18 = this.otherParams) === null || _this$otherParams18 === void 0 ? void 0 : _this$otherParams18.type),
+        strategy_context: (_this$otherParams19 = this.otherParams) === null || _this$otherParams19 === void 0 ? void 0 : _this$otherParams19.strategy_context
       };
     }
 
@@ -1014,7 +1030,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
     key: "getSlotPriceMapCacheKey",
     value: function getSlotPriceMapCacheKey(date, context) {
       var _context$customerId, _context$channel, _context$businessCode;
-      return [date, (_context$customerId = context.customerId) !== null && _context$customerId !== void 0 ? _context$customerId : '', (_context$channel = context.channel) !== null && _context$channel !== void 0 ? _context$channel : '', (_context$businessCode = context.businessCode) !== null && _context$businessCode !== void 0 ? _context$businessCode : ''].join('|');
+      return [date, (_context$customerId = context.customerId) !== null && _context$customerId !== void 0 ? _context$customerId : '', (context.availableWalletIds || []).join(','), (_context$channel = context.channel) !== null && _context$channel !== void 0 ? _context$channel : '', (_context$businessCode = context.businessCode) !== null && _context$businessCode !== void 0 ? _context$businessCode : ''].join('|');
     }
 
     /**
@@ -1074,7 +1090,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
     key: "_doLoadAllProducts",
     value: function () {
       var _doLoadAllProducts2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
-        var _this$otherParams16, _this$store$venueProd, associatedMenus, menuListIds, allProducts, rawList, list, venueList, addonList, venueStore, _this$store$order3, _this$store$order3$ge, products;
+        var _this$otherParams20, _this$store$venueProd, associatedMenus, menuListIds, allProducts, rawList, list, venueList, addonList, venueStore, _this$store$order4, _this$store$order4$ge, products;
         return _regeneratorRuntime().wrap(function _callee12$(_context12) {
           while (1) switch (_context12.prev = _context12.next) {
             case 0:
@@ -1095,7 +1111,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
               _context12.next = 8;
               return this.loadOpenDataConfig();
             case 8:
-              associatedMenus = ((_this$otherParams16 = this.otherParams) === null || _this$otherParams16 === void 0 || (_this$otherParams16 = _this$otherParams16.openData) === null || _this$otherParams16 === void 0 ? void 0 : _this$otherParams16['menu.associated_menus']) || [];
+              associatedMenus = ((_this$otherParams20 = this.otherParams) === null || _this$otherParams20 === void 0 || (_this$otherParams20 = _this$otherParams20.openData) === null || _this$otherParams20 === void 0 ? void 0 : _this$otherParams20['menu.associated_menus']) || [];
               if (associatedMenus.length) {
                 _context12.next = 12;
                 break;
@@ -1141,7 +1157,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 _context12.next = 31;
                 break;
               }
-              products = ((_this$store$order3 = this.store.order) === null || _this$store$order3 === void 0 || (_this$store$order3$ge = _this$store$order3.getOrderProducts) === null || _this$store$order3$ge === void 0 ? void 0 : _this$store$order3$ge.call(_this$store$order3)) || [];
+              products = ((_this$store$order4 = this.store.order) === null || _this$store$order4 === void 0 || (_this$store$order4$ge = _this$store$order4.getOrderProducts) === null || _this$store$order4$ge === void 0 ? void 0 : _this$store$order4$ge.call(_this$store$order4)) || [];
               _context12.next = 31;
               return this.preloadHolderForms(products);
             case 31:
@@ -1605,8 +1621,8 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getSelectedSlotsForResource",
     value: function getSelectedSlotsForResource(resourceId, productId) {
-      var _this$store$order4;
-      var tempOrder = (_this$store$order4 = this.store.order) === null || _this$store$order4 === void 0 ? void 0 : _this$store$order4.getTempOrder();
+      var _this$store$order5;
+      var tempOrder = (_this$store$order5 = this.store.order) === null || _this$store$order5 === void 0 ? void 0 : _this$store$order5.getTempOrder();
       if (!tempOrder) return [];
       var venueProducts = tempOrder.products.filter(function (p) {
         var _p$metadata, _p$metadata2;
@@ -1767,9 +1783,9 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getAllSelectedSlots",
     value: function getAllSelectedSlots() {
-      var _this$store$order5;
+      var _this$store$order6;
       var result = new Map();
-      var tempOrder = (_this$store$order5 = this.store.order) === null || _this$store$order5 === void 0 ? void 0 : _this$store$order5.getTempOrder();
+      var tempOrder = (_this$store$order6 = this.store.order) === null || _this$store$order6 === void 0 ? void 0 : _this$store$order6.getTempOrder();
       if (!tempOrder) return result;
       var venueProducts = tempOrder.products.filter(function (p) {
         var _p$metadata3;
@@ -1829,7 +1845,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
     key: "reconcileOrderForResourceProduct",
     value: (function () {
       var _reconcileOrderForResourceProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(resourceId, productId, slots) {
-        var _this$store$order6, _this$store$order6$ge;
+        var _this$store$order7, _this$store$order7$ge;
         var mappings, mapping, tempOrder, matchesCurrent, merged, rawResource, childRawResources, venueProduct, i, _rawResource$form_id, _venueProduct$is_char, group, identityKey, bookingUuid, startMoment, endMoment, duration, customDepositData, resourceEntry, booking, products;
         return _regeneratorRuntime().wrap(function _callee18$(_context18) {
           while (1) switch (_context18.prev = _context18.next) {
@@ -1997,7 +2013,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
               }
 
               // 获取表单信息
-              products = ((_this$store$order6 = this.store.order) === null || _this$store$order6 === void 0 || (_this$store$order6$ge = _this$store$order6.getOrderProducts) === null || _this$store$order6$ge === void 0 ? void 0 : _this$store$order6$ge.call(_this$store$order6)) || [];
+              products = ((_this$store$order7 = this.store.order) === null || _this$store$order7 === void 0 || (_this$store$order7$ge = _this$store$order7.getOrderProducts) === null || _this$store$order7$ge === void 0 ? void 0 : _this$store$order7$ge.call(_this$store$order7)) || [];
               _context18.next = 25;
               return this.preloadHolderForms(products);
             case 25:
@@ -2112,8 +2128,8 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getTempOrder",
     value: function getTempOrder() {
-      var _this$store$order7;
-      var result = ((_this$store$order7 = this.store.order) === null || _this$store$order7 === void 0 ? void 0 : _this$store$order7.getTempOrder()) || null;
+      var _this$store$order8;
+      var result = ((_this$store$order8 = this.store.order) === null || _this$store$order8 === void 0 ? void 0 : _this$store$order8.getTempOrder()) || null;
       return result;
     }
   }, {
@@ -2589,7 +2605,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
     key: "submitOrder",
     value: function () {
       var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25() {
-        var _this$otherParams17, _this$otherParams18, _this$otherParams19, _this$otherParams20, _tempOrder$products2, result, tempOrder;
+        var _this$otherParams21, _this$otherParams22, _this$otherParams23, _this$otherParams24, _tempOrder$products2, result, tempOrder;
         return _regeneratorRuntime().wrap(function _callee25$(_context25) {
           while (1) switch (_context25.prev = _context25.next) {
             case 0:
@@ -2607,10 +2623,10 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
               _context25.next = 8;
               return this.store.order.submitTempOrder({
                 cacheId: this.cacheId,
-                platform: (_this$otherParams17 = this.otherParams) === null || _this$otherParams17 === void 0 ? void 0 : _this$otherParams17.platform,
-                businessCode: (_this$otherParams18 = this.otherParams) === null || _this$otherParams18 === void 0 ? void 0 : _this$otherParams18.businessCode,
-                channel: (_this$otherParams19 = this.otherParams) === null || _this$otherParams19 === void 0 ? void 0 : _this$otherParams19.channel,
-                type: (_this$otherParams20 = this.otherParams) === null || _this$otherParams20 === void 0 ? void 0 : _this$otherParams20.type
+                platform: (_this$otherParams21 = this.otherParams) === null || _this$otherParams21 === void 0 ? void 0 : _this$otherParams21.platform,
+                businessCode: (_this$otherParams22 = this.otherParams) === null || _this$otherParams22 === void 0 ? void 0 : _this$otherParams22.businessCode,
+                channel: (_this$otherParams23 = this.otherParams) === null || _this$otherParams23 === void 0 ? void 0 : _this$otherParams23.channel,
+                type: (_this$otherParams24 = this.otherParams) === null || _this$otherParams24 === void 0 ? void 0 : _this$otherParams24.type
               });
             case 8:
               result = _context25.sent;
@@ -2750,7 +2766,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
     key: "removeProductFromOrder",
     value: function () {
       var _removeProductFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(identity) {
-        var _this$store$order$get3, _this$store$order8, _this$store$order$ens, _this$store$order9, _tempOrder$bookings, tempOrder, products, _tempOrder$bookings2, _tempOrder$bookings3, venueProductUids, venueBookingUids, _iterator17, _step17, _product$metadata7, _product$metadata8, product, beforeBookingCount, _this$store$order$per, _this$store$order10;
+        var _this$store$order$get3, _this$store$order9, _this$store$order$ens, _this$store$order10, _tempOrder$bookings, tempOrder, products, _tempOrder$bookings2, _tempOrder$bookings3, venueProductUids, venueBookingUids, _iterator17, _step17, _product$metadata7, _product$metadata8, product, beforeBookingCount, _this$store$order$per, _this$store$order11;
         return _regeneratorRuntime().wrap(function _callee28$(_context28) {
           while (1) switch (_context28.prev = _context28.next) {
             case 0:
@@ -2765,7 +2781,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error('order 模块未初始化');
             case 4:
-              tempOrder = ((_this$store$order$get3 = (_this$store$order8 = this.store.order).getTempOrder) === null || _this$store$order$get3 === void 0 ? void 0 : _this$store$order$get3.call(_this$store$order8)) || ((_this$store$order$ens = (_this$store$order9 = this.store.order).ensureTempOrder) === null || _this$store$order$ens === void 0 ? void 0 : _this$store$order$ens.call(_this$store$order9));
+              tempOrder = ((_this$store$order$get3 = (_this$store$order9 = this.store.order).getTempOrder) === null || _this$store$order$get3 === void 0 ? void 0 : _this$store$order$get3.call(_this$store$order9)) || ((_this$store$order$ens = (_this$store$order10 = this.store.order).ensureTempOrder) === null || _this$store$order$ens === void 0 ? void 0 : _this$store$order$ens.call(_this$store$order10));
               _context28.next = 7;
               return this.store.order.removeProductFromOrder(identity);
             case 7:
@@ -2822,7 +2838,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 return true;
               });
               if ((((_tempOrder$bookings3 = tempOrder.bookings) === null || _tempOrder$bookings3 === void 0 ? void 0 : _tempOrder$bookings3.length) || 0) !== beforeBookingCount) {
-                (_this$store$order$per = (_this$store$order10 = this.store.order).persistTempOrder) === null || _this$store$order$per === void 0 || _this$store$order$per.call(_this$store$order10);
+                (_this$store$order$per = (_this$store$order11 = this.store.order).persistTempOrder) === null || _this$store$order$per === void 0 || _this$store$order$per.call(_this$store$order11);
               }
             case 33:
               _context28.next = 35;

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

@@ -10,6 +10,7 @@ export interface VenueBookingSmartPricingContext {
     scheduleList?: ScheduleItem[];
     menuList?: DataVariantMenu[];
     customerId?: number | string;
+    availableWalletIds?: Array<number | string>;
     channel?: string;
     businessCode?: string;
     orderType?: string;

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

@@ -16,7 +16,7 @@ export function extractProductPrice(product) {
 
 /** 组装 DataVariant 评估入参，对齐 OS Server buildProductFormatterContext 语义 */
 export function buildDataVariantBusinessData(products, context, scheduleDateTime) {
-  var _context$channel, _ref, _context$orderType, _ref2, _context$businessCode;
+  var _ref, _context$availableWal, _context$channel, _ref2, _context$orderType, _ref3, _context$businessCode;
   var strategyContext = context.strategy_context || {};
   return {
     products: products,
@@ -25,9 +25,10 @@ export function buildDataVariantBusinessData(products, context, scheduleDateTime
     scheduleList: context.scheduleList || [],
     menuList: context.menuList || [],
     customerId: context.customerId,
+    availableWalletIds: (_ref = (_context$availableWal = context.availableWalletIds) !== null && _context$availableWal !== void 0 ? _context$availableWal : strategyContext.available_wallet_ids) !== null && _ref !== void 0 ? _ref : strategyContext.availableWalletIds,
     channel: (_context$channel = context.channel) !== null && _context$channel !== void 0 ? _context$channel : strategyContext.channel,
-    orderType: (_ref = (_context$orderType = context.orderType) !== null && _context$orderType !== void 0 ? _context$orderType : strategyContext.orderType) !== null && _ref !== void 0 ? _ref : strategyContext.order_type,
-    businessCode: (_ref2 = (_context$businessCode = context.businessCode) !== null && _context$businessCode !== void 0 ? _context$businessCode : strategyContext.business_code) !== null && _ref2 !== void 0 ? _ref2 : strategyContext.businessCode,
+    orderType: (_ref2 = (_context$orderType = context.orderType) !== null && _context$orderType !== void 0 ? _context$orderType : strategyContext.orderType) !== null && _ref2 !== void 0 ? _ref2 : strategyContext.order_type,
+    businessCode: (_ref3 = (_context$businessCode = context.businessCode) !== null && _context$businessCode !== void 0 ? _context$businessCode : strategyContext.business_code) !== null && _ref3 !== void 0 ? _ref3 : strategyContext.businessCode,
     custom: strategyContext
   };
 }
@@ -44,7 +45,6 @@ export function formatProductsWithDataVariant(products, context, scheduleDateTim
   }
   var resolvedAt = scheduleDateTime || dayjs().format('YYYY-MM-DD HH:mm:ss');
   var businessData = buildDataVariantBusinessData(products, context, resolvedAt);
-  console.log(businessData, 'businessData');
   var result = evaluator.resolveProducts(businessData);
   return Array.isArray(result === null || result === void 0 ? void 0 : result.products) ? result.products : products;
 }
@@ -207,7 +207,7 @@ export function buildSlotPriceMapByScheduleSegments(params) {
  * 指定商品在某一 datetime 的智能定价（addon / 单点重算用）。
  */
 export function getPriceForProductAtDatetime(params) {
-  var _ref3, _extractProductPrice;
+  var _ref4, _extractProductPrice;
   var products = params.products,
     context = params.context,
     productId = params.productId,
@@ -217,7 +217,7 @@ export function getPriceForProductAtDatetime(params) {
   var product = resolved.find(function (item) {
     return Number(item.id) === Number(productId);
   });
-  return (_ref3 = (_extractProductPrice = extractProductPrice(product || {})) !== null && _extractProductPrice !== void 0 ? _extractProductPrice : fallbackPrice) !== null && _ref3 !== void 0 ? _ref3 : '0.00';
+  return (_ref4 = (_extractProductPrice = extractProductPrice(product || {})) !== null && _extractProductPrice !== void 0 ? _extractProductPrice : fallbackPrice) !== null && _ref4 !== void 0 ? _ref4 : '0.00';
 }
 
 /** 从 slot 价格 Map 读取单价，找不到则回退 fallback */

package/lib/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/lib/model/strategy/adapter/dataVariant/adapter.js

@@ -47,9 +47,11 @@ var DataVariantAdapter = class {
       orderType,
       businessCode,
       customerId,
+      availableWalletIds,
       custom
     } = businessData;
     const normalizedCustomerId = this.normalizeCustomerId(customerId);
+    const normalizedAvailableWalletIds = this.normalizeNumberArray(availableWalletIds ?? (custom == null ? void 0 : custom.available_wallet_ids));
     const resolvedBusinessCode = businessCode || (custom == null ? void 0 : custom.business_code) || (custom == null ? void 0 : custom.businessCode) || "";
     return {
       entities: {
@@ -63,6 +65,8 @@ var DataVariantAdapter = class {
         // snake_case 与策略配置 field 对齐；customerId 保留兼容旧配置
         customer_id: normalizedCustomerId,
         customerId: normalizedCustomerId,
+        available_wallet_ids: normalizedAvailableWalletIds,
+        availableWalletIds: normalizedAvailableWalletIds,
         business_code: resolvedBusinessCode
       },
       metadata: {
@@ -131,6 +135,12 @@ var DataVariantAdapter = class {
     const parsed = Number(value);
     return Number.isFinite(parsed) && parsed > 0 ? parsed : void 0;
   }
+  normalizeNumberArray(value) {
+    if (!Array.isArray(value))
+      return [];
+    const ids = value.map((item) => Number(item)).filter((item) => Number.isFinite(item) && item > 0);
+    return Array.from(new Set(ids));
+  }
 };
 var adapter_default = DataVariantAdapter;
 // Annotate the CommonJS export names for ESM import in node:

package/lib/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/lib/model/strategy/adapter/dataVariant/evaluator.js

@@ -346,7 +346,8 @@ var DataVariantEvaluator = class {
         compareValue,
         businessData.scheduleList || []
       ),
-      menu_match: (fieldValue, compareValue) => this.evaluateMenuMatch(fieldValue, compareValue, menuScopeMap)
+      menu_match: (fieldValue, compareValue) => this.evaluateMenuMatch(fieldValue, compareValue, menuScopeMap),
+      array_intersects: (fieldValue, compareValue) => this.evaluateArrayIntersects(fieldValue, compareValue)
     };
     return new import_engine.StrategyEngine({
       debug: false,
@@ -379,6 +380,14 @@ var DataVariantEvaluator = class {
     }
     return false;
   }
+  evaluateArrayIntersects(fieldValue, compareValue) {
+    const fieldValues = this.normalizeComparableArray(fieldValue);
+    const compareValues = this.normalizeComparableArray(compareValue);
+    if (!fieldValues.length || !compareValues.length)
+      return false;
+    const compareSet = new Set(compareValues);
+    return fieldValues.some((item) => compareSet.has(item));
+  }
   collectScheduleIdsFromStrategies(strategyConfigs) {
     const scheduleIds = /* @__PURE__ */ new Set();
     for (const config of strategyConfigs) {
@@ -549,6 +558,16 @@ var DataVariantEvaluator = class {
       return [];
     return value.map((item) => this.toNumber(item)).filter((item) => item > 0);
   }
+  normalizeComparableArray(value) {
+    const list = Array.isArray(value) ? value : value == null || value === "" ? [] : [value];
+    const normalized = list.map((item) => {
+      if (item == null || item === "")
+        return "";
+      const parsed = Number(item);
+      return Number.isFinite(parsed) ? String(parsed) : String(item).trim();
+    }).filter(Boolean);
+    return Array.from(new Set(normalized));
+  }
   buildProductKey(productId, variantId) {
     return `${productId}:${variantId}`;
   }

package/lib/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/lib/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/lib/modules/Discount/index.js

@@ -100,7 +100,17 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
     const goodPassList = this.filterEnabledDiscountList(
       [...((_a = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _a.good_pass_list) || [], ...((_b = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _b.discount_card_list) || []]
     ) || [];
-    return goodPassList;
+    return {
+      discountList: goodPassList,
+      availableWalletIds: this.extractAvailableWalletIds(prepareConfig == null ? void 0 : prepareConfig.data)
+    };
+  }
+  extractAvailableWalletIds(data) {
+    const availableWalletList = Array.isArray(data == null ? void 0 : data.avaiable_wallet_list) ? data.avaiable_wallet_list : Array.isArray(data == null ? void 0 : data.available_wallet_list) ? data.available_wallet_list : [];
+    const availableWalletPassList = Array.isArray(data == null ? void 0 : data.available_wallet_pass_list) ? data.available_wallet_pass_list : [];
+    const walletIds = availableWalletList.map((item) => Number(item == null ? void 0 : item.id)).filter((id) => Number.isFinite(id) && id > 0);
+    const walletPassProductIds = availableWalletPassList.map((item) => Number(item == null ? void 0 : item.product_id)).filter((id) => Number.isFinite(id) && id > 0);
+    return Array.from(/* @__PURE__ */ new Set([...walletIds, ...walletPassProductIds]));
   }
   async batchSearch(code, options) {
     const { customerId, orderId } = options || {};

package/lib/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/lib/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/lib/modules/Order/index.js

@@ -76,6 +76,9 @@ var OrderModule = class extends import_BaseModule.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");
     const otherParams = options.otherParams || {};
@@ -164,14 +167,18 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   // ─── Discount: 公共 API ───
   async loadDiscountConfig(params) {
     var _a, _b, _c, _d;
-    const discountList = await ((_a = this.store.discount) == null ? void 0 : _a.loadPrepareConfig({
+    const prepareConfig = await ((_a = this.store.discount) == null ? void 0 : _a.loadPrepareConfig({
       customer_id: params.customerId,
       action: params.action || "create",
       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
     }));
+    const discountList = prepareConfig == null ? void 0 : prepareConfig.discountList;
+    this.store.availableWalletIds = (prepareConfig == null ? void 0 : prepareConfig.availableWalletIds) || [];
     if (discountList) {
       (_b = this.store.discount) == null ? void 0 : _b.setDiscountList(discountList);
     }
@@ -183,6 +190,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     var _a;
     return ((_a = this.store.discount) == null ? void 0 : _a.getDiscountList()) || [];
   }
+  getAvailableWalletIds() {
+    return this.store.availableWalletIds || [];
+  }
   async scanCode(code, customerId) {
     var _a, _b, _c, _d, _e;
     const resultDiscountWithReason = await ((_a = this.store.discount) == null ? void 0 : _a.batchSearch(code, { customerId })) || { discountList: [], unavailableReasonKey: null };

package/lib/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/lib/modules/ProductList/index.js

@@ -62,7 +62,7 @@ var ProductList = class extends import_BaseModule.BaseModule {
     with_schedule,
     with_extra = []
   }, options) {
-    var _a;
+    var _a, _b, _c;
     let userPlugin = this.core.getPlugin("user");
     let customer_id = void 0;
     try {
@@ -70,6 +70,13 @@ var ProductList = class extends import_BaseModule.BaseModule {
     } catch (error) {
       console.error(error);
     }
+    const channelMap = {
+      "online_store": "online-store",
+      "scan_to_order": "online-store",
+      "scan_to_order_2": "online-store",
+      "scan_to_order_3": "online-store"
+    };
+    const saleChannel = channelMap[(_b = this.otherParams) == null ? void 0 : _b.channel] || ((_c = this.otherParams) == null ? void 0 : _c.channel);
     try {
       const productsData = await this.request.post(
         `/product/query`,
@@ -99,7 +106,7 @@ var ProductList = class extends import_BaseModule.BaseModule {
           schedule_date,
           schedule_datetime,
           // application_code: this.otherParams?.channel === 'online_store' ? 'online-store' : this.otherParams?.channel,
-          application_code: "online-store",
+          application_code: saleChannel,
           with_schedule,
           is_eject: 1,
           open_deposit: 1

package/lib/modules/Rules/index.js

@@ -418,6 +418,11 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         }
       });
     }
+    const isProductIncludedByLimitedData = (limitedData, productId) => {
+      const excludedIds = (limitedData == null ? void 0 : limitedData.exclude_product_ids) || [];
+      const isExcluded = (limitedData == null ? void 0 : limitedData.filter) === 1 && excludedIds.some((id) => String(id) === String(productId));
+      return !isExcluded;
+    };
     const usedDiscounts = /* @__PURE__ */ new Map();
     const usedProductIdCounts = /* @__PURE__ */ new Map();
     const usedDiscountCardLimitCounts = /* @__PURE__ */ new Map();
@@ -776,7 +781,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           return false;
         }
         if (limitedData.type === "product_all") {
-          if (limitedData.filter === 1 && limitedData.exclude_product_ids.includes(product.id)) {
+          if (!isProductIncludedByLimitedData(limitedData, product.id)) {
             return false;
           }
           if (!this.checkPackageSubItemUsageRules(discount, flatItem)) {

package/lib/modules/Schedule/getDateIsInSchedule.js

@@ -34,6 +34,10 @@ __export(getDateIsInSchedule_exports, {
 });
 module.exports = __toCommonJS(getDateIsInSchedule_exports);
 var import_dayjs = __toESM(require("dayjs"));
+var import_isSameOrAfter = __toESM(require("dayjs/plugin/isSameOrAfter"));
+var import_isSameOrBefore = __toESM(require("dayjs/plugin/isSameOrBefore"));
+import_dayjs.default.extend(import_isSameOrAfter.default);
+import_dayjs.default.extend(import_isSameOrBefore.default);
 var getDateIsInSchedule = (dateTime, scheduleList) => {
   if (!dateTime || !scheduleList || scheduleList.length === 0) {
     return false;

package/lib/modules/Summary/utils.js

@@ -387,6 +387,26 @@ var calculateTaxFee = (shopInfo, items) => {
   }, new import_decimal.default(0));
   return totalTaxFee;
 };
+var getCartItemDepositData = (item) => {
+  var _a, _b, _c, _d;
+  const target = item;
+  return ((_a = target == null ? void 0 : target._productOrigin) == null ? void 0 : _a.custom_deposit_data) || ((_b = target == null ? void 0 : target._origin) == null ? void 0 : _b.custom_deposit_data) || ((_d = (_c = target == null ? void 0 : target._origin) == null ? void 0 : _c.product) == null ? void 0 : _d.custom_deposit_data);
+};
+var getCartItemQuantity = (item) => {
+  return new import_decimal.default((item == null ? void 0 : item.num) || 1);
+};
+var calculateCartItemDepositTotal = (item) => {
+  var _a;
+  const depositData = getCartItemDepositData(item);
+  if ((depositData == null ? void 0 : depositData.has_deposit) == 1 && typeof (depositData == null ? void 0 : depositData.deposit_fixed) === "string" && typeof (depositData == null ? void 0 : depositData.deposit_percentage) === "string") {
+    const lineTotal = new import_decimal.default(item.summaryTotal ?? item.total ?? 0);
+    const quantity = getCartItemQuantity(item);
+    const fixedTotal = new import_decimal.default(depositData.deposit_fixed || 0).times(quantity);
+    const percentageTotal = new import_decimal.default(depositData.deposit_percentage || 0).times(lineTotal);
+    return fixedTotal.plus(percentageTotal);
+  }
+  return new import_decimal.default(((_a = item == null ? void 0 : item.deposit) == null ? void 0 : _a.total) || 0);
+};
 var calculateDeposit = (items) => {
   if (!(items == null ? void 0 : items.length)) {
     return void 0;
@@ -394,11 +414,11 @@ var calculateDeposit = (items) => {
   const protocols = [];
   let hasDeposit = false;
   const total = items.reduce((sum, item) => {
-    var _a, _b, _c;
+    var _a, _b;
     if (item == null ? void 0 : item.deposit) {
       hasDeposit = true;
-      const cartItemTotalPrice = new import_decimal.default(((_a = item == null ? void 0 : item.deposit) == null ? void 0 : _a.total) || 0);
-      (_c = (_b = item == null ? void 0 : item.deposit) == null ? void 0 : _b.protocols) == null ? void 0 : _c.forEach((protocol) => {
+      const cartItemTotalPrice = calculateCartItemDepositTotal(item);
+      (_b = (_a = item == null ? void 0 : item.deposit) == null ? void 0 : _a.protocols) == null ? void 0 : _b.forEach((protocol) => {
         if (protocols.findIndex((p) => p.id === protocol.id) === -1) {
           protocols.push(protocol);
         }