@pisell/pisellos 2.2.284 → 2.2.286

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

@@ -136,6 +136,9 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private getAuthoritativeBundleUnitPrice;
     private mergeProductForPriceQuery;
     protected getSubmitOrderSalesChannel(): string | undefined;
+    private getFulfillmentRefModeConfigs;
+    private getFulfillmentRefMode;
+    private buildSubmitPayloadEnhancerWithFulfillmentRefMode;
     /**
      * 工厂入口：根据子模块名实例化对应模块。
      * 默认使用 BookingByStep 公共 `createModule`。子类若需引入额外类型（如 customer），

package/dist/solution/BaseSales/index.js

@@ -46,6 +46,7 @@ import { QuotationModule } from "../../modules/Quotation";
 import { transformBaseProductToOrderProduct as _transformBaseProductToOrderProduct } from "./utils/transformBaseProductToOrderProduct";
 import { calculateBaseSalesProductBookingPrice } from "./utils/quotationPrice";
 var SERVER_ORDER_CHANGED_EVENT = 'order:onOrdersChanged';
+var OS_FULFILLMENT_REF_MODE_FIELD = '_os_fulfillment_ref_mode';
 var WALLET_PAYMENT_CODE_BY_TAG = {
   product_voucher: 'PRODUCTVOUCHER',
   gift_card: 'GIFTCARD',
@@ -1200,6 +1201,45 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
       var _this$otherParams8;
       return (_this$otherParams8 = this.otherParams) === null || _this$otherParams8 === void 0 ? void 0 : _this$otherParams8.channel;
     }
+  }, {
+    key: "getFulfillmentRefModeConfigs",
+    value: function getFulfillmentRefModeConfigs() {
+      var _this$otherParams9, _this$otherParams10, _this$store, _this$store$getOpenDa;
+      var candidates = [(_this$otherParams9 = this.otherParams) === null || _this$otherParams9 === void 0 ? void 0 : _this$otherParams9.openData, (_this$otherParams10 = this.otherParams) === null || _this$otherParams10 === void 0 ? void 0 : _this$otherParams10.dineInConfig, (_this$store = this.store) === null || _this$store === void 0 || (_this$store = _this$store.openData) === null || _this$store === void 0 || (_this$store$getOpenDa = _this$store.getOpenData) === null || _this$store$getOpenDa === void 0 ? void 0 : _this$store$getOpenDa.call(_this$store)];
+      return candidates.filter(function (candidate) {
+        return candidate && _typeof(candidate) === 'object' && !Array.isArray(candidate);
+      });
+    }
+  }, {
+    key: "getFulfillmentRefMode",
+    value: function getFulfillmentRefMode() {
+      var _iterator2 = _createForOfIteratorHelper(this.getFulfillmentRefModeConfigs()),
+        _step2;
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var config = _step2.value;
+          var mode = config['fulfillment.fulfillment_ref_mode'];
+          if (mode === undefined || mode === null) continue;
+          var normalized = String(mode).trim();
+          if (normalized) return normalized;
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+      return undefined;
+    }
+  }, {
+    key: "buildSubmitPayloadEnhancerWithFulfillmentRefMode",
+    value: function buildSubmitPayloadEnhancerWithFulfillmentRefMode(enhancePayload) {
+      var fulfillmentRefMode = this.getFulfillmentRefMode();
+      if (!fulfillmentRefMode) return enhancePayload;
+      return function (payload, ctx) {
+        var enhancedPayload = enhancePayload ? enhancePayload(payload, ctx) : payload;
+        return _objectSpread(_objectSpread({}, enhancedPayload), {}, _defineProperty({}, OS_FULFILLMENT_REF_MODE_FIELD, fulfillmentRefMode));
+      };
+    }
 
     /**
      * 工厂入口：根据子模块名实例化对应模块。
@@ -1428,11 +1468,11 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "initialize",
     value: function () {
       var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(core) {
-        var _this$otherParams9,
+        var _this$otherParams11,
           _this$appPlugin2,
           _this$appPlugin2$getA,
           _this9 = this,
-          _this$otherParams10;
+          _this$otherParams12;
         var options,
           app,
           targetCacheData,
@@ -1447,7 +1487,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               this.paymentNumberDevicePrefix = null;
               // this.store = { ...this.store, ...(options.store as Partial<BaseSalesState>) };
               this.otherParams = options.otherParams || {};
-              this.cacheId = (_this$otherParams9 = this.otherParams) === null || _this$otherParams9 === void 0 ? void 0 : _this$otherParams9.cacheId;
+              this.cacheId = (_this$otherParams11 = this.otherParams) === null || _this$otherParams11 === void 0 ? void 0 : _this$otherParams11.cacheId;
               this.reusedSharedSubModuleNames.clear();
               this.window = core.getPlugin('window');
               this.request = core.getPlugin('request');
@@ -1489,7 +1529,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               _context12.next = 19;
               return this.store.schedule.loadAllSchedule();
             case 19:
-              if (this.store.order && typeof ((_this$otherParams10 = this.otherParams) === null || _this$otherParams10 === void 0 ? void 0 : _this$otherParams10.enableTempOrderPersist) === 'boolean') {
+              if (this.store.order && typeof ((_this$otherParams12 = this.otherParams) === null || _this$otherParams12 === void 0 ? void 0 : _this$otherParams12.enableTempOrderPersist) === 'boolean') {
                 this.store.order.setEnableTempOrderPersist(this.otherParams.enableTempOrderPersist);
               }
               _context12.next = 22;
@@ -2157,12 +2197,23 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
         return !_this12.isPersistedOrderProduct(product);
       });
       if (hasDraftProduct) return false;
-      var hasSelectedDiscount = params.currentDiscountList.some(function (discount) {
-        return discount.isSelected || discount.isEditMode || discount.isManualSelect;
+
+      // 编辑详情 hydrate 时，商品行上的历史券卡会被还原为 isEditMode=true、
+      // isSelected=true 的只读记录。它们表示“该折扣已在原订单结算”，不是用户在
+      // 当前编辑会话中新做的选择，不能据此放行刚从 prepare/config 拉回来的折扣。
+      // 否则后续 Rules.calcDiscount 会把没有 isManualSelect 标记的可用 runtime 卡
+      // 当作自动候选，再次写入 tempOrder。这里只识别非 isEditMode 的 runtime 状态；
+      // 新建单、编辑态新增商品以及用户本次明确选择/取消折扣的原有流程保持不变。
+      var hasRuntimeDiscountSelection = params.currentDiscountList.some(function (discount) {
+        return !discount.isEditMode && (discount.isSelected || discount.isManualSelect);
       });
-      if (hasSelectedDiscount) return false;
+      if (hasRuntimeDiscountSelection) return false;
+
+      // nextDiscountList 已经合并了历史只读折扣与本次获取的 runtime 折扣，
+      // 因此这里同样必须排除 isEditMode；只有 runtime 条目已有明确选择状态时，
+      // 才允许继续进入折扣重算。
       return !params.nextDiscountList.some(function (discount) {
-        return discount.isSelected || discount.isEditMode || discount.isManualSelect;
+        return !discount.isEditMode && (discount.isSelected || discount.isManualSelect);
       });
     }
   }, {
@@ -2196,7 +2247,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _loadDiscountConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(params) {
         var _this$getOrderIdentit, _tempOrder$customer, _tempOrder$_extend, _tempOrder$_extend2, _discountModule$getDi, _discountModule$getOr, _discountModule$getDi2;
-        var tempOrder, orderStore, discountModule, rulesModule, orderId, customerId, currentDiscountList, originalDiscountList, hasManualDiscountSelection, discountAction, discountConfigCacheKey, preparedDiscountList, _discountModule$setOr, nextDiscountList, shouldSkipAutoApplyFetchedDiscounts, _summary, _orderStore$summary, orderTotalAmount, result, _iterator2, _step2, _product$metadata5, _tempOrder$_extend3, _product$metadata$sou, _product$metadata6, _product$metadata7, _product$original_pri, product, productUid, runtimeOrigin, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice, summary;
+        var tempOrder, orderStore, discountModule, rulesModule, orderId, customerId, currentDiscountList, originalDiscountList, hasManualDiscountSelection, discountAction, discountConfigCacheKey, preparedDiscountList, _discountModule$setOr, nextDiscountList, shouldSkipAutoApplyFetchedDiscounts, _summary, _orderStore$summary, orderTotalAmount, result, _iterator3, _step3, _product$metadata5, _tempOrder$_extend3, _product$metadata$sou, _product$metadata6, _product$metadata7, _product$original_pri, product, productUid, runtimeOrigin, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice, summary;
         return _regeneratorRuntime().wrap(function _callee21$(_context21) {
           while (1) switch (_context21.prev = _context21.next) {
             case 0:
@@ -2311,15 +2362,15 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               if (result.productList) {
                 tempOrder.products = preserveManualProductDiscountProducts(tempOrder.products, result.productList);
               }
-              _iterator2 = _createForOfIteratorHelper(tempOrder.products || []);
+              _iterator3 = _createForOfIteratorHelper(tempOrder.products || []);
               _context21.prev = 45;
-              _iterator2.s();
+              _iterator3.s();
             case 47:
-              if ((_step2 = _iterator2.n()).done) {
+              if ((_step3 = _iterator3.n()).done) {
                 _context21.next = 62;
                 break;
               }
-              product = _step2.value;
+              product = _step3.value;
               productUid = (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.unique_identification_number;
               runtimeOrigin = productUid ? (_tempOrder$_extend3 = tempOrder._extend) === null || _tempOrder$_extend3 === void 0 || (_tempOrder$_extend3 = _tempOrder$_extend3.productsByUid) === null || _tempOrder$_extend3 === void 0 || (_tempOrder$_extend3 = _tempOrder$_extend3[productUid]) === null || _tempOrder$_extend3 === void 0 ? void 0 : _tempOrder$_extend3.origin : undefined;
               if (!(runtimeOrigin !== null && runtimeOrigin !== void 0 && runtimeOrigin.isManualDiscount || isBaseSalesManualProductDiscountProduct(product))) {
@@ -2352,10 +2403,10 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
             case 64:
               _context21.prev = 64;
               _context21.t0 = _context21["catch"](45);
-              _iterator2.e(_context21.t0);
+              _iterator3.e(_context21.t0);
             case 67:
               _context21.prev = 67;
-              _iterator2.f();
+              _iterator3.f();
               return _context21.finish(67);
             case 70:
               if (!result.discountList) {
@@ -2628,7 +2679,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "setDiscountSelected",
     value: function () {
       var _setDiscountSelected = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(params) {
-        var list, updated, tempOrder, orderStore, discountModule, rulesModule, nextDiscountList, _orderStore$summary3, orderTotalAmount, result, beforeSelectedIds, _iterator3, _step3, d, selectedResourceIds, filterSelectedDiscountDetails, _iterator4, _step4, _product$metadata8, _tempOrder$_extend4, _product$metadata$sou2, _product$metadata9, _product$metadata10, _product$original_pri2, product, productUid, runtimeOrigin, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice;
+        var list, updated, tempOrder, orderStore, discountModule, rulesModule, nextDiscountList, _orderStore$summary3, orderTotalAmount, result, beforeSelectedIds, _iterator4, _step4, d, selectedResourceIds, filterSelectedDiscountDetails, _iterator5, _step5, _product$metadata8, _tempOrder$_extend4, _product$metadata$sou2, _product$metadata9, _product$metadata10, _product$original_pri2, product, productUid, runtimeOrigin, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice;
         return _regeneratorRuntime().wrap(function _callee25$(_context25) {
           while (1) switch (_context25.prev = _context25.next) {
             case 0:
@@ -2683,10 +2734,10 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                     }).map(function (d) {
                       return d.id;
                     }));
-                    _iterator3 = _createForOfIteratorHelper(nextDiscountList);
+                    _iterator4 = _createForOfIteratorHelper(nextDiscountList);
                     try {
-                      for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-                        d = _step3.value;
+                      for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+                        d = _step4.value;
                         if (d.isSelected && !beforeSelectedIds.has(d.id)) {
                           d.isSelected = false;
                           d.isManualSelect = true;
@@ -2694,9 +2745,9 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                         }
                       }
                     } catch (err) {
-                      _iterator3.e(err);
+                      _iterator4.e(err);
                     } finally {
-                      _iterator3.f();
+                      _iterator4.f();
                     }
                   }
                 }
@@ -2713,15 +2764,15 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                   return rid != null && selectedResourceIds.has(rid);
                 });
               };
-              _iterator4 = _createForOfIteratorHelper(tempOrder.products);
+              _iterator5 = _createForOfIteratorHelper(tempOrder.products);
               _context25.prev = 17;
-              _iterator4.s();
+              _iterator5.s();
             case 19:
-              if ((_step4 = _iterator4.n()).done) {
+              if ((_step5 = _iterator5.n()).done) {
                 _context25.next = 36;
                 break;
               }
-              product = _step4.value;
+              product = _step5.value;
               productUid = (_product$metadata8 = product.metadata) === null || _product$metadata8 === void 0 ? void 0 : _product$metadata8.unique_identification_number;
               runtimeOrigin = productUid ? (_tempOrder$_extend4 = tempOrder._extend) === null || _tempOrder$_extend4 === void 0 || (_tempOrder$_extend4 = _tempOrder$_extend4.productsByUid) === null || _tempOrder$_extend4 === void 0 || (_tempOrder$_extend4 = _tempOrder$_extend4[productUid]) === null || _tempOrder$_extend4 === void 0 ? void 0 : _tempOrder$_extend4.origin : undefined;
               if (!(runtimeOrigin !== null && runtimeOrigin !== void 0 && runtimeOrigin.isManualDiscount || isBaseSalesManualProductDiscountProduct(product))) {
@@ -2772,10 +2823,10 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
             case 38:
               _context25.prev = 38;
               _context25.t0 = _context25["catch"](17);
-              _iterator4.e(_context25.t0);
+              _iterator5.e(_context25.t0);
             case 41:
               _context25.prev = 41;
-              _iterator4.f();
+              _iterator5.f();
               return _context25.finish(41);
             case 44:
               OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
@@ -2913,8 +2964,8 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "submitSalesOrder",
     value: (function () {
       var _submitSalesOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(params) {
-        var _params$smallTicketDa, _this$otherParams11, _this$otherParams12, _this$otherParams13, _this$otherParams14;
-        var inferredPaymentStatus, smallTicketDataFlag, submitParams;
+        var _params$smallTicketDa, _this$otherParams13, _this$otherParams14, _this$otherParams15, _this$otherParams16;
+        var inferredPaymentStatus, smallTicketDataFlag, enhancePayload, submitParams;
         return _regeneratorRuntime().wrap(function _callee28$(_context28) {
           while (1) switch (_context28.prev = _context28.next) {
             case 0:
@@ -2927,12 +2978,13 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               // this.store.order.persistTempOrder();
               inferredPaymentStatus = this.getSubmitPaymentStatus(params === null || params === void 0 ? void 0 : params.paymentStatus);
               smallTicketDataFlag = (_params$smallTicketDa = params === null || params === void 0 ? void 0 : params.smallTicketDataFlag) !== null && _params$smallTicketDa !== void 0 ? _params$smallTicketDa : this.getDefaultCheckoutSmallTicketDataFlag();
+              enhancePayload = this.buildSubmitPayloadEnhancerWithFulfillmentRefMode(params === null || params === void 0 ? void 0 : params.enhancePayload);
               submitParams = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
                 cacheId: this.cacheId,
-                platform: (_this$otherParams11 = this.otherParams) === null || _this$otherParams11 === void 0 ? void 0 : _this$otherParams11.platform,
-                businessCode: ((_this$otherParams12 = this.otherParams) === null || _this$otherParams12 === void 0 ? void 0 : _this$otherParams12.businessCode) || ((_this$otherParams13 = this.otherParams) === null || _this$otherParams13 === void 0 ? void 0 : _this$otherParams13.business_code),
+                platform: (_this$otherParams13 = this.otherParams) === null || _this$otherParams13 === void 0 ? void 0 : _this$otherParams13.platform,
+                businessCode: ((_this$otherParams14 = this.otherParams) === null || _this$otherParams14 === void 0 ? void 0 : _this$otherParams14.businessCode) || ((_this$otherParams15 = this.otherParams) === null || _this$otherParams15 === void 0 ? void 0 : _this$otherParams15.business_code),
                 channel: this.getSubmitOrderSalesChannel(),
-                type: (_this$otherParams14 = this.otherParams) === null || _this$otherParams14 === void 0 ? void 0 : _this$otherParams14.type,
+                type: (_this$otherParams16 = this.otherParams) === null || _this$otherParams16 === void 0 ? void 0 : _this$otherParams16.type,
                 request_unique_idempotency_token: this.store.order.generateIdempotencyToken()
               }, (params === null || params === void 0 ? void 0 : params.payments) !== undefined ? {
                 payments: params.payments
@@ -2942,11 +2994,11 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 smallTicketDataFlag: smallTicketDataFlag
               } : {}), (params === null || params === void 0 ? void 0 : params.confirmPendingVoucherPayments) !== undefined ? {
                 confirmPendingVoucherPayments: params.confirmPendingVoucherPayments
-              } : {}), (params === null || params === void 0 ? void 0 : params.enhancePayload) !== undefined ? {
-                enhancePayload: params.enhancePayload
+              } : {}), enhancePayload !== undefined ? {
+                enhancePayload: enhancePayload
               } : {});
               return _context28.abrupt("return", this.shouldUseCheckoutSyncTask() ? this.store.order.submitTempOrder(submitParams) : this.store.order.submitTempOrderAsync(submitParams));
-            case 6:
+            case 7:
             case "end":
               return _context28.stop();
           }
@@ -2961,7 +3013,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "saveSalesOrderDraft",
     value: function () {
       var _saveSalesOrderDraft = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29(params) {
-        var _params$platform, _this$otherParams15, _this$otherParams16, _this$otherParams17, _params$channel, _params$type, _this$otherParams18;
+        var _params$platform, _this$otherParams17, _this$otherParams18, _this$otherParams19, _params$channel, _params$type, _this$otherParams20;
         return _regeneratorRuntime().wrap(function _callee29$(_context29) {
           while (1) switch (_context29.prev = _context29.next) {
             case 0:
@@ -2973,10 +3025,10 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
             case 2:
               return _context29.abrupt("return", this.store.order.saveTempOrderAsDraft(_objectSpread({
                 cacheId: this.cacheId,
-                platform: (_params$platform = params === null || params === void 0 ? void 0 : params.platform) !== null && _params$platform !== void 0 ? _params$platform : (_this$otherParams15 = this.otherParams) === null || _this$otherParams15 === void 0 ? void 0 : _this$otherParams15.platform,
-                businessCode: (params === null || params === void 0 ? void 0 : params.businessCode) || ((_this$otherParams16 = this.otherParams) === null || _this$otherParams16 === void 0 ? void 0 : _this$otherParams16.businessCode) || ((_this$otherParams17 = this.otherParams) === null || _this$otherParams17 === void 0 ? void 0 : _this$otherParams17.business_code),
+                platform: (_params$platform = params === null || params === void 0 ? void 0 : params.platform) !== null && _params$platform !== void 0 ? _params$platform : (_this$otherParams17 = this.otherParams) === null || _this$otherParams17 === void 0 ? void 0 : _this$otherParams17.platform,
+                businessCode: (params === null || params === void 0 ? void 0 : params.businessCode) || ((_this$otherParams18 = this.otherParams) === null || _this$otherParams18 === void 0 ? void 0 : _this$otherParams18.businessCode) || ((_this$otherParams19 = this.otherParams) === null || _this$otherParams19 === void 0 ? void 0 : _this$otherParams19.business_code),
                 channel: (_params$channel = params === null || params === void 0 ? void 0 : params.channel) !== null && _params$channel !== void 0 ? _params$channel : this.getSubmitOrderSalesChannel(),
-                type: (_params$type = params === null || params === void 0 ? void 0 : params.type) !== null && _params$type !== void 0 ? _params$type : (_this$otherParams18 = this.otherParams) === null || _this$otherParams18 === void 0 ? void 0 : _this$otherParams18.type
+                type: (_params$type = params === null || params === void 0 ? void 0 : params.type) !== null && _params$type !== void 0 ? _params$type : (_this$otherParams20 = this.otherParams) === null || _this$otherParams20 === void 0 ? void 0 : _this$otherParams20.type
               }, (params === null || params === void 0 ? void 0 : params.enhancePayload) !== undefined ? {
                 enhancePayload: params.enhancePayload
               } : {})));
@@ -2995,8 +3047,8 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "submitTempOrderAsync",
     value: function () {
       var _submitTempOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30(params) {
-        var _params$smallTicketDa2, _this$otherParams19, _this$otherParams20, _this$otherParams21, _this$otherParams22;
-        var inferredPaymentStatus, smallTicketDataFlag, submitParams;
+        var _params$smallTicketDa2, _this$otherParams21, _this$otherParams22, _this$otherParams23, _this$otherParams24;
+        var inferredPaymentStatus, smallTicketDataFlag, enhancePayload, submitParams;
         return _regeneratorRuntime().wrap(function _callee30$(_context30) {
           while (1) switch (_context30.prev = _context30.next) {
             case 0:
@@ -3008,12 +3060,13 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
             case 2:
               inferredPaymentStatus = this.getSubmitPaymentStatus(params === null || params === void 0 ? void 0 : params.paymentStatus);
               smallTicketDataFlag = (_params$smallTicketDa2 = params === null || params === void 0 ? void 0 : params.smallTicketDataFlag) !== null && _params$smallTicketDa2 !== void 0 ? _params$smallTicketDa2 : this.getDefaultCheckoutSmallTicketDataFlag();
+              enhancePayload = this.buildSubmitPayloadEnhancerWithFulfillmentRefMode(params === null || params === void 0 ? void 0 : params.enhancePayload);
               submitParams = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
                 cacheId: this.cacheId,
-                platform: (_this$otherParams19 = this.otherParams) === null || _this$otherParams19 === void 0 ? void 0 : _this$otherParams19.platform,
-                businessCode: ((_this$otherParams20 = this.otherParams) === null || _this$otherParams20 === void 0 ? void 0 : _this$otherParams20.businessCode) || ((_this$otherParams21 = this.otherParams) === null || _this$otherParams21 === void 0 ? void 0 : _this$otherParams21.business_code),
+                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) || ((_this$otherParams23 = this.otherParams) === null || _this$otherParams23 === void 0 ? void 0 : _this$otherParams23.business_code),
                 channel: this.getSubmitOrderSalesChannel(),
-                type: (_this$otherParams22 = this.otherParams) === null || _this$otherParams22 === void 0 ? void 0 : _this$otherParams22.type,
+                type: (_this$otherParams24 = this.otherParams) === null || _this$otherParams24 === void 0 ? void 0 : _this$otherParams24.type,
                 request_unique_idempotency_token: this.store.order.generateIdempotencyToken()
               }, (params === null || params === void 0 ? void 0 : params.payments) !== undefined ? {
                 payments: params.payments
@@ -3023,11 +3076,11 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 smallTicketDataFlag: smallTicketDataFlag
               } : {}), (params === null || params === void 0 ? void 0 : params.confirmPendingVoucherPayments) !== undefined ? {
                 confirmPendingVoucherPayments: params.confirmPendingVoucherPayments
-              } : {}), (params === null || params === void 0 ? void 0 : params.enhancePayload) !== undefined ? {
-                enhancePayload: params.enhancePayload
+              } : {}), enhancePayload !== undefined ? {
+                enhancePayload: enhancePayload
               } : {});
               return _context30.abrupt("return", this.store.order.submitTempOrderAsync(submitParams));
-            case 6:
+            case 7:
             case "end":
               return _context30.stop();
           }
@@ -3045,8 +3098,8 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "shouldUseCheckoutSyncTask",
     value: function shouldUseCheckoutSyncTask() {
-      var _this$otherParams23;
-      var configured = (_this$otherParams23 = this.otherParams) === null || _this$otherParams23 === void 0 ? void 0 : _this$otherParams23.checkoutSyncTaskEnabled;
+      var _this$otherParams25;
+      var configured = (_this$otherParams25 = this.otherParams) === null || _this$otherParams25 === void 0 ? void 0 : _this$otherParams25.checkoutSyncTaskEnabled;
       return typeof configured === 'boolean' ? configured : true;
     }
 
@@ -3060,7 +3113,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "printLocalOrderReceipt",
     value: function () {
       var _printLocalOrderReceipt = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31(lookup) {
-        var _this$otherParams24, _this$otherParams25, _this$otherParams26, _this$otherParams27;
+        var _this$otherParams26, _this$otherParams27, _this$otherParams28, _this$otherParams29;
         var hasLookup, lookupPayload, context, payload, response, _this$store$order$app, _this$store$order5, _data;
         return _regeneratorRuntime().wrap(function _callee31$(_context31) {
           while (1) switch (_context31.prev = _context31.next) {
@@ -3078,10 +3131,10 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 external_sale_number: lookup
               };
               context = {
-                platform: (_this$otherParams24 = this.otherParams) === null || _this$otherParams24 === void 0 ? void 0 : _this$otherParams24.platform,
-                businessCode: ((_this$otherParams25 = this.otherParams) === null || _this$otherParams25 === void 0 ? void 0 : _this$otherParams25.businessCode) || ((_this$otherParams26 = this.otherParams) === null || _this$otherParams26 === void 0 ? void 0 : _this$otherParams26.business_code),
+                platform: (_this$otherParams26 = this.otherParams) === null || _this$otherParams26 === void 0 ? void 0 : _this$otherParams26.platform,
+                businessCode: ((_this$otherParams27 = this.otherParams) === null || _this$otherParams27 === void 0 ? void 0 : _this$otherParams27.businessCode) || ((_this$otherParams28 = this.otherParams) === null || _this$otherParams28 === void 0 ? void 0 : _this$otherParams28.business_code),
                 channel: this.getSubmitOrderSalesChannel(),
-                type: (_this$otherParams27 = this.otherParams) === null || _this$otherParams27 === void 0 ? void 0 : _this$otherParams27.type
+                type: (_this$otherParams29 = this.otherParams) === null || _this$otherParams29 === void 0 ? void 0 : _this$otherParams29.type
               };
               payload = hasLookup ? _objectSpread(_objectSpread({}, lookupPayload), {}, {
                 lookup_order_from_db: 1,
@@ -3140,8 +3193,8 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "syncPaymentsToOrder",
     value: function () {
       var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee32(params) {
-        var _ref32, _params$businessCode, _this$otherParams28, _this$otherParams29, _params$channel2;
-        var businessCode, channel, syncParams, syncState, payments, syncResult, latestPayments, amountSnapshot, orderSnapshot, syncPayload;
+        var _ref32, _params$businessCode, _this$otherParams30, _this$otherParams31, _params$channel2;
+        var businessCode, channel, enhancePayload, syncParams, syncState, payments, syncResult, latestPayments, amountSnapshot, orderSnapshot, syncPayload;
         return _regeneratorRuntime().wrap(function _callee32$(_context32) {
           while (1) switch (_context32.prev = _context32.next) {
             case 0:
@@ -3151,36 +3204,39 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error('order 模块未初始化');
             case 2:
-              businessCode = (_ref32 = (_params$businessCode = params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams28 = this.otherParams) === null || _this$otherParams28 === void 0 ? void 0 : _this$otherParams28.businessCode) !== null && _ref32 !== void 0 ? _ref32 : (_this$otherParams29 = this.otherParams) === null || _this$otherParams29 === void 0 ? void 0 : _this$otherParams29.business_code;
+              businessCode = (_ref32 = (_params$businessCode = params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams30 = this.otherParams) === null || _this$otherParams30 === void 0 ? void 0 : _this$otherParams30.businessCode) !== null && _ref32 !== void 0 ? _ref32 : (_this$otherParams31 = this.otherParams) === null || _this$otherParams31 === void 0 ? void 0 : _this$otherParams31.business_code;
               channel = (_params$channel2 = params.channel) !== null && _params$channel2 !== void 0 ? _params$channel2 : this.getSubmitOrderSalesChannel();
-              syncParams = _objectSpread(_objectSpread(_objectSpread({}, params), {}, {
+              enhancePayload = this.buildSubmitPayloadEnhancerWithFulfillmentRefMode(params.enhancePayload);
+              syncParams = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, params), {}, {
                 checkoutSyncTaskEnabled: this.shouldUseCheckoutSyncTask()
               }, businessCode !== undefined ? {
                 businessCode: businessCode
               } : {}), channel !== undefined ? {
                 channel: channel
+              } : {}), enhancePayload !== undefined ? {
+                enhancePayload: enhancePayload
               } : {});
               syncState = this.store.order.getOrderSyncState();
               if (!(params.submitWhenPaid && syncState === 'submitting')) {
-                _context32.next = 9;
+                _context32.next = 10;
                 break;
               }
               this.queueLatestAutoPaymentSync();
               return _context32.abrupt("return", this.store.order.syncPaymentsToOrder(syncParams));
-            case 9:
+            case 10:
               payments = params.payments || [];
-              _context32.next = 12;
+              _context32.next = 13;
               return this.effectsEmit(BaseSalesHookNames.onPaymentSyncStart, {
                 payments: payments,
                 params: syncParams,
                 amountSnapshot: this.store.order.getOrderAmountSnapshot(),
                 orderSnapshot: this.store.order.getOrderSnapshot()
               });
-            case 12:
-              _context32.prev = 12;
-              _context32.next = 15;
+            case 13:
+              _context32.prev = 13;
+              _context32.next = 16;
               return this.store.order.syncPaymentsToOrder(syncParams);
-            case 15:
+            case 16:
               syncResult = _context32.sent;
               latestPayments = this.store.order.getOrderPayments();
               amountSnapshot = this.store.order.getOrderAmountSnapshot();
@@ -3199,22 +3255,22 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 depositAmount: syncResult.depositAmount,
                 orderExpectedAmount: syncResult.orderExpectedAmount
               };
-              _context32.next = 22;
+              _context32.next = 23;
               return this.effectsEmit(BaseSalesHookNames.onPaymentSyncEnd, syncPayload);
-            case 22:
+            case 23:
               if (!(syncResult.isDepositFullyPaid && !syncResult.isOrderFullyPaid)) {
-                _context32.next = 25;
+                _context32.next = 26;
                 break;
               }
-              _context32.next = 25;
+              _context32.next = 26;
               return this.effectsEmit(BaseSalesHookNames.onDepositPaymentSyncEnd, syncPayload);
-            case 25:
+            case 26:
               this.scheduleQueuedAutoPaymentSyncFlush(0);
               return _context32.abrupt("return", syncResult);
-            case 29:
-              _context32.prev = 29;
-              _context32.t0 = _context32["catch"](12);
-              _context32.next = 33;
+            case 30:
+              _context32.prev = 30;
+              _context32.t0 = _context32["catch"](13);
+              _context32.next = 34;
               return this.effectsEmit(BaseSalesHookNames.onPaymentSyncEnd, {
                 ok: false,
                 error: _context32.t0,
@@ -3223,14 +3279,14 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 amountSnapshot: this.store.order.getOrderAmountSnapshot(),
                 orderSnapshot: this.store.order.getOrderSnapshot()
               });
-            case 33:
+            case 34:
               this.scheduleQueuedAutoPaymentSyncFlush(0);
               throw _context32.t0;
-            case 35:
+            case 36:
             case "end":
               return _context32.stop();
           }
-        }, _callee32, this, [[12, 29]]);
+        }, _callee32, this, [[13, 30]]);
       }));
       function syncPaymentsToOrder(_x28) {
         return _syncPaymentsToOrder.apply(this, arguments);
@@ -3410,7 +3466,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addOrderPaymentWithDevicePrefix",
     value: function addOrderPaymentWithDevicePrefix(payment, devicePrefix) {
-      var _this$otherParams30,
+      var _this$otherParams32,
         _paymentRecord$paymen,
         _paymentRecord$create,
         _ref33,
@@ -3426,7 +3482,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
         return this.store.order.getOrderPayments();
       }
       var metadata = paymentRecord.metadata && _typeof(paymentRecord.metadata) === 'object' ? _objectSpread({}, paymentRecord.metadata) : {};
-      var shopWalletPassId = (_this$otherParams30 = this.otherParams) === null || _this$otherParams30 === void 0 ? void 0 : _this$otherParams30.shop_wallet_pass_id;
+      var shopWalletPassId = (_this$otherParams32 = this.otherParams) === null || _this$otherParams32 === void 0 ? void 0 : _this$otherParams32.shop_wallet_pass_id;
       if (shopWalletPassId !== undefined && shopWalletPassId !== null) {
         metadata.shop_wallet_pass_id = shopWalletPassId;
       }
@@ -4325,7 +4381,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "getCashPaymentConfig",
     value: (function () {
       var _getCashPaymentConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee47() {
-        var _this$store$order11, _this$store$order11$g, _this$store$order12, _this$store$order12$g, _this$otherParams31;
+        var _this$store$order11, _this$store$order11$g, _this$store$order12, _this$store$order12$g, _this$otherParams33;
         var paymentMethods, paymentMethod, amountSnapshot, pendingWalletAmount, amountDue, currency, recommendedAmounts;
         return _regeneratorRuntime().wrap(function _callee47$(_context47) {
           while (1) switch (_context47.prev = _context47.next) {
@@ -4351,7 +4407,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               amountSnapshot = (_this$store$order11 = this.store.order) === null || _this$store$order11 === void 0 || (_this$store$order11$g = _this$store$order11.getOrderAmountSnapshot) === null || _this$store$order11$g === void 0 ? void 0 : _this$store$order11$g.call(_this$store$order11);
               pendingWalletAmount = this.getPendingWalletPaymentAmount();
               amountDue = Decimal.max(new Decimal((amountSnapshot === null || amountSnapshot === void 0 ? void 0 : amountSnapshot.amountGap) || 0).minus(pendingWalletAmount), 0).toDecimalPlaces(2).toNumber();
-              currency = ((_this$store$order12 = this.store.order) === null || _this$store$order12 === void 0 || (_this$store$order12$g = _this$store$order12.getTempOrder) === null || _this$store$order12$g === void 0 || (_this$store$order12$g = _this$store$order12$g.call(_this$store$order12)) === null || _this$store$order12$g === void 0 ? void 0 : _this$store$order12$g.currency_code) || ((_this$otherParams31 = this.otherParams) === null || _this$otherParams31 === void 0 ? void 0 : _this$otherParams31.currency) || 'USD';
+              currency = ((_this$store$order12 = this.store.order) === null || _this$store$order12 === void 0 || (_this$store$order12$g = _this$store$order12.getTempOrder) === null || _this$store$order12$g === void 0 || (_this$store$order12$g = _this$store$order12$g.call(_this$store$order12)) === null || _this$store$order12$g === void 0 ? void 0 : _this$store$order12$g.currency_code) || ((_this$otherParams33 = this.otherParams) === null || _this$otherParams33 === void 0 ? void 0 : _this$otherParams33.currency) || 'USD';
               recommendedAmounts = amountDue > 0 ? this.store.payment.cash.getRecommendedAmount(amountDue, currency) : [];
               return _context47.abrupt("return", {
                 available: Boolean(paymentMethod && amountDue > 0),
@@ -4486,7 +4542,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "payCash",
     value: (function () {
       var _payCash = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee49(params) {
-        var _this$store$order$get6, _params$actualPaidAmo, _this$otherParams32, _this$window, _this$window$postMess;
+        var _this$store$order$get6, _params$actualPaidAmo, _this$otherParams34, _this$window, _this$window$postMess;
         var amount, config, paymentMethod, roundingAmount, effectivePaymentAmount, beforePayments, beforePaymentStatus, uniquePaymentNumber, paymentTimestamp, actualPaidAmount, changeAmount, shopWalletPassId, payments, payment, syncResult, committed, walletState, restoredTempOrder;
         return _regeneratorRuntime().wrap(function _callee49$(_context49) {
           while (1) switch (_context49.prev = _context49.next) {
@@ -4535,7 +4591,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               paymentTimestamp = dayjs().format('YYYY-MM-DD HH:mm:ss');
               actualPaidAmount = Number((_params$actualPaidAmo = params.actualPaidAmount) !== null && _params$actualPaidAmo !== void 0 ? _params$actualPaidAmo : amount);
               changeAmount = Number(params.changeAmount || 0);
-              shopWalletPassId = (_this$otherParams32 = this.otherParams) === null || _this$otherParams32 === void 0 ? void 0 : _this$otherParams32.shop_wallet_pass_id;
+              shopWalletPassId = (_this$otherParams34 = this.otherParams) === null || _this$otherParams34 === void 0 ? void 0 : _this$otherParams34.shop_wallet_pass_id;
               if (!(!Number.isFinite(actualPaidAmount) || actualPaidAmount + 0.01 < amount)) {
                 _context49.next = 26;
                 break;
@@ -5470,13 +5526,13 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "getProductList",
     value: function () {
       var _getProductList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee64() {
-        var _this$otherParams33;
+        var _this$otherParams35;
         var menu_list_ids, _this$store$products, res;
         return _regeneratorRuntime().wrap(function _callee64$(_context64) {
           while (1) switch (_context64.prev = _context64.next) {
             case 0:
               // 可以直接通过配置里的 menu 读取
-              menu_list_ids = ((_this$otherParams33 = this.otherParams) === null || _this$otherParams33 === void 0 || (_this$otherParams33 = _this$otherParams33.dineInConfig) === null || _this$otherParams33 === void 0 ? void 0 : _this$otherParams33['menu.associated_menus'].map(function (n) {
+              menu_list_ids = ((_this$otherParams35 = this.otherParams) === null || _this$otherParams35 === void 0 || (_this$otherParams35 = _this$otherParams35.dineInConfig) === null || _this$otherParams35 === void 0 ? void 0 : _this$otherParams35['menu.associated_menus'].map(function (n) {
                 return Number(n.value);
               })) || [];
               _context64.prev = 1;
@@ -5514,7 +5570,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "setOtherParams",
     value: function () {
       var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee65(params) {
-        var _this$otherParams34;
+        var _this$otherParams36;
         var _ref42,
           _ref42$cover,
           cover,
@@ -5528,7 +5584,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               } else {
                 this.otherParams = _objectSpread(_objectSpread({}, this.otherParams), params);
               }
-              this.cacheId = (_this$otherParams34 = this.otherParams) === null || _this$otherParams34 === void 0 ? void 0 : _this$otherParams34.cacheId;
+              this.cacheId = (_this$otherParams36 = this.otherParams) === null || _this$otherParams36 === void 0 ? void 0 : _this$otherParams36.cacheId;
               _context65.next = 5;
               return this.syncOtherParamsToSubModules(params, {
                 cover: cover

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

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 1 | 5 | 2 | 4 | 3 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -345,7 +345,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: "lots_of_space" | "filling_up_fast" | "sold_out";
+        status: "sold_out" | "lots_of_space" | "filling_up_fast";
     }[];
     /**
      * 找到多个资源的公共可用时间段