@pisell/pisellos 2.3.43 → 2.3.45

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

@@ -280,13 +280,6 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
         confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
-    /**
-     * 默认保持 WebPOS 的本地待同步订单模式；需要云端确认后才算成功的渠道可覆盖此策略。
-     * otherParams.checkoutSyncTaskEnabled 优先，便于同一 solution 按入口恢复旧行为。
-     */
-    protected shouldUseCheckoutSyncTask(): boolean;
-    /** 可由特定 solution 为真实 checkout 补充默认收据数据请求。 */
-    protected getDefaultCheckoutSmallTicketDataFlag(): number | undefined;
     printLocalOrderReceipt<T = any>(lookup?: BaseSalesPrintLocalOrderReceiptParams): Promise<T>;
     private getSubmitPaymentStatus;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;

package/dist/solution/BaseSales/index.js

@@ -1312,8 +1312,6 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(core) {
         var _this$otherParams4,
-          _this$appPlugin2,
-          _this$appPlugin2$getA,
           _this9 = this,
           _this$otherParams5;
         var options,
@@ -1337,11 +1335,14 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
 
               // 获取 logger 实例
               this.appPlugin = core.getPlugin('app');
-              if (!this.appPlugin) {
-                // throw new Error('Checkout 解决方案需要 app 插件支持');
+              if (this.appPlugin) {
+                _context11.next = 12;
+                break;
               }
-              app = (_this$appPlugin2 = this.appPlugin) === null || _this$appPlugin2 === void 0 || (_this$appPlugin2$getA = _this$appPlugin2.getApp) === null || _this$appPlugin2$getA === void 0 ? void 0 : _this$appPlugin2$getA.call(_this$appPlugin2);
-              this.logger = app === null || app === void 0 ? void 0 : app.logger;
+              throw new Error('Checkout 解决方案需要 app 插件支持');
+            case 12:
+              app = this.appPlugin.getApp();
+              this.logger = app.logger;
               targetCacheData = this.readSessionCacheData();
               moduleNames = this.getRegisteredModuleNames();
               moduleNames.forEach(function (step) {
@@ -1366,21 +1367,21 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 }));
               });
               if (!(this.store.schedule && !this.isScheduleListLoaded(this.store.schedule))) {
-                _context11.next = 19;
+                _context11.next = 20;
                 break;
               }
-              _context11.next = 19;
+              _context11.next = 20;
               return this.store.schedule.loadAllSchedule();
-            case 19:
+            case 20:
               if (this.store.order && typeof ((_this$otherParams5 = this.otherParams) === null || _this$otherParams5 === void 0 ? void 0 : _this$otherParams5.enableTempOrderPersist) === 'boolean') {
                 this.store.order.setEnableTempOrderPersist(this.otherParams.enableTempOrderPersist);
               }
-              _context11.next = 22;
+              _context11.next = 23;
               return this.getPaymentMethodsAsync();
-            case 22:
+            case 23:
               this.registerServerOrderChangeSync();
               this.core.effects.emit("".concat(this.name, ":onInited"), {});
-            case 24:
+            case 25:
             case "end":
               return _context11.stop();
           }
@@ -2479,12 +2480,15 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 tempOrder: tempOrder
               });
             case 13:
-              return _context23.abrupt("return", {
-                isAvailable: raw.isAvailable,
+              return _context23.abrupt("return", _objectSpread(_objectSpread({
+                isAvailable: raw.isAvailable
+              }, raw.isAccepted !== undefined ? {
+                isAccepted: raw.isAccepted
+              } : {}), {}, {
                 type: raw.type,
                 unavailableReason: raw.unavailableReason,
                 scannedDiscountList: raw.scannedDiscountList
-              });
+              }));
             case 16:
               _context23.prev = 16;
               _context23.t0 = _context23["catch"](0);
