@pisell/pisellos 0.10.43 → 0.10.45

package/dist/solution/ScanOrder/index.js

@@ -2023,7 +2023,11 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "getItemRuleRuntimeConfig",
     value: function getItemRuleRuntimeConfig() {
-      return this.itemRuleRuntimeConfig || {};
+      var _ref7, _runtimeConfig$channe, _runtimeConfig$custom, _this$otherParams13;
+      var runtimeConfig = this.itemRuleRuntimeConfig || {};
+      return _objectSpread(_objectSpread({}, runtimeConfig), {}, {
+        channel: (_ref7 = (_runtimeConfig$channe = runtimeConfig.channel) !== null && _runtimeConfig$channe !== void 0 ? _runtimeConfig$channe : (_runtimeConfig$custom = runtimeConfig.custom) === null || _runtimeConfig$custom === void 0 ? void 0 : _runtimeConfig$custom.channel) !== null && _ref7 !== void 0 ? _ref7 : (_this$otherParams13 = this.otherParams) === null || _this$otherParams13 === void 0 ? void 0 : _this$otherParams13.channel
+      });
     }
   }, {
     key: "ensureItemRuleConfigsLoaded",
@@ -2510,14 +2514,14 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "normalizeResourceState",
     value: function normalizeResourceState(detail, resourceSelectType, hasOrderId) {
-      var _detail$form_record, _this$otherParams13, _detail$resource_capa, _detail$resource_capa2;
+      var _detail$form_record, _this$otherParams14, _detail$resource_capa, _detail$resource_capa2;
       var currentOrderId = toPositiveString(detail === null || detail === void 0 ? void 0 : detail.order_id);
       var lastOrderId = toPositiveString(detail === null || detail === void 0 ? void 0 : detail.last_order_id);
       var relationId = toPositiveString(detail === null || detail === void 0 ? void 0 : detail.form_record_id);
       var tableFormId = toPositiveString(detail === null || detail === void 0 ? void 0 : detail.form_id);
       var formRecord = (_detail$form_record = detail === null || detail === void 0 ? void 0 : detail.form_record) !== null && _detail$form_record !== void 0 ? _detail$form_record : null;
       // 是否允许加餐
-      var allowSnack = ((_this$otherParams13 = this.otherParams) === null || _this$otherParams13 === void 0 || (_this$otherParams13 = _this$otherParams13.dineInConfig) === null || _this$otherParams13 === void 0 ? void 0 : _this$otherParams13['sale.allow_add_items']) || false;
+      var allowSnack = ((_this$otherParams14 = this.otherParams) === null || _this$otherParams14 === void 0 || (_this$otherParams14 = _this$otherParams14.dineInConfig) === null || _this$otherParams14 === void 0 ? void 0 : _this$otherParams14['sale.allow_add_items']) || false;
       // 开启同桌验证 - 本期没有这个配置，默认关掉
       var deskmateValid = false;
       var isExclusive = resourceSelectType === 'single';
@@ -2600,7 +2604,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     key: "fetchResourceOccupyDetailsByResourceId",
     value: function () {
       var _fetchResourceOccupyDetailsByResourceId = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(resourceId) {
-        var _this$otherParams14, _this$otherParams14$g, _response$data$occupy, _response$data;
+        var _this$otherParams15, _this$otherParams15$g, _response$data$occupy, _response$data;
         var formRecordId, shopId, response;
         return _regeneratorRuntime().wrap(function _callee36$(_context36) {
           while (1) switch (_context36.prev = _context36.next) {
@@ -2612,7 +2616,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               }
               throw new Error("[ScanOrder] \u975E\u6CD5\u684C\u53F0 resourceId: ".concat(resourceId));
             case 3:
-              shopId = (_this$otherParams14 = this.otherParams) === null || _this$otherParams14 === void 0 || (_this$otherParams14$g = _this$otherParams14.getStateData) === null || _this$otherParams14$g === void 0 ? void 0 : _this$otherParams14$g.call(_this$otherParams14, 'shop_id');
+              shopId = (_this$otherParams15 = this.otherParams) === null || _this$otherParams15 === void 0 || (_this$otherParams15$g = _this$otherParams15.getStateData) === null || _this$otherParams15$g === void 0 ? void 0 : _this$otherParams15$g.call(_this$otherParams15, 'shop_id');
               if (shopId) {
                 _context36.next = 6;
                 break;
@@ -2706,18 +2710,18 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
         var hasOrderId,
           normalizedResourceId,
           _this$otherParams$bus,
-          _this$otherParams15,
-          _this$otherParams$cha,
           _this$otherParams16,
+          _this$otherParams$cha,
           _this$otherParams17,
-          _this$otherParams17$g,
+          _this$otherParams18,
+          _this$otherParams18$g,
           _occupyDetails$,
           _occupyDetail$form_re,
           _occupyDetail$form_re2,
           _this$store$order6,
           _this$store$order7,
           _this$store$order7$ge,
-          _this$otherParams18,
+          _this$otherParams19,
           _this$store$resource3,
           _this$store$resource4,
           businessCode,
@@ -2771,11 +2775,11 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                 resourceId: normalizedResourceId
               });
               _context37.prev = 3;
-              businessCode = String((_this$otherParams$bus = (_this$otherParams15 = this.otherParams) === null || _this$otherParams15 === void 0 ? void 0 : _this$otherParams15.businessCode) !== null && _this$otherParams$bus !== void 0 ? _this$otherParams$bus : '').trim();
-              channel = String((_this$otherParams$cha = (_this$otherParams16 = this.otherParams) === null || _this$otherParams16 === void 0 ? void 0 : _this$otherParams16.channel) !== null && _this$otherParams$cha !== void 0 ? _this$otherParams$cha : '').trim();
+              businessCode = String((_this$otherParams$bus = (_this$otherParams16 = this.otherParams) === null || _this$otherParams16 === void 0 ? void 0 : _this$otherParams16.businessCode) !== null && _this$otherParams$bus !== void 0 ? _this$otherParams$bus : '').trim();
+              channel = String((_this$otherParams$cha = (_this$otherParams17 = this.otherParams) === null || _this$otherParams17 === void 0 ? void 0 : _this$otherParams17.channel) !== null && _this$otherParams$cha !== void 0 ? _this$otherParams$cha : '').trim();
               openDataTarget = businessCode && channel ? "".concat(businessCode, "+").concat(channel) : 'dine_in+scan_to_order';
               _context37.next = 9;
-              return (_this$otherParams17 = this.otherParams) === null || _this$otherParams17 === void 0 || (_this$otherParams17$g = _this$otherParams17.getOpenData) === null || _this$otherParams17$g === void 0 ? void 0 : _this$otherParams17$g.call(_this$otherParams17, {
+              return (_this$otherParams18 = this.otherParams) === null || _this$otherParams18 === void 0 || (_this$otherParams18$g = _this$otherParams18.getOpenData) === null || _this$otherParams18$g === void 0 ? void 0 : _this$otherParams18$g.call(_this$otherParams18, {
                 scope: 'board',
                 target: openDataTarget,
                 section_code: ['basic', 'fulfillment', 'reservation', 'sale', 'menu', 'availability', 'workflow']
@@ -3004,7 +3008,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               }, []) : []; // pax 由 setEntryPaxNumber 负责写入 itemRuleRuntimeConfig.pax
               _context37.next = 84;
               return this.setItemRuleRuntimeConfig({
-                serviceType: (_this$otherParams18 = this.otherParams) === null || _this$otherParams18 === void 0 ? void 0 : _this$otherParams18.businessCode,
+                serviceType: (_this$otherParams19 = this.otherParams) === null || _this$otherParams19 === void 0 ? void 0 : _this$otherParams19.businessCode,
                 submissionIndex: isAdditionalOrderMode ? 1 : 0,
                 historicalItems: historicalItems
               });
@@ -3130,14 +3134,14 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     key: "getProductList",
     value: function () {
       var _getProductList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee40() {
-        var _this$otherParams19;
+        var _this$otherParams20;
         var associatedMenus, menu_list_ids, res, productList, formattedRes;
         return _regeneratorRuntime().wrap(function _callee40$(_context40) {
           while (1) switch (_context40.prev = _context40.next) {
             case 0:
               this.logMethodStart('getProductList');
               // 可以直接通过配置里的 menu 读取
-              associatedMenus = (_this$otherParams19 = this.otherParams) === null || _this$otherParams19 === void 0 || (_this$otherParams19 = _this$otherParams19.dineInConfig) === null || _this$otherParams19 === void 0 ? void 0 : _this$otherParams19['menu.associated_menus'];
+              associatedMenus = (_this$otherParams20 = this.otherParams) === null || _this$otherParams20 === void 0 || (_this$otherParams20 = _this$otherParams20.dineInConfig) === null || _this$otherParams20 === void 0 ? void 0 : _this$otherParams20['menu.associated_menus'];
               menu_list_ids = associatedMenus.map(function (n) {
                 return Number(n.value);
               }) || [];
@@ -3196,14 +3200,14 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     key: "setOtherParams",
     value: function () {
       var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee41(params) {
-        var _ref8,
-          _ref8$cover,
+        var _ref9,
+          _ref9$cover,
           cover,
           _args41 = arguments;
         return _regeneratorRuntime().wrap(function _callee41$(_context41) {
           while (1) switch (_context41.prev = _context41.next) {
             case 0:
-              _ref8 = _args41.length > 1 && _args41[1] !== undefined ? _args41[1] : {}, _ref8$cover = _ref8.cover, cover = _ref8$cover === void 0 ? false : _ref8$cover;
+              _ref9 = _args41.length > 1 && _args41[1] !== undefined ? _args41[1] : {}, _ref9$cover = _ref9.cover, cover = _ref9$cover === void 0 ? false : _ref9$cover;
               if (cover) {
                 this.otherParams = params;
               } else {
@@ -3354,7 +3358,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     key: "syncAdditionalOrderFromResource",
     value: function () {
       var _syncAdditionalOrderFromResource = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee43(resourceId) {
-        var _ref9, _ref10, _ref11, _this$store$resource5, _this$store$resource6, _occupyDetails$2, _this$store$resource7, _this$otherParams20, _this$store$order8;
+        var _ref10, _ref11, _ref12, _this$store$resource5, _this$store$resource6, _occupyDetails$2, _this$store$resource7, _this$otherParams21, _this$store$order8;
         var tempOrder, normalizedResourceId, _result, occupyDetails, occupyDetail, resourceSelectType, allowAddItems, result;
         return _regeneratorRuntime().wrap(function _callee43$(_context43) {
           while (1) switch (_context43.prev = _context43.next) {
@@ -3366,7 +3370,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               throw new Error('order 模块未初始化');
             case 2:
               tempOrder = this.store.order.ensureTempOrder();
-              normalizedResourceId = String((_ref9 = (_ref10 = (_ref11 = resourceId !== null && resourceId !== void 0 ? resourceId : tempOrder.resource_id) !== null && _ref11 !== void 0 ? _ref11 : (_this$store$resource5 = this.store.resource) === null || _this$store$resource5 === void 0 ? void 0 : _this$store$resource5.relationId) !== null && _ref10 !== void 0 ? _ref10 : (_this$store$resource6 = this.store.resource) === null || _this$store$resource6 === void 0 ? void 0 : _this$store$resource6.relation_id) !== null && _ref9 !== void 0 ? _ref9 : '').trim();
+              normalizedResourceId = String((_ref10 = (_ref11 = (_ref12 = resourceId !== null && resourceId !== void 0 ? resourceId : tempOrder.resource_id) !== null && _ref12 !== void 0 ? _ref12 : (_this$store$resource5 = this.store.resource) === null || _this$store$resource5 === void 0 ? void 0 : _this$store$resource5.relationId) !== null && _ref11 !== void 0 ? _ref11 : (_this$store$resource6 = this.store.resource) === null || _this$store$resource6 === void 0 ? void 0 : _this$store$resource6.relation_id) !== null && _ref10 !== void 0 ? _ref10 : '').trim();
               this.logMethodStart('syncAdditionalOrderFromResource', {
                 resourceId: normalizedResourceId
               });
@@ -3387,7 +3391,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               occupyDetails = _context43.sent;
               occupyDetail = (_occupyDetails$2 = occupyDetails[0]) !== null && _occupyDetails$2 !== void 0 ? _occupyDetails$2 : null;
               resourceSelectType = ((_this$store$resource7 = this.store.resource) === null || _this$store$resource7 === void 0 ? void 0 : _this$store$resource7.resourceSelectType) || this.resolveResourceSelectType(toPositiveString(occupyDetail === null || occupyDetail === void 0 ? void 0 : occupyDetail.form_id));
-              allowAddItems = toBoolean((_this$otherParams20 = this.otherParams) === null || _this$otherParams20 === void 0 || (_this$otherParams20 = _this$otherParams20.dineInConfig) === null || _this$otherParams20 === void 0 ? void 0 : _this$otherParams20['sale.allow_add_items']);
+              allowAddItems = toBoolean((_this$otherParams21 = this.otherParams) === null || _this$otherParams21 === void 0 || (_this$otherParams21 = _this$otherParams21.dineInConfig) === null || _this$otherParams21 === void 0 ? void 0 : _this$otherParams21['sale.allow_add_items']);
               result = this.resolveAdditionalOrderFromOccupyDetail(occupyDetail, resourceSelectType, allowAddItems);
               if (!(!result.matched || !result.order_id)) {
                 _context43.next = 19;
@@ -3445,9 +3449,9 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "checkAllowAddItems",
     value: function checkAllowAddItems() {
-      var _this$otherParams21;
+      var _this$otherParams22;
       this.logMethodStart('checkAllowAddItems');
-      var dineInConfig = ((_this$otherParams21 = this.otherParams) === null || _this$otherParams21 === void 0 ? void 0 : _this$otherParams21.dineInConfig) || {};
+      var dineInConfig = ((_this$otherParams22 = this.otherParams) === null || _this$otherParams22 === void 0 ? void 0 : _this$otherParams22.dineInConfig) || {};
       var result = {
         enabled: toBoolean(dineInConfig['sale.allow_add_items'])
       };
@@ -3460,9 +3464,9 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "getFulfillmentModes",
     value: function getFulfillmentModes() {
-      var _this$otherParams22;
+      var _this$otherParams23;
       this.logMethodStart('getFulfillmentModes');
-      var dineInConfig = ((_this$otherParams22 = this.otherParams) === null || _this$otherParams22 === void 0 ? void 0 : _this$otherParams22.dineInConfig) || {};
+      var dineInConfig = ((_this$otherParams23 = this.otherParams) === null || _this$otherParams23 === void 0 ? void 0 : _this$otherParams23.dineInConfig) || {};
       var result = {
         enablePickup: Boolean(dineInConfig['fulfillment.enable_pickup']),
         enableTableService: Boolean(dineInConfig['fulfillment.enable_table_service'])
@@ -3476,9 +3480,9 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "checkManualPickupRef",
     value: function checkManualPickupRef() {
-      var _this$otherParams23;
+      var _this$otherParams24;
       this.logMethodStart('checkManualPickupRef');
-      var dineInConfig = ((_this$otherParams23 = this.otherParams) === null || _this$otherParams23 === void 0 ? void 0 : _this$otherParams23.dineInConfig) || {};
+      var dineInConfig = ((_this$otherParams24 = this.otherParams) === null || _this$otherParams24 === void 0 ? void 0 : _this$otherParams24.dineInConfig) || {};
       var refMode = dineInConfig['fulfillment.fulfillment_ref_mode'];
       var manualInputType = dineInConfig['fulfillment.manual_input_type'];
       var enabled = refMode === 'manual_input';

package/dist/solution/ScanOrder/utils.d.ts

@@ -78,6 +78,7 @@ export declare function buildItemRuleBusinessData(params: {
         pax?: Partial<PaxInfo>;
         historicalItems?: CartItemSummary[];
         serviceType?: string;
+        channel?: string;
         submissionIndex?: number;
         custom?: Record<string, any>;
     };

package/dist/solution/ScanOrder/utils.js

@@ -309,6 +309,7 @@ export function aggregateItemRuleLimit(matchedLimits) {
   };
 }
 export function buildItemRuleBusinessData(params) {
+  var _runtimeConfig$channe, _runtimeConfig$custom;
   var tempOrder = params.tempOrder,
     runtimeConfig = params.runtimeConfig,
     itemRuleConfigs = params.itemRuleConfigs;
@@ -345,6 +346,7 @@ export function buildItemRuleBusinessData(params) {
     cartItems: cartItems,
     historicalItems: historicalItems,
     serviceType: runtimeConfig.serviceType || 'dine-in',
+    channel: (_runtimeConfig$channe = runtimeConfig.channel) !== null && _runtimeConfig$channe !== void 0 ? _runtimeConfig$channe : (_runtimeConfig$custom = runtimeConfig.custom) === null || _runtimeConfig$custom === void 0 ? void 0 : _runtimeConfig$custom.channel,
     submissionIndex: typeof runtimeConfig.submissionIndex === 'number' ? toNonNegativeInt(runtimeConfig.submissionIndex) : tempOrder.order_id ? 1 : 0,
     custom: runtimeConfig.custom || {},
     strategyConfigs: itemRuleConfigs

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

@@ -43,6 +43,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     batchSearchByProductIds(productIds: number[]): Promise<Discount[]>;
     scanCode(code: string, customerId?: number): Promise<{
         isAvailable: boolean;
+        isAccepted?: boolean;
         productList: Record<string, any>[];
         discountList: Discount[];
         type: "server" | "clientCalc";

package/dist/solution/ShopDiscount/index.js

@@ -30,6 +30,7 @@ import { RulesModule } from "../../modules/Rules";
 import { isEntitlementPass } from "../../modules/Discount/entitlementPass";
 import { filterDiscountListByBookingTime as _filterDiscountListByBookingTime, isAllNormalProduct } from "./utils";
 import { UnavailableReason } from "../../modules/Rules/types";
+import { getDiscountLifecycleReason } from "../../modules/Discount/availability";
 import Decimal from 'decimal.js';
 import { isBoolean } from 'lodash-es';
 export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
@@ -441,7 +442,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "scanCode",
     value: function () {
       var _scanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(code, customerId) {
-        var _this$store$discount4, _this$store$bookingSu2, resultDiscountWithReason, resultDiscountList, unavailableReasonKey, rulesModule, withScanList, currentSelectedDiscountList, _ref2, newProductList, newDiscountList, isAvailable, unavailableReason, _this$options$otherPa6;
+        var _this$store$discount4, _this$store$bookingSu2, resultDiscountWithReason, resultDiscountList, unavailableReasonKey, rulesModule, withScanList, currentSelectedDiscountList, _ref2, newProductList, newDiscountList, evaluatedDiscountList, isAvailable, unavailableReason, isAccepted, _this$options$otherPa6, scannedIds, retainedScannedDiscounts, _this$store$discount5, retainedDiscounts;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
@@ -523,30 +524,65 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 isAvailable: false,
                 productList: this.store.productList || [],
                 discountList: this.getDiscountList()
-              }, newProductList = _ref2.productList, newDiscountList = _ref2.discountList, isAvailable = _ref2.isAvailable, unavailableReason = _ref2.unavailableReason;
+              }, newProductList = _ref2.productList, newDiscountList = _ref2.discountList, evaluatedDiscountList = _ref2.evaluatedDiscountList, isAvailable = _ref2.isAvailable, unavailableReason = _ref2.unavailableReason;
+              isAccepted = isAvailable;
               if (!isAvailable) {
-                _context6.next = 25;
+                _context6.next = 28;
                 break;
               }
               this.setDiscountList(newDiscountList || []);
               this.store.originalDiscountList = newDiscountList || [];
               this.setProductList(newProductList || []);
               if (!(this.isWalkIn() && resultDiscountList.length && ((_this$options$otherPa6 = this.options.otherParams) === null || _this$options$otherPa6 === void 0 ? void 0 : _this$options$otherPa6.platform) === 'shop' && !((resultDiscountList[0].customer_id || 1) === 1))) {
-                _context6.next = 25;
+                _context6.next = 26;
                 break;
               }
-              _context6.next = 25;
+              _context6.next = 26;
               return this.getCustomerWallet(resultDiscountList[0].customer_id);
-            case 25:
+            case 26:
+              _context6.next = 38;
+              break;
+            case 28:
+              scannedIds = new Set(withScanList.map(function (discount) {
+                return String(discount.id);
+              }));
+              retainedScannedDiscounts = (evaluatedDiscountList || withScanList).filter(function (discount) {
+                return scannedIds.has(String(discount.id)) && !getDiscountLifecycleReason(discount);
+              });
+              if (!retainedScannedDiscounts.length) {
+                _context6.next = 38;
+                break;
+              }
+              retainedDiscounts = new Map(this.getDiscountList().map(function (discount) {
+                return [String(discount.id), discount];
+              }));
+              retainedScannedDiscounts.forEach(function (discount) {
+                retainedDiscounts.set(String(discount.id), _objectSpread(_objectSpread({}, discount), {}, {
+                  isScan: true,
+                  isAvailable: false,
+                  isSelected: false,
+                  reasonCode: discount.reasonCode || 'product_not_applicable',
+                  appliedProductDetails: [],
+                  savedAmount: 0
+                }));
+              });
+              this.setDiscountList(_toConsumableArray(retainedDiscounts.values()));
+              this.store.originalDiscountList = this.getDiscountList();
+              _context6.next = 37;
+              return (_this$store$discount5 = this.store.discount) === null || _this$store$discount5 === void 0 ? void 0 : _this$store$discount5.setOriginalDiscountList(this.getDiscountList());
+            case 37:
+              isAccepted = true;
+            case 38:
               return _context6.abrupt("return", {
                 type: "clientCalc",
                 isAvailable: isAvailable || false,
+                isAccepted: Boolean(isAccepted),
                 productList: newProductList || this.store.productList || [],
-                discountList: newDiscountList || this.getDiscountList(),
+                discountList: this.getDiscountList(),
                 unavailableReason: unavailableReason
               });
-            case 28:
-              _context6.prev = 28;
+            case 41:
+              _context6.prev = 41;
               _context6.t1 = _context6["catch"](0);
               console.error('[ShopDiscount] 扫码出错:', _context6.t1);
               return _context6.abrupt("return", {
@@ -556,11 +592,11 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 discountList: this.getDiscountList(),
                 unavailableReason: UnavailableReason.Unknown
               });
-            case 32:
+            case 45:
             case "end":
               return _context6.stop();
           }
-        }, _callee6, this, [[0, 28]]);
+        }, _callee6, this, [[0, 41]]);
       }));
       function scanCode(_x5, _x6) {
         return _scanCode.apply(this, arguments);
@@ -570,8 +606,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "calcDiscountApplicableProductTotalPrice",
     value: function calcDiscountApplicableProductTotalPrice(discount) {
-      var _this$store$discount5;
-      return (_this$store$discount5 = this.store.discount) === null || _this$store$discount5 === void 0 ? void 0 : _this$store$discount5.calcDiscountApplicableProductTotalPrice(discount);
+      var _this$store$discount6;
+      return (_this$store$discount6 = this.store.discount) === null || _this$store$discount6 === void 0 ? void 0 : _this$store$discount6.calcDiscountApplicableProductTotalPrice(discount);
     }
 
     // =========== 私有辅助方法 ===========
@@ -616,7 +652,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "setDiscountList",
     value: function setDiscountList(discountList) {
       var _this3 = this,
-        _this$store$discount6;
+        _this$store$discount7;
       var productList = this.store.productList || [];
       var editModeDiscountList = [];
       productList.forEach(function (item) {
@@ -699,7 +735,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
           item.isDisabledForProductUsed = false;
         }
       });
-      (_this$store$discount6 = this.store.discount) === null || _this$store$discount6 === void 0 || _this$store$discount6.setDiscountList(newDiscountList);
+      (_this$store$discount7 = this.store.discount) === null || _this$store$discount7 === void 0 || _this$store$discount7.setDiscountList(newDiscountList);
       this.emitDiscountListChange(newDiscountList);
       return newDiscountList;
     }
@@ -708,8 +744,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getDiscountList",
     value: function getDiscountList() {
-      var _this$store$discount7;
-      return ((_this$store$discount7 = this.store.discount) === null || _this$store$discount7 === void 0 ? void 0 : _this$store$discount7.getDiscountList()) || [];
+      var _this$store$discount8;
+      return ((_this$store$discount8 = this.store.discount) === null || _this$store$discount8 === void 0 ? void 0 : _this$store$discount8.getDiscountList()) || [];
     }
 
     // 获取客户钱包信息
@@ -791,7 +827,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, prepareConfigResult, goodPassList, scanDiscount, scanDiscountById, refreshedScanEntitlementIds, newGoodPassList, retainedScanDiscounts, newDiscountList, filteredDiscountList, _result3;
+        var _this$getCustomer2, _this$store$discount9, _this$getDiscountList, _this$store$discount10, _this$store$productLi2, orderId, customerId, prepareConfigResult, goodPassList, scanDiscount, scanDiscountById, refreshedScanEntitlementIds, newGoodPassList, retainedScanDiscounts, newDiscountList, filteredDiscountList, _result3;
         return _regeneratorRuntime().wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
             case 0:
@@ -801,13 +837,14 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               //   return
               // }
               _context10.next = 5;
-              return (_this$store$discount8 = this.store.discount) === null || _this$store$discount8 === void 0 ? void 0 : _this$store$discount8.loadPrepareConfig(_objectSpread({
+              return (_this$store$discount9 = this.store.discount) === null || _this$store$discount9 === void 0 ? void 0 : _this$store$discount9.loadPrepareConfig(_objectSpread({
                 customer_id: customerId,
                 action: orderId ? 'edit' : 'create',
                 with_good_pass: 1,
                 with_discount_card: 1,
                 with_wallet_pass_holder: 1,
                 with_entitlement_pass: 1,
+                filter_order_wallet_pass_usage: 0,
                 request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
               }, orderId ? {
                 order_id: orderId
@@ -844,10 +881,10 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               newDiscountList = [].concat(_toConsumableArray(retainedScanDiscounts), _toConsumableArray(newGoodPassList)); // 存储原始优惠券列表
               this.store.originalDiscountList = newDiscountList;
               _context10.next = 16;
-              return (_this$store$discount9 = this.store.discount) === null || _this$store$discount9 === void 0 ? void 0 : _this$store$discount9.setOriginalDiscountList(newDiscountList);
+              return (_this$store$discount10 = this.store.discount) === null || _this$store$discount10 === void 0 ? void 0 : _this$store$discount10.setOriginalDiscountList(newDiscountList);
             case 16:
-              // 根据当前预约时间过滤优惠券列表
-              filteredDiscountList = this.filterDiscountListByBookingTime(newDiscountList, this.store.currentBookingTime);
+              // 日程限制交给 Rules 计算可用状态，展示列表保留当前不可用的卡券。
+              filteredDiscountList = newDiscountList;
               this.store.filteredDiscountList = filteredDiscountList;
               this.setDiscountList(filteredDiscountList || []);
               if (!((_this$store$productLi2 = this.store.productList) !== null && _this$store$productLi2 !== void 0 && _this$store$productLi2.length)) {

package/dist/solution/ShopDiscount/utils.d.ts

@@ -59,12 +59,14 @@ export interface ScheduleItem {
 }
 export declare const getDateIsInSchedule: (dateTime: string, scheduleList: ScheduleItem[]) => boolean;
 /**
- * 根据预约时间过滤优惠券列表
+ * 根据商品使用时间过滤优惠券列表（预约开始时间或普通商品的当前时间）
  * @param discountList 优惠券列表
- * @param bookingTime 预约时间 (格式: YYYY-MM-DD HH:mm:ss)
+ * @param bookingTime 使用时间 (格式: YYYY-MM-DD HH:mm:ss)，未确定时不提前过滤
  * @returns 过滤后的优惠券列表
  */
 export declare const filterDiscountListByBookingTime: (discountList: Discount[], bookingTime: string | null) => Discount[];
+/** 与抵扣计算共用时间判断，区分未开始、有效期不匹配和日程限制。 */
+export declare const getDiscountTimeUnavailableReason: (discount: Discount, useTime: string) => 'not_started' | 'time_limit' | 'outside_schedule' | undefined;
 /**
  * 判断是否是订单级别的固定金额折扣卡
  * @param discount 折扣

package/dist/solution/ShopDiscount/utils.js

@@ -9,7 +9,11 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 Decimal from "decimal.js";
 import dayjs from "dayjs";
+import isSameOrAfter from 'dayjs/plugin/isSameOrAfter';
+import isSameOrBefore from 'dayjs/plugin/isSameOrBefore';
 import { isFullCoveragePass } from "../../modules/Discount/entitlementPass";
+dayjs.extend(isSameOrAfter);
+dayjs.extend(isSameOrBefore);
 export var uniqueById = function uniqueById(arr) {
   var key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'id';
   var seen = new Set();
@@ -440,36 +444,51 @@ var isInWeeklyRepeatForDate = function isInWeeklyRepeatForDate(targetDate, start
 };
 
 /**
- * 根据预约时间过滤优惠券列表
+ * 根据商品使用时间过滤优惠券列表（预约开始时间或普通商品的当前时间）
  * @param discountList 优惠券列表
- * @param bookingTime 预约时间 (格式: YYYY-MM-DD HH:mm:ss)
+ * @param bookingTime 使用时间 (格式: YYYY-MM-DD HH:mm:ss)，未确定时不提前过滤
  * @returns 过滤后的优惠券列表
  */
 export var filterDiscountListByBookingTime = function filterDiscountListByBookingTime(discountList, bookingTime) {
-  if (!bookingTime) {
-    return discountList;
-  }
+  if (!bookingTime) return discountList;
   return discountList.filter(function (discount) {
-    var _discount$metadata2;
+    return !getDiscountTimeUnavailableReason(discount, bookingTime);
+  });
+};
+
+/** 与抵扣计算共用时间判断，区分未开始、有效期不匹配和日程限制。 */
+export var getDiscountTimeUnavailableReason = function getDiscountTimeUnavailableReason(discount, useTime) {
+  var useTimeDayjs = dayjs(useTime);
+  if (!useTimeDayjs.isValid()) return 'time_limit';
+  try {
+    var _discount$metadata2, _discount$extension_d, _discount$custom_sche2;
     if ((discount === null || discount === void 0 || (_discount$metadata2 = discount.metadata) === null || _discount$metadata2 === void 0 ? void 0 : _discount$metadata2.validity_type) === "custom_schedule_validity") {
       var _discount$custom_sche;
-      return getDateIsInSchedule(bookingTime, ((_discount$custom_sche = discount.custom_schedule_snapshot) === null || _discount$custom_sche === void 0 ? void 0 : _discount$custom_sche.data) || []);
+      return getDateIsInSchedule(useTime, ((_discount$custom_sche = discount.custom_schedule_snapshot) === null || _discount$custom_sche === void 0 ? void 0 : _discount$custom_sche.data) || []) ? undefined : 'outside_schedule';
     }
-    try {
-      var isHasStart = !!discount.start_date && !!discount.start_time;
-      var startDate = dayjs("".concat(discount.start_date, " ").concat(discount.start_time));
-      var bookingTimeDayjs = dayjs(bookingTime);
-
-      // 判断预约时间是否在开始时间之后
-      var isAfterStart = isHasStart ? bookingTimeDayjs.isSameOrAfter(startDate) : true;
-
-      // 判断预约时间是否在过期时间之前（expire_time 为空时为长期有效）
-      var isBeforeExpire = discount.expire_time ? bookingTimeDayjs.isSameOrBefore(dayjs(discount.expire_time)) : true;
-      return isAfterStart && isBeforeExpire;
-    } catch (error) {
-      return true;
+    var isHasStart = !!discount.start_date && !!discount.start_time;
+    var startDate = dayjs("".concat(discount.start_date, " ").concat(discount.start_time));
+
+    // 开始时刻包含在有效期内。
+    if (isHasStart) {
+      if (!startDate.isValid()) return 'time_limit';
+      if (useTimeDayjs.isBefore(startDate)) return 'not_started';
     }
-  });
+
+    // 到期时刻不再可用；expire_time 为空时为长期有效。
+    var expireTime = discount.expire_time ? dayjs(discount.expire_time) : null;
+    var isBeforeExpire = expireTime ? expireTime.isValid() && useTimeDayjs.isBefore(expireTime) : true;
+    if (!isBeforeExpire) return 'time_limit';
+    var validity = (_discount$extension_d = discount.extension_data) === null || _discount$extension_d === void 0 || (_discount$extension_d = _discount$extension_d.find(function (field) {
+      return field.field_key === 'valid_times';
+    })) === null || _discount$extension_d === void 0 ? void 0 : _discount$extension_d.value;
+    if ((validity === null || validity === void 0 ? void 0 : validity.restrict_use_by_schedule) === true && !getDateIsInSchedule(useTime, ((_discount$custom_sche2 = discount.custom_schedule_snapshot) === null || _discount$custom_sche2 === void 0 ? void 0 : _discount$custom_sche2.data) || [])) {
+      return 'outside_schedule';
+    }
+    return undefined;
+  } catch (error) {
+    return 'time_limit';
+  }
 };
 /**
  * 判断是否是订单级别的固定金额折扣卡

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

@@ -2,10 +2,11 @@ import type { Module, ModuleOptions, PisellCore } from '../../types';
 import type { ProductData } from '../../modules';
 import { type InvoiceLayoutConfig, type InvoiceTemplateSettings, type OpenDataConfig } from '../../modules/OpenData';
 import type { LoadScheduleAvailableDateParams, ScheduleItem } from '../../modules/Schedule/types';
-import type { ProductListLoadProductsParams } from '../../modules/ProductList';
+import type { ProductListLoadProductsParams, ProductListStoreQueryParams } from '../../modules/ProductList';
 import type { AvailabilityDateRange, AvailabilityOccupancy, AvailabilityProduct, AvailabilityResource, GetProductTimeRangesRequest } from '../../modules/ResourcePlanner';
-import type { AvailabilityContextRef, ContextualAvailabilityQuery, ContextualAvailabilityQueryResult, ContextualCommitAvailabilitySelectionParams, ContextualProductTimeRangeGroup, UnifiedBookingSalesAddRetailProductParams, UnifiedBookingSalesApplyPlannerDiscountsParams, UnifiedBookingSalesCommitAvailabilitySelectionResult, UnifiedBookingSalesDiscountResult, UnifiedBookingSalesLoadProductsByScheduleDateParams, UnifiedBookingSalesLoadOpenDataParams, UnifiedBookingSalesPrepareAvailabilityProjectionParams, UnifiedBookingSalesPolicyResponse, UnifiedBookingSalesStageRetailProductsParams, UnifiedBookingSalesState } from './types';
+import type { AvailabilityContextRef, ContextualAvailabilityQuery, ContextualAvailabilityQueryResult, ContextualCommitAvailabilitySelectionParams, ContextualProductTimeRangeGroup, UnifiedBookingSalesAddRetailProductParams, UnifiedBookingSalesApplyPlannerDiscountsParams, UnifiedBookingSalesCommitAvailabilitySelectionResult, UnifiedBookingSalesDiscountResult, UnifiedBookingSalesLoadProductsByScheduleDateParams, UnifiedBookingSalesLoadOpenDataParams, UnifiedBookingSalesPrepareAvailabilityProjectionParams, UnifiedBookingSalesPolicyResponse, UnifiedBookingSalesResolveProductAllergyRequirementParams, UnifiedBookingSalesStageRetailProductsParams, UnifiedBookingSalesState } from './types';
 import { BookingTicket } from '../BookingTicket';
+import type { AllergyRequirement } from '../../model/strategy/adapter/itemRule';
 export * from './types';
 export { AvailabilityError } from '../../modules/ResourcePlanner';
 /**
@@ -73,6 +74,9 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
     private availabilityRemoteResourceQuerySequence;
     private availabilityRemoteResourceEpoch;
     private availabilityCommitLocks;
+    private allergyItemRuleEvaluator;
+    private allergyItemRuleConfigs;
+    private allergyItemRuleConfigsPromise;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     protected getSubmitOrderSalesChannel(): string;
     private createAvailabilityFacadeError;
@@ -144,6 +148,14 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
      */
     loadOpenData(params: UnifiedBookingSalesLoadOpenDataParams): Promise<OpenDataConfig>;
     getOpenData(): Promise<OpenDataConfig | null>;
+    private resetAllergyItemRuleState;
+    private fetchAllergyItemRuleConfigs;
+    private ensureAllergyItemRuleConfigsLoaded;
+    /**
+     * 评估当前渠道与商品是否命中 ALLERGY_CHECK。
+     * 只返回优先级最高 Action 中当前商品 Target 的 dataSource，不跨商品或 Action 合并。
+     */
+    resolveProductAllergyRequirement(params: UnifiedBookingSalesResolveProductAllergyRequirementParams): Promise<AllergyRequirement | null>;
     clearOpenDataCache(): void;
     getInvoiceLayoutConfig(): Promise<InvoiceLayoutConfig>;
     getInvoiceTemplateSettings(): Promise<InvoiceTemplateSettings>;
@@ -160,6 +172,7 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
         callback?: (result: any) => void;
         subscriberId?: string;
     }): Promise<ProductData[]>;
+    queryProducts(params?: ProductListStoreQueryParams): Promise<ProductData[]>;
     /** Date-first entry point. It delegates protocol details and cache ownership to ScheduleModule. */
     loadScheduleAvailableDate(params: LoadScheduleAvailableDateParams): Promise<import("../../modules/Date/types").ITime[]>;
     /**