@@ -2790,8 +2794,8 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "submitSalesOrder",
     value: (function () {
       var _submitSalesOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(params) {
-        var _params$smallTicketDa, _this$otherParams6, _this$otherParams7, _this$otherParams8, _this$otherParams9;
-        var inferredPaymentStatus, smallTicketDataFlag, submitParams;
+        var _this$otherParams6, _this$otherParams7, _this$otherParams8, _this$otherParams9;
+        var inferredPaymentStatus, submitParams;
         return _regeneratorRuntime().wrap(function _callee27$(_context27) {
           while (1) switch (_context27.prev = _context27.next) {
             case 0:
@@ -2803,7 +2807,6 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
             case 2:
               // 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();
               submitParams = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
                 cacheId: this.cacheId,
                 platform: (_this$otherParams6 = this.otherParams) === null || _this$otherParams6 === void 0 ? void 0 : _this$otherParams6.platform,
@@ -2815,15 +2818,15 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 payments: params.payments
               } : {}), inferredPaymentStatus !== undefined ? {
                 paymentStatus: inferredPaymentStatus
-              } : {}), smallTicketDataFlag !== undefined ? {
-                smallTicketDataFlag: smallTicketDataFlag
+              } : {}), (params === null || params === void 0 ? void 0 : params.smallTicketDataFlag) !== undefined ? {
+                smallTicketDataFlag: params.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
               } : {});
-              return _context27.abrupt("return", this.shouldUseCheckoutSyncTask() ? this.store.order.submitTempOrder(submitParams) : this.store.order.submitTempOrderAsync(submitParams));
-            case 6:
+              return _context27.abrupt("return", this.store.order.submitTempOrder(submitParams));
+            case 5:
             case "end":
               return _context27.stop();
           }
@@ -2872,8 +2875,8 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "submitTempOrderAsync",
     value: function () {
       var _submitTempOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29(params) {
-        var _params$smallTicketDa2, _this$otherParams14, _this$otherParams15, _this$otherParams16, _this$otherParams17;
-        var inferredPaymentStatus, smallTicketDataFlag, submitParams;
+        var _this$otherParams14, _this$otherParams15, _this$otherParams16, _this$otherParams17;
+        var inferredPaymentStatus, submitParams;
         return _regeneratorRuntime().wrap(function _callee29$(_context29) {
           while (1) switch (_context29.prev = _context29.next) {
             case 0:
@@ -2884,27 +2887,25 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               throw new Error('BaseSales 解决方案需要 order 模块支持');
             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();
               submitParams = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
                 cacheId: this.cacheId,
                 platform: (_this$otherParams14 = this.otherParams) === null || _this$otherParams14 === void 0 ? void 0 : _this$otherParams14.platform,
                 businessCode: ((_this$otherParams15 = this.otherParams) === null || _this$otherParams15 === void 0 ? void 0 : _this$otherParams15.businessCode) || ((_this$otherParams16 = this.otherParams) === null || _this$otherParams16 === void 0 ? void 0 : _this$otherParams16.business_code),
                 channel: this.getSubmitOrderSalesChannel(),
-                type: (_this$otherParams17 = this.otherParams) === null || _this$otherParams17 === void 0 ? void 0 : _this$otherParams17.type,
-                request_unique_idempotency_token: this.store.order.generateIdempotencyToken()
+                type: (_this$otherParams17 = this.otherParams) === null || _this$otherParams17 === void 0 ? void 0 : _this$otherParams17.type
               }, (params === null || params === void 0 ? void 0 : params.payments) !== undefined ? {
                 payments: params.payments
               } : {}), inferredPaymentStatus !== undefined ? {
                 paymentStatus: inferredPaymentStatus
-              } : {}), smallTicketDataFlag !== undefined ? {
-                smallTicketDataFlag: smallTicketDataFlag
+              } : {}), (params === null || params === void 0 ? void 0 : params.smallTicketDataFlag) !== undefined ? {
+                smallTicketDataFlag: params.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
               } : {});
               return _context29.abrupt("return", this.store.order.submitTempOrderAsync(submitParams));
-            case 6:
+            case 5:
             case "end":
               return _context29.stop();
           }
@@ -2915,29 +2916,11 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
       }
       return submitTempOrderAsync;
     }()
-    /**
-     * 默认保持 WebPOS 的本地待同步订单模式；需要云端确认后才算成功的渠道可覆盖此策略。
-     * otherParams.checkoutSyncTaskEnabled 优先，便于同一 solution 按入口恢复旧行为。
-     */
-  }, {
-    key: "shouldUseCheckoutSyncTask",
-    value: function shouldUseCheckoutSyncTask() {
-      var _this$otherParams18;
-      var configured = (_this$otherParams18 = this.otherParams) === null || _this$otherParams18 === void 0 ? void 0 : _this$otherParams18.checkoutSyncTaskEnabled;
-      return typeof configured === 'boolean' ? configured : true;
-    }
-
-    /** 可由特定 solution 为真实 checkout 补充默认收据数据请求。 */
-  }, {
-    key: "getDefaultCheckoutSmallTicketDataFlag",
-    value: function getDefaultCheckoutSmallTicketDataFlag() {
-      return undefined;
-    }
   }, {
     key: "printLocalOrderReceipt",
     value: function () {
       var _printLocalOrderReceipt = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30(lookup) {
-        var _this$otherParams19, _this$otherParams20, _this$otherParams21, _this$otherParams22;
+        var _this$otherParams18, _this$otherParams19, _this$otherParams20, _this$otherParams21;
         var hasLookup, lookupPayload, context, payload, response, _this$store$order$app, _this$store$order5, _data;
         return _regeneratorRuntime().wrap(function _callee30$(_context30) {
           while (1) switch (_context30.prev = _context30.next) {
@@ -2955,10 +2938,10 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 external_sale_number: lookup
               };
               context = {
-                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$otherParams18 = this.otherParams) === null || _this$otherParams18 === void 0 ? void 0 : _this$otherParams18.platform,
+                businessCode: ((_this$otherParams19 = this.otherParams) === null || _this$otherParams19 === void 0 ? void 0 : _this$otherParams19.businessCode) || ((_this$otherParams20 = this.otherParams) === null || _this$otherParams20 === void 0 ? void 0 : _this$otherParams20.business_code),
                 channel: this.getSubmitOrderSalesChannel(),
-                type: (_this$otherParams22 = this.otherParams) === null || _this$otherParams22 === void 0 ? void 0 : _this$otherParams22.type
+                type: (_this$otherParams21 = this.otherParams) === null || _this$otherParams21 === void 0 ? void 0 : _this$otherParams21.type
               };
               payload = hasLookup ? _objectSpread(_objectSpread({}, lookupPayload), {}, {
                 lookup_order_from_db: 1,
@@ -3017,7 +3000,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "syncPaymentsToOrder",
     value: function () {
       var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31(params) {
-        var _ref29, _params$businessCode, _this$otherParams23, _this$otherParams24, _params$channel2;
+        var _ref29, _params$businessCode, _this$otherParams22, _this$otherParams23, _params$channel2;
         var businessCode, channel, syncParams, syncState, payments, syncResult, latestPayments, amountSnapshot, orderSnapshot, syncPayload;
         return _regeneratorRuntime().wrap(function _callee31$(_context31) {
           while (1) switch (_context31.prev = _context31.next) {
@@ -3028,11 +3011,9 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error('order 模块未初始化');
             case 2:
-              businessCode = (_ref29 = (_params$businessCode = params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams23 = this.otherParams) === null || _this$otherParams23 === void 0 ? void 0 : _this$otherParams23.businessCode) !== null && _ref29 !== void 0 ? _ref29 : (_this$otherParams24 = this.otherParams) === null || _this$otherParams24 === void 0 ? void 0 : _this$otherParams24.business_code;
+              businessCode = (_ref29 = (_params$businessCode = params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams22 = this.otherParams) === null || _this$otherParams22 === void 0 ? void 0 : _this$otherParams22.businessCode) !== null && _ref29 !== void 0 ? _ref29 : (_this$otherParams23 = this.otherParams) === null || _this$otherParams23 === void 0 ? void 0 : _this$otherParams23.business_code;
               channel = (_params$channel2 = params.channel) !== null && _params$channel2 !== void 0 ? _params$channel2 : this.getSubmitOrderSalesChannel();
-              syncParams = _objectSpread(_objectSpread(_objectSpread({}, params), {}, {
-                checkoutSyncTaskEnabled: this.shouldUseCheckoutSyncTask()
-              }, businessCode !== undefined ? {
+              syncParams = _objectSpread(_objectSpread(_objectSpread({}, params), businessCode !== undefined ? {
                 businessCode: businessCode
               } : {}), channel !== undefined ? {
                 channel: channel
@@ -3287,7 +3268,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addOrderPaymentWithDevicePrefix",
     value: function addOrderPaymentWithDevicePrefix(payment, devicePrefix) {
-      var _this$otherParams25,
+      var _this$otherParams24,
         _paymentRecord$paymen,
         _paymentRecord$create,
         _ref30,
@@ -3303,7 +3284,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$otherParams25 = this.otherParams) === null || _this$otherParams25 === void 0 ? void 0 : _this$otherParams25.shop_wallet_pass_id;
+      var shopWalletPassId = (_this$otherParams24 = this.otherParams) === null || _this$otherParams24 === void 0 ? void 0 : _this$otherParams24.shop_wallet_pass_id;
       if (shopWalletPassId !== undefined && shopWalletPassId !== null) {
         metadata.shop_wallet_pass_id = shopWalletPassId;
       }
@@ -4159,7 +4140,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "getCashPaymentConfig",
     value: (function () {
       var _getCashPaymentConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee45() {
-        var _this$store$order11, _this$store$order11$g, _this$store$order12, _this$store$order12$g, _this$otherParams26;
+        var _this$store$order11, _this$store$order11$g, _this$store$order12, _this$store$order12$g, _this$otherParams25;
         var paymentMethods, paymentMethod, amountSnapshot, pendingWalletAmount, amountDue, currency, recommendedAmounts;
         return _regeneratorRuntime().wrap(function _callee45$(_context45) {
           while (1) switch (_context45.prev = _context45.next) {
@@ -4185,7 +4166,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$otherParams26 = this.otherParams) === null || _this$otherParams26 === void 0 ? void 0 : _this$otherParams26.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$otherParams25 = this.otherParams) === null || _this$otherParams25 === void 0 ? void 0 : _this$otherParams25.currency) || 'USD';
               recommendedAmounts = amountDue > 0 ? this.store.payment.cash.getRecommendedAmount(amountDue, currency) : [];
               return _context45.abrupt("return", {
                 available: Boolean(paymentMethod && amountDue > 0),
@@ -4320,7 +4301,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "payCash",
     value: (function () {
       var _payCash = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee47(params) {
-        var _this$store$order$get6, _params$actualPaidAmo, _this$otherParams27, _this$window, _this$window$postMess;
+        var _this$store$order$get6, _params$actualPaidAmo, _this$otherParams26, _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 _callee47$(_context47) {
           while (1) switch (_context47.prev = _context47.next) {
@@ -4369,7 +4350,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$otherParams27 = this.otherParams) === null || _this$otherParams27 === void 0 ? void 0 : _this$otherParams27.shop_wallet_pass_id;
+              shopWalletPassId = (_this$otherParams26 = this.otherParams) === null || _this$otherParams26 === void 0 ? void 0 : _this$otherParams26.shop_wallet_pass_id;
               if (!(!Number.isFinite(actualPaidAmount) || actualPaidAmount + 0.01 < amount)) {
                 _context47.next = 26;
                 break;
@@ -5272,13 +5253,13 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "getProductList",
     value: function () {
       var _getProductList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee62() {
-        var _this$otherParams28;
+        var _this$otherParams27;
         var menu_list_ids, _this$store$products, res;
         return _regeneratorRuntime().wrap(function _callee62$(_context62) {
           while (1) switch (_context62.prev = _context62.next) {
             case 0:
               // 可以直接通过配置里的 menu 读取
-              menu_list_ids = ((_this$otherParams28 = this.otherParams) === null || _this$otherParams28 === void 0 || (_this$otherParams28 = _this$otherParams28.dineInConfig) === null || _this$otherParams28 === void 0 ? void 0 : _this$otherParams28['menu.associated_menus'].map(function (n) {
+              menu_list_ids = ((_this$otherParams27 = this.otherParams) === null || _this$otherParams27 === void 0 || (_this$otherParams27 = _this$otherParams27.dineInConfig) === null || _this$otherParams27 === void 0 ? void 0 : _this$otherParams27['menu.associated_menus'].map(function (n) {
                 return Number(n.value);
               })) || [];
               _context62.prev = 1;
@@ -5316,7 +5297,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "setOtherParams",
     value: function () {
       var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee63(params) {
-        var _this$otherParams29;
+        var _this$otherParams28;
         var _ref39,
           _ref39$cover,
           cover,
@@ -5330,7 +5311,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               } else {
                 this.otherParams = _objectSpread(_objectSpread({}, this.otherParams), params);
               }
-              this.cacheId = (_this$otherParams29 = this.otherParams) === null || _this$otherParams29 === void 0 ? void 0 : _this$otherParams29.cacheId;
+              this.cacheId = (_this$otherParams28 = this.otherParams) === null || _this$otherParams28 === void 0 ? void 0 : _this$otherParams28.cacheId;
               _context63.next = 5;
               return this.syncOtherParamsToSubModules(params, {
                 cover: cover

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

@@ -439,8 +439,10 @@ export interface BaseSalesAddLogParams extends BaseSalesLogInput {
 /** BaseSales.scanPromotionCode 对外的轻量结果（UI 可用 getDiscountList 或 scannedDiscountList 补 Holder） */
 export interface BaseSalesScanCodeResult {
     isAvailable: boolean;
+    /** 卡券已加入 Promotion；false 时可能是无效、过期或已使用。 */
+    isAccepted?: boolean;
     type?: 'server' | string;
     unavailableReason?: 'time_limit' | string;
-    /** batchSearch 原始结果；isAvailable=false 时 discountList 可能未写入 store，Holder 补全需读此字段 */
+    /** batchSearch 原始结果；Holder 补全等流程可从这里读取原始卡券。 */
     scannedDiscountList?: Discount[];
 }

package/dist/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -104,7 +104,7 @@ function findVariantById(origin, variantId) {
  * 注意：这里不生成 identity，缺省时由 OrderModule 自动补齐。
  */
 export function transformBaseProductToOrderProduct(params) {
-  var _ref10, _ref11, _ref12, _payload$product_id, _ref13, _ref14, _payload$product_vari, _payload$_origin, _payload$_origin2, _ref15, _findVariantById, _ref16, _ref17, _ref18, _ref19, _ref20, _ref21, _ref22, _payload$price, _ref23, _payload$line_total, _payload$_extend, _ref24, _ref25, _payload$product_sku$, _payload$product_sku, _payload$bundle, _payload$quantity, _payload$_extend2, _extend, _extend2, _ref26, _ref27, _origin$base_price, _ref28, _ref29, _payload$line_total2, _payload$_extend3, _payload$_extend4, _extend3, _payload$_extend5, _payload$_extend6, _ref30, _ref31, _payload$tax_fee, _ref32, _ref33, _payload$is_charge_ta;
+  var _ref10, _ref11, _ref12, _payload$product_id, _ref13, _ref14, _payload$product_vari, _payload$_origin, _payload$_origin2, _ref15, _findVariantById, _ref16, _ref17, _ref18, _ref19, _ref20, _matchedVariant$price, _ref21, _ref22, _payload$price, _ref23, _payload$line_total, _payload$_extend, _ref24, _ref25, _payload$product_sku$, _payload$product_sku, _payload$bundle, _payload$quantity, _payload$_extend2, _extend, _extend2, _ref26, _ref27, _origin$base_price, _ref28, _ref29, _payload$line_total2, _payload$_extend3, _payload$_extend4, _extend3, _payload$_extend5, _payload$_extend6, _ref30, _ref31, _payload$tax_fee, _ref32, _ref33, _payload$is_charge_ta;
   var payload = params.payload,
     _params$fallbackProdu = params.fallbackProductId,
     fallbackProductId = _params$fallbackProdu === void 0 ? null : _params$fallbackProdu;
@@ -116,11 +116,14 @@ export function transformBaseProductToOrderProduct(params) {
   var callbackOrigin = payload.origin || ((_payload$_origin = payload._origin) === null || _payload$_origin === void 0 ? void 0 : _payload$_origin.sourceProduct) || ((_payload$_origin2 = payload._origin) === null || _payload$_origin2 === void 0 ? void 0 : _payload$_origin2.sourceItem) || payload._origin || {};
   var origin = _objectSpread(_objectSpread({}, sourceProduct || {}), callbackOrigin || {});
   var matchedVariant = (_ref15 = (_findVariantById = findVariantById(callbackOrigin, productVariantId)) !== null && _findVariantById !== void 0 ? _findVariantById : findVariantById(sourceProduct, productVariantId)) !== null && _ref15 !== void 0 ? _ref15 : findVariantById(origin, productVariantId);
-  var sourceProductPrice = toPriceString((_ref16 = (_ref17 = (_ref18 = (_ref19 = (_ref20 = (_ref21 = (_ref22 = (_payload$price = payload.price) !== null && _payload$price !== void 0 ? _payload$price : payload.selling_price) !== null && _ref22 !== void 0 ? _ref22 : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.price) !== null && _ref21 !== void 0 ? _ref21 : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.base_price) !== null && _ref20 !== void 0 ? _ref20 : origin === null || origin === void 0 ? void 0 : origin.price) !== null && _ref19 !== void 0 ? _ref19 : origin === null || origin === void 0 ? void 0 : origin.base_price) !== null && _ref18 !== void 0 ? _ref18 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price) !== null && _ref17 !== void 0 ? _ref17 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.selling_price) !== null && _ref16 !== void 0 ? _ref16 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.base_price, '0.00');
+  var hasPriceOverride = payload.price_override !== undefined && payload.price_override !== null && payload.price_override !== '';
+  // 手动改价后 payload.price 是分摊后的主商品售价，不能再作为券前 source。
+  // 此时优先从商品/variant 快照读取目录价；售价仍由 line_total - bundle 推导。
+  var catalogSourcePrice = (_ref16 = (_ref17 = (_ref18 = (_ref19 = (_ref20 = (_matchedVariant$price = matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.price) !== null && _matchedVariant$price !== void 0 ? _matchedVariant$price : matchedVariant === null || matchedVariant === void 0 ? void 0 : matchedVariant.base_price) !== null && _ref20 !== void 0 ? _ref20 : origin === null || origin === void 0 ? void 0 : origin.price) !== null && _ref19 !== void 0 ? _ref19 : origin === null || origin === void 0 ? void 0 : origin.base_price) !== null && _ref18 !== void 0 ? _ref18 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price) !== null && _ref17 !== void 0 ? _ref17 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.selling_price) !== null && _ref16 !== void 0 ? _ref16 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.base_price;
+  var sourceProductPrice = toPriceString(hasPriceOverride ? (_ref21 = catalogSourcePrice !== null && catalogSourcePrice !== void 0 ? catalogSourcePrice : payload.price) !== null && _ref21 !== void 0 ? _ref21 : payload.selling_price : (_ref22 = (_payload$price = payload.price) !== null && _payload$price !== void 0 ? _payload$price : payload.selling_price) !== null && _ref22 !== void 0 ? _ref22 : catalogSourcePrice, '0.00');
   var explicitLineTotal = (_ref23 = (_payload$line_total = payload.line_total) !== null && _payload$line_total !== void 0 ? _payload$line_total : payload.total) !== null && _ref23 !== void 0 ? _ref23 : (_payload$_extend = payload._extend) === null || _payload$_extend === void 0 ? void 0 : _payload$_extend.total;
   var hasExplicitLineTotal = Number.isFinite(Number(explicitLineTotal));
   var lineCompositeTotal = toPriceString(explicitLineTotal, sourceProductPrice);
-  var hasPriceOverride = payload.price_override !== undefined && payload.price_override !== null && payload.price_override !== '';
   var productOptionItem = normalizeProductSkuOptions(normalizeOptionItems((_ref24 = (_ref25 = (_payload$product_sku$ = (_payload$product_sku = payload.product_sku) === null || _payload$product_sku === void 0 ? void 0 : _payload$product_sku.option) !== null && _payload$product_sku$ !== void 0 ? _payload$product_sku$ : payload.option) !== null && _ref25 !== void 0 ? _ref25 : payload.options) !== null && _ref24 !== void 0 ? _ref24 : payload.product_option_item));
   var productBundle = normalizeBundleItems((_payload$bundle = payload.bundle) !== null && _payload$bundle !== void 0 ? _payload$bundle : payload.product_bundle, hasPriceOverride);
   // `payload.unique` 是业务侧商品/票务标识，可能在连续加同一商品时重复；

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

@@ -10,7 +10,6 @@ import { ITime } from '../../modules/Date/types';
 import dayjs from 'dayjs';
 import { LoadScheduleAvailableDateParams } from '../../modules/Schedule/types';
 import { IHolder, IFetchHolderAccountsParams } from '../../modules/AccountList/types';
-import { IAppendFormRecordParams } from '../../modules/Holder/types';
 export declare class BookingByStepImpl extends BaseModule implements Module {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -127,20 +126,6 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      * @param params
      */
     fetchHolderAccountsAsync(params: IFetchHolderAccountsParams): Promise<void>;
-    /**
-     * 获取 holder 表单 map
-     */
-    getHolderFormMap(): import("../../modules").HolderFormMap;
-    /**
-     * 登录后或外部触发时，按当前 holderMap 批量刷新所有表单的 records
-     */
-    refreshAllHolderFormRecords(params?: {
-        customer_id?: number;
-    }): Promise<import("../../modules").HolderFormMap>;
-    /**
-     * 添加表单记录
-     */
-    appendFormRecord(params: IAppendFormRecordParams): import("../../modules").IFormRecord;
     setDateRange(dateRange: ITime[]): Promise<void>;
     clearDateRange(): void;
     getDateRange(): Promise<ITime[]>;
@@ -317,7 +302,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     autoSelectAllProductResources(resources_code: string, timeSlots?: TimeSliceItem): {
         errorList: any[];
     };
-    getTimeSlotByAllResources(resources_code: string, split?: number): any[];
+    getTimeSlotByAllResources(resources_code: string): any[];
     getTimeSlotByAllResourcesForDate({ resources_code, startDate, endDate }: {
         resources_code: string;
         startDate: string;