@pisell/pisellos 2.3.43 → 2.3.45

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

@@ -32,7 +32,6 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
         customerId?: number;
         orderId?: number;
     }): Promise<DiscountWithReason>;
-    batchSearchByProductIds(productIds: number[]): Promise<any>;
     filterEnabledDiscountList(discountList: Discount[]): Discount[];
     private checkUsageCreditsLimit;
     filterEnabledDiscountListWithReason(discountList: Discount[]): DiscountWithReason;

package/dist/modules/Discount/index.js

@@ -244,35 +244,6 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
       }
       return batchSearch;
     }()
-  }, {
-    key: "batchSearchByProductIds",
-    value: function () {
-      var _batchSearchByProductIds = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(productIds) {
-        var result;
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
-            case 0:
-              _context6.next = 2;
-              return this.request.get("/machinecode/batch-search", {
-                ids: productIds,
-                translate_flag: 1,
-                tags: ['good_pass', 'product_discount_card'],
-                relation_product: 1
-              });
-            case 2:
-              result = _context6.sent;
-              return _context6.abrupt("return", (result === null || result === void 0 ? void 0 : result.data) || []);
-            case 4:
-            case "end":
-              return _context6.stop();
-          }
-        }, _callee6, this);
-      }));
-      function batchSearchByProductIds(_x8) {
-        return _batchSearchByProductIds.apply(this, arguments);
-      }
-      return batchSearchByProductIds;
-    }()
   }, {
     key: "filterEnabledDiscountList",
     value: function filterEnabledDiscountList(discountList) {
@@ -459,22 +430,22 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "destroy",
     value: function () {
-      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
               this.store.discountList = [];
               this.core.effects.offByModuleDestroy(this.name);
-              _context7.next = 4;
+              _context6.next = 4;
               return this.core.effects.emit("".concat(this.name, ":onDestroy"), {});
             case 4:
               console.log('[Discount] 已销毁');
               _get(_getPrototypeOf(DiscountModule.prototype), "destroy", this).call(this);
             case 6:
             case "end":
-              return _context7.stop();
+              return _context6.stop();
           }
-        }, _callee7, this);
+        }, _callee6, this);
       }));
       function destroy() {
         return _destroy.apply(this, arguments);
@@ -484,18 +455,18 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "clear",
     value: function () {
-      var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
-        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+      var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
               this.store.discountList = [];
               this.store.originalDiscountList = [];
               console.log('[Discount] clear');
             case 3:
             case "end":
-              return _context8.stop();
+              return _context7.stop();
           }
-        }, _callee8, this);
+        }, _callee7, this);
       }));
       function clear() {
         return _clear.apply(this, arguments);

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

@@ -157,7 +157,6 @@ export interface Discount {
     num?: number;
     start_date?: string;
     start_time?: string;
-    discount_rule_uncheck_flag?: boolean;
     usageLimitFailKey?: string | null;
     unified_available_status?: number | undefined | null;
 }

package/dist/modules/OpenData/index.js

@@ -105,12 +105,12 @@ export var OpenDataModule = /*#__PURE__*/function (_BaseModule) {
     key: "fetchOpenData",
     value: function () {
       var _fetchOpenData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
-        var _this$appPlugin, _this$appPlugin$getDa;
+        var _this$appPlugin$getDa, _this$appPlugin;
         var getData, shopId, tenantId, headers, response, data;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              getData = (_this$appPlugin = this.appPlugin) === null || _this$appPlugin === void 0 || (_this$appPlugin$getDa = _this$appPlugin.getData) === null || _this$appPlugin$getDa === void 0 ? void 0 : _this$appPlugin$getDa.call(_this$appPlugin);
+              getData = (_this$appPlugin$getDa = (_this$appPlugin = this.appPlugin).getData) === null || _this$appPlugin$getDa === void 0 ? void 0 : _this$appPlugin$getDa.call(_this$appPlugin);
               shopId = getData === null || getData === void 0 ? void 0 : getData('shop_id');
               if (shopId) {
                 _context2.next = 4;

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

@@ -1,6 +1,6 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { OrderModuleAPI, CommitOrderParams, UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, CancelOrderParams, ChangeBookingStatusParams, CheckoutOrderParams } from './types';
+import { OrderModuleAPI, CommitOrderParams, UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, CheckoutOrderParams, CancelOrderParams, ChangeBookingStatusParams } from './types';
 import { CartItem } from '../Cart/types';
 import { type SubmitPayloadEnhancer } from './utils';
 import type { OrderAmountSnapshot, AddProductBookingInput, OrderIdentitySnapshot, OrderPaymentSource, OrderSnapshot, OrderSyncState, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, SubmitSalesOrderParams, OrderProduct, OrderProductIdentity, OrderSummary, OrderTempOrder, OrderPaymentData, OrderPaymentUpdateOptions, OrderPaymentUpdateResult, SendCustomerPayLinkParams, UpdateTempOrderCustomerInput, OrderCustomerPatch, OrderCustomerView, ReplaceTempOrderOptions, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions } from './types';
@@ -81,6 +81,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private ensureEditDiscountConfigForProductChange;
     scanCode(code: string, customerId?: number): Promise<{
         isAvailable: boolean;
+        isAccepted?: boolean;
         discountList: Discount[];
         type: 'server' | 'clientCalc';
         unavailableReason?: UnavailableReason;
@@ -146,7 +147,6 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     isTempOrderPersistEnabled(): boolean;
     /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化；草稿保存请使用 IndexedDB saveDraft。 */
     persistTempOrder(): void;
-    notifyTempOrderChanged(): void;
     private createDefaultTempOrderInstance;
     private createExternalSaleNumber;
     private ensureExternalSaleNumber;
@@ -496,7 +496,6 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         is_deposit: number;
         relation_products: any[];
         relation_forms: any[];
-        business_code: string | undefined;
     };
     checkBeforeSubmitOrder(params: {
         cartItems: CartItem[];

package/dist/modules/Order/index.js

@@ -10,8 +10,6 @@ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableTo
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
@@ -27,12 +25,14 @@ function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) ===
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { BaseModule } from "../BaseModule";
 import { OrderHooks } from "./types";
-import { composeLinePrice, generateDuration, getAllDiscountList, mergeRelationForms, ensureCartItemOriginHolder, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, createUuidV4, formatDateTime, isTempOrder, normalizeBookingIsAll, normalizeBookingSubType, mapPaymentItemsToOrderPayments, normalizeOrderProductDiscountList, resolveEffectivePerUnitDiscount, ensureProductSku, getProductSkuOptions, normalizeProductSkuOptions, sumOptionUnitPrice, clearTempOrderHolderAssignments, getOrderProductLineUid, indexOrderProductsByUid, calculateOrderProductsDeposit, mergeOrderProductDisplayFields, resolveIsFormSubject } from "./utils";
+import { composeLinePrice, generateDuration, getAllDiscountList, mergeRelationForms, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, createUuidV4, formatDateTime, isTempOrder, normalizeBookingIsAll, normalizeBookingSubType, mapPaymentItemsToOrderPayments, normalizeOrderProductDiscountList, resolveEffectivePerUnitDiscount, ensureProductSku, getProductSkuOptions, normalizeProductSkuOptions, sumOptionUnitPrice, clearTempOrderHolderAssignments, getOrderProductLineUid, indexOrderProductsByUid, calculateOrderProductsDeposit, mergeOrderProductDisplayFields, resolveIsFormSubject } from "./utils";
 import { isNormalProduct } from "../Product/utils";
 import dayjs from 'dayjs';
 import { ensureOrderPaymentNumber, mergeOrderPaymentRecord, resolveOrderPaymentIdentity } from "./payment-utils";
@@ -70,6 +70,22 @@ function isManualProductDiscountProduct(product) {
 }
 var ORDER_PAYMENT_STATUS_PAID = 'paid';
 var ORDER_PAYMENT_STATUS_PENDING = 'payment_pending';
+var CUSTOMER_PROMOTION_DISCOUNT_TAGS = new Set(['good_pass', 'product_discount_card', 'discount_card']);
+function isCustomerPromotionDiscount(discount) {
+  return CUSTOMER_PROMOTION_DISCOUNT_TAGS.has(String((discount === null || discount === void 0 ? void 0 : discount.tag) || (discount === null || discount === void 0 ? void 0 : discount.type) || '').toLowerCase());
+}
+function markScannedDiscounts(discountList, scannedDiscountList) {
+  var scannedIds = new Set(scannedDiscountList.map(function (discount) {
+    return discount === null || discount === void 0 ? void 0 : discount.id;
+  }).filter(function (id) {
+    return id !== undefined && id !== null;
+  }).map(String));
+  return discountList.map(function (discount) {
+    return scannedIds.has(String(discount === null || discount === void 0 ? void 0 : discount.id)) ? _objectSpread(_objectSpread({}, discount), {}, {
+      isScan: true
+    }) : discount;
+  });
+}
 function isVoucherPaymentRecord(payment) {
   return (payment === null || payment === void 0 ? void 0 : payment.voucher_id) !== undefined && Number(payment.voucher_id) !== 0;
 }
@@ -147,6 +163,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               var item = _step2.value;
               var type = (_item$type2 = item === null || item === void 0 ? void 0 : item.type) !== null && _item$type2 !== void 0 ? _item$type2 : item === null || item === void 0 ? void 0 : item.tag;
               if (!type || type === 'product') continue;
+              var isDiscountCard = type === 'discount_card' || type === 'product_discount_card';
               var resourceId = (_ref = (_ref2 = (_item$discount$resour = item === null || item === void 0 || (_item$discount = item.discount) === null || _item$discount === void 0 ? void 0 : _item$discount.resource_id) !== null && _item$discount$resour !== void 0 ? _item$discount$resour : item === null || item === void 0 ? void 0 : item.resource_id) !== null && _ref2 !== void 0 ? _ref2 : item === null || item === void 0 ? void 0 : item.discount_id) !== null && _ref !== void 0 ? _ref : item === null || item === void 0 ? void 0 : item.order_discount_id;
               if (resourceId === undefined || resourceId === null || resourceId === '') continue;
               var id = Number(resourceId);
@@ -169,7 +186,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 var _existed$limited_rela;
                 existed.amount = Number(existed.amount || 0) + amount;
                 existed.used_par_value = String(Number(existed.used_par_value || 0) + amount);
-                existed.balance = String(Number(existed.balance || 0) + amount);
+                if (!isDiscountCard) {
+                  existed.balance = String(Number(existed.balance || 0) + amount);
+                }
                 var productIds = Array.isArray((_existed$limited_rela = existed.limited_relation_product_data) === null || _existed$limited_rela === void 0 ? void 0 : _existed$limited_rela.product_ids) ? existed.limited_relation_product_data.product_ids : [];
                 if ((product === null || product === void 0 ? void 0 : product.product_id) !== undefined && (product === null || product === void 0 ? void 0 : product.product_id) !== null && !productIds.includes(product.product_id)) {
                   existed.limited_relation_product_data = _objectSpread(_objectSpread({}, existed.limited_relation_product_data || {}), {}, {
@@ -201,7 +220,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   filter: 0,
                   exclude_product_ids: []
                 },
-                balance: String((_item$amount3 = item === null || item === void 0 ? void 0 : item.amount) !== null && _item$amount3 !== void 0 ? _item$amount3 : '0'),
+                balance: isDiscountCard ? undefined : String((_item$amount3 = item === null || item === void 0 ? void 0 : item.amount) !== null && _item$amount3 !== void 0 ? _item$amount3 : '0'),
                 format_title: title,
                 product: {
                   id: (_product$product_id = product === null || product === void 0 ? void 0 : product.product_id) !== null && _product$product_id !== void 0 ? _product$product_id : 0,
@@ -290,8 +309,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "initialize",
     value: function () {
       var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(core, options) {
-        var _appPlugin$getApp, _otherParams$rules, _otherParams$order, _otherParams$hooks;
-        var appPlugin, app, otherParams;
+        var _otherParams$rules, _otherParams$order, _otherParams$hooks;
+        var app, otherParams;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -307,12 +326,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 this.store.availableWalletIds = [];
               }
               this.request = this.core.getPlugin('request');
-              appPlugin = this.core.getPlugin('app');
-              if (!appPlugin) {
-                console.error('Order 模块需要 app 插件支持');
+              this.appPlugin = this.core.getPlugin('app');
+              if (this.appPlugin) {
+                _context.next = 9;
+                break;
               }
-              app = appPlugin === null || appPlugin === void 0 || (_appPlugin$getApp = appPlugin.getApp) === null || _appPlugin$getApp === void 0 ? void 0 : _appPlugin$getApp.call(appPlugin);
-              this.logger = app === null || app === void 0 ? void 0 : app.logger;
+              throw new Error('Order 模块需要 app 插件支持');
+            case 9:
+              app = this.appPlugin.getApp();
+              this.logger = app.logger;
               this.window = this.core.getPlugin('window');
               otherParams = options.otherParams || {};
               this.cacheId = otherParams.cacheId;
@@ -323,7 +345,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.otherParams = otherParams;
               this.registerDiscountModules(options);
               this.logInfo('OrderModule initialized successfully');
-            case 20:
+            case 21:
             case "end":
               return _context.stop();
           }
@@ -664,7 +686,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _scanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(code, customerId) {
         var _this$store$discount11, _tempOrder$holder, _this$store$summary;
-        var resultDiscountWithReason, resultDiscountList, unavailableReasonKey, rulesModule, withScanList, currentSelected, tempOrder, holders, _ref13, isAvailable, newDiscountList, unavailableReason, _this$store$discount12;
+        var resultDiscountWithReason, resultDiscountList, unavailableReasonKey, rulesModule, withScanList, currentSelected, tempOrder, holders, _ref13, isAvailable, newDiscountList, evaluatedDiscountList, unavailableReason, shouldRetainForLater, normalizedNewDiscountList, retainedDiscountList, resolvedDiscountList, _this$store$discount12, _this$store$discount13;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
@@ -693,6 +715,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               return _context6.abrupt("return", {
                 type: 'clientCalc',
                 isAvailable: false,
+                isAccepted: false,
                 discountList: this.getDiscountList(),
                 scannedDiscountList: resultDiscountList,
                 unavailableReason: UnavailableReason.Unknown
@@ -705,6 +728,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               return _context6.abrupt("return", {
                 type: 'server',
                 isAvailable: false,
+                isAccepted: false,
                 discountList: this.getDiscountList(),
                 scannedDiscountList: resultDiscountList,
                 unavailableReasonKey: unavailableReasonKey
@@ -732,6 +756,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               return _context6.abrupt("return", {
                 type: 'clientCalc',
                 isAvailable: true,
+                isAccepted: true,
                 discountList: this.getDiscountList(),
                 scannedDiscountList: resultDiscountList
               });
@@ -750,24 +775,47 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }) || {
                 isAvailable: false,
                 discountList: this.getDiscountList()
-              }, isAvailable = _ref13.isAvailable, newDiscountList = _ref13.discountList, unavailableReason = _ref13.unavailableReason;
-              if (!(isAvailable && newDiscountList)) {
-                _context6.next = 26;
+              }, isAvailable = _ref13.isAvailable, newDiscountList = _ref13.discountList, evaluatedDiscountList = _ref13.evaluatedDiscountList, unavailableReason = _ref13.unavailableReason;
+              shouldRetainForLater = !isAvailable && unavailableReason === UnavailableReason.ProductNotApplicable && withScanList.some(isCustomerPromotionDiscount);
+              normalizedNewDiscountList = newDiscountList ? markScannedDiscounts(newDiscountList, withScanList) : undefined;
+              retainedDiscountList = evaluatedDiscountList ? markScannedDiscounts(evaluatedDiscountList, withScanList) : normalizedNewDiscountList;
+              resolvedDiscountList = normalizedNewDiscountList || this.getDiscountList();
+              if (!(isAvailable && normalizedNewDiscountList)) {
+                _context6.next = 34;
                 break;
               }
-              (_this$store$discount12 = this.store.discount) === null || _this$store$discount12 === void 0 || _this$store$discount12.setDiscountList(newDiscountList);
+              _context6.next = 28;
+              return (_this$store$discount12 = this.store.discount) === null || _this$store$discount12 === void 0 ? void 0 : _this$store$discount12.setDiscountList(normalizedNewDiscountList);
+            case 28:
               this.applyDiscount();
-              _context6.next = 26;
+              _context6.next = 31;
               return this.syncScannedDiscountsToOriginalDiscountList(this.getDiscountList());
-            case 26:
+            case 31:
+              resolvedDiscountList = this.getDiscountList();
+              _context6.next = 40;
+              break;
+            case 34:
+              if (!(shouldRetainForLater && retainedDiscountList)) {
+                _context6.next = 40;
+                break;
+              }
+              _context6.next = 37;
+              return (_this$store$discount13 = this.store.discount) === null || _this$store$discount13 === void 0 ? void 0 : _this$store$discount13.setDiscountList(retainedDiscountList);
+            case 37:
+              _context6.next = 39;
+              return this.syncScannedDiscountsToOriginalDiscountList(this.getDiscountList());
+            case 39:
+              resolvedDiscountList = this.getDiscountList();
+            case 40:
               return _context6.abrupt("return", {
                 type: 'clientCalc',
                 isAvailable: isAvailable || false,
-                discountList: newDiscountList || this.getDiscountList(),
+                isAccepted: Boolean(isAvailable || shouldRetainForLater),
+                discountList: resolvedDiscountList,
                 scannedDiscountList: resultDiscountList,
                 unavailableReason: unavailableReason
               });
-            case 27:
+            case 41:
             case "end":
               return _context6.stop();
           }
@@ -781,7 +829,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "applyDiscount",
     value: function applyDiscount(options) {
-      var _this$store$discount13,
+      var _this$store$discount14,
         _this$store$summary2,
         _this2 = this;
       var tempOrder = this.store.tempOrder;
@@ -791,7 +839,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (!tempOrder) return;
       this.syncLinkedBookingHoldersToProducts(tempOrder);
       delete tempOrder.discount_list;
-      var discountList = ((_this$store$discount13 = this.store.discount) === null || _this$store$discount13 === void 0 ? void 0 : _this$store$discount13.getDiscountList()) || [];
+      var discountList = ((_this$store$discount14 = this.store.discount) === null || _this$store$discount14 === void 0 ? void 0 : _this$store$discount14.getDiscountList()) || [];
       var shouldSkipDiscountCalculation = this.shouldSkipDiscountCalculation(tempOrder);
       if (shouldSkipDiscountCalculation) return;
       var rulesModule = this.store.rules;
@@ -823,9 +871,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         }));
       }
       if (result !== null && result !== void 0 && result.discountList) {
-        var _this$store$discount14;
+        var _this$store$discount15;
         OrderModule.populateSavedAmounts(result.productList || tempOrder.products, result.discountList);
-        (_this$store$discount14 = this.store.discount) === null || _this$store$discount14 === void 0 || _this$store$discount14.setDiscountList(result.discountList);
+        (_this$store$discount15 = this.store.discount) === null || _this$store$discount15 === void 0 || _this$store$discount15.setDiscountList(result.discountList);
       }
       this.hasActiveCustomerBoundDiscount = (tempOrder.products || []).some(function (product) {
         return _this2.productHasCustomerBoundDiscount(product);
@@ -1228,16 +1276,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function persistTempOrder() {
       // no-op: OrderModule 的刷新恢复不再依赖 localStorage。
     }
-  }, {
-    key: "notifyTempOrderChanged",
-    value: function notifyTempOrderChanged() {
-      if (!this.store.tempOrder) return;
-      this.store.tempOrder = _objectSpread(_objectSpread({}, this.store.tempOrder), {}, {
-        products: _toConsumableArray(this.store.tempOrder.products),
-        bookings: this.store.tempOrder.bookings ? _toConsumableArray(this.store.tempOrder.bookings) : []
-      });
-      this.persistTempOrder();
-    }
 
     // ─── TempOrder: 创建 & 获取 ───
   }, {
@@ -2289,7 +2327,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "restoreOrder",
     value: function restoreOrder() {
-      var _this$store$discount15, _this$store$discount16;
+      var _this$store$discount16, _this$store$discount17;
       this.logInfo('restoreOrder start', {});
       var freshTempOrder = this.createDefaultTempOrderInstance();
       this.ensureExternalSaleNumber(freshTempOrder);
@@ -2297,8 +2335,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       this.store.summary = createEmptySummary();
       this.store.lastOrderInfo = undefined;
       this.store.syncState = undefined;
-      void ((_this$store$discount15 = this.store.discount) === null || _this$store$discount15 === void 0 ? void 0 : _this$store$discount15.setOriginalDiscountList([]));
-      void ((_this$store$discount16 = this.store.discount) === null || _this$store$discount16 === void 0 ? void 0 : _this$store$discount16.setDiscountList([]));
+      void ((_this$store$discount16 = this.store.discount) === null || _this$store$discount16 === void 0 ? void 0 : _this$store$discount16.setOriginalDiscountList([]));
+      void ((_this$store$discount17 = this.store.discount) === null || _this$store$discount17 === void 0 ? void 0 : _this$store$discount17.setDiscountList([]));
       this.persistTempOrder();
       return freshTempOrder;
     }
@@ -3121,11 +3159,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "shouldSkipDiscountCalculation",
     value: function shouldSkipDiscountCalculation(tempOrder) {
-      var _this$store$discount17,
-        _this$store$discount18,
+      var _this$store$discount18,
+        _this$store$discount19,
         _this20 = this;
       if (this.hasActiveCustomerBoundDiscount) return false;
-      var discountList = ((_this$store$discount17 = this.store.discount) === null || _this$store$discount17 === void 0 || (_this$store$discount18 = _this$store$discount17.getDiscountList) === null || _this$store$discount18 === void 0 ? void 0 : _this$store$discount18.call(_this$store$discount17)) || [];
+      var discountList = ((_this$store$discount18 = this.store.discount) === null || _this$store$discount18 === void 0 || (_this$store$discount19 = _this$store$discount18.getDiscountList) === null || _this$store$discount19 === void 0 ? void 0 : _this$store$discount19.call(_this$store$discount18)) || [];
       if (discountList.length > 0) return false;
       return !(tempOrder.products || []).some(function (product) {
         return _this20.productHasCustomerBoundDiscount(product);
@@ -5242,7 +5280,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36(params) {
         var _this31 = this,
           _params$confirmPendin;
-        var tempOrder, needsPaymentNumber, devicePrefix, mappedPayments, shouldConfirmPendingVoucherPayments, effectivePayments, completion, orderPaidPaymentTotal, paymentStatus, paymentSyncIdempotencyToken, submitParams, submitResult;
+        var tempOrder, needsPaymentNumber, devicePrefix, mappedPayments, shouldConfirmPendingVoucherPayments, effectivePayments, completion, orderPaidPaymentTotal, paymentStatus, paymentSyncIdempotencyToken, submitResult;
         return _regeneratorRuntime().wrap(function _callee36$(_context39) {
           while (1) switch (_context39.prev = _context39.next) {
             case 0:
@@ -5295,7 +5333,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 25:
               this.store.syncState = 'submitting';
               paymentSyncIdempotencyToken = this.buildPaymentSyncIdempotencyToken(tempOrder, effectivePayments);
-              submitParams = {
+              _context39.next = 29;
+              return this.submitTempOrder({
                 payments: effectivePayments,
                 paymentStatus: paymentStatus,
                 smallTicketDataFlag: params.smallTicketDataFlag,
@@ -5308,28 +5347,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   });
                   return nextPayload;
                 }
-              };
-              if (!(params.checkoutSyncTaskEnabled === false)) {
-                _context39.next = 34;
-                break;
-              }
-              _context39.next = 31;
-              return this.submitTempOrderAsync(submitParams);
-            case 31:
-              _context39.t1 = _context39.sent;
-              _context39.next = 37;
-              break;
-            case 34:
-              _context39.next = 36;
-              return this.submitTempOrder(submitParams);
-            case 36:
-              _context39.t1 = _context39.sent;
-            case 37:
-              submitResult = _context39.t1;
+              });
+            case 29:
+              submitResult = _context39.sent;
               return _context39.abrupt("return", _objectSpread(_objectSpread({}, completion), {}, {
                 submitResult: submitResult
               }));
-            case 39:
+            case 31:
             case "end":
               return _context39.stop();
           }
@@ -5343,7 +5367,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "createOrder",
     value: function createOrder(params) {
-      var _this32 = this;
       var order = _objectSpread({
         type: (params === null || params === void 0 ? void 0 : params.type) || 'appointment_booking',
         // 要从外面拿，virtual
@@ -5355,13 +5378,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         schedule_date: '',
         is_deposit: 0,
         relation_products: [],
-        relation_forms: [],
-        business_code: params === null || params === void 0 ? void 0 : params.business_code
+        relation_forms: []
       }, (params === null || params === void 0 ? void 0 : params.extraData) || {});
       var is_deposit = 0; // 是否存在定金，0 不存在，1 存在
       if (params.cartItems.length > 0) {
         params.cartItems.forEach(function (item) {
-          var _params$extraData;
           if (!item._origin.duration) {
             var _generateDuration = generateDuration(item),
               duration = _generateDuration.duration,
@@ -5373,11 +5394,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           var discountList = getAllDiscountList(item);
           item._origin.product.discount_list = discountList;
 
-          // 为预约补齐 holder 信息
-          if (params !== null && params !== void 0 && (_params$extraData = params.extraData) !== null && _params$extraData !== void 0 && _params$extraData.is_add_holder_info) {
-            ensureCartItemOriginHolder(item, _this32.window);
-          }
-
           // 购物车是否为普通商品
           if (isNormalProduct(item._origin)) {
             var _order$relation_forms;
@@ -5821,8 +5837,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "hydrateTempOrderFromRecord",
     value: (function () {
       var _hydrateTempOrderFromRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee44(record, options) {
-        var _this$store$discount19;
-        var sourceRaw, identityReadySource, normalizedCollections, raw, hasIdentityChanges, identityLogMetadata, hasIdentityWarnings, nextTempOrder, sourceLastOrderInfo, isDraftOrder, syntheticIdentityOptions, rawSummary, summarySurcharges, hadSyntheticDraftOrderId, hydratedEditDiscounts, currentDiscounts, currentScanDiscounts, hydratedDiscountIds, retainedScanDiscounts, nextDiscounts, shouldSkipEmptyDiscountSync, _this$store$discount20, _this$store$discount21;
+        var _this$store$discount20;
+        var sourceRaw, identityReadySource, normalizedCollections, raw, hasIdentityChanges, identityLogMetadata, hasIdentityWarnings, nextTempOrder, sourceLastOrderInfo, isDraftOrder, syntheticIdentityOptions, rawSummary, summarySurcharges, hadSyntheticDraftOrderId, hydratedEditDiscounts, currentDiscounts, currentScanDiscounts, hydratedDiscountIds, retainedScanDiscounts, nextDiscounts, shouldSkipEmptyDiscountSync, _this$store$discount21, _this$store$discount22;
         return _regeneratorRuntime().wrap(function _callee44$(_context47) {
           while (1) switch (_context47.prev = _context47.next) {
             case 0:
@@ -5881,7 +5897,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 this.store.syncState = 'local';
               }
               hydratedEditDiscounts = this.collectHydratedEditDiscounts(nextTempOrder.products);
-              currentDiscounts = typeof ((_this$store$discount19 = this.store.discount) === null || _this$store$discount19 === void 0 ? void 0 : _this$store$discount19.getDiscountList) === 'function' ? this.store.discount.getDiscountList() || [] : [];
+              currentDiscounts = typeof ((_this$store$discount20 = this.store.discount) === null || _this$store$discount20 === void 0 ? void 0 : _this$store$discount20.getDiscountList) === 'function' ? this.store.discount.getDiscountList() || [] : [];
               currentScanDiscounts = currentDiscounts.filter(function (discount) {
                 return discount === null || discount === void 0 ? void 0 : discount.isScan;
               });
@@ -5899,10 +5915,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               OrderModule.populateSavedAmounts(nextTempOrder.products, nextDiscounts);
               _context47.next = 29;
-              return (_this$store$discount20 = this.store.discount) === null || _this$store$discount20 === void 0 ? void 0 : _this$store$discount20.setOriginalDiscountList(nextDiscounts);
+              return (_this$store$discount21 = this.store.discount) === null || _this$store$discount21 === void 0 ? void 0 : _this$store$discount21.setOriginalDiscountList(nextDiscounts);
             case 29:
               _context47.next = 31;
-              return (_this$store$discount21 = this.store.discount) === null || _this$store$discount21 === void 0 ? void 0 : _this$store$discount21.setDiscountList(nextDiscounts);
+              return (_this$store$discount22 = this.store.discount) === null || _this$store$discount22 === void 0 ? void 0 : _this$store$discount22.setDiscountList(nextDiscounts);
             case 31:
               if (!(options !== null && options !== void 0 && options.recalcOnHydrate)) {
                 _context47.next = 34;
@@ -6035,7 +6051,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeTempOrderForRuntime",
     value: function normalizeTempOrderForRuntime(raw, options) {
-      var _this33 = this;
+      var _this32 = this;
       var runtimeRaw = this.withoutSyntheticDraftOrderIdForRuntime(raw);
       var nextTempOrder = _objectSpread(_objectSpread({}, this.createDefaultTempOrderInstance()), runtimeRaw || {});
       // ES 列表详情使用 id 表示订单主键；OS 详情态统一依赖 order_id 驱动操作按钮。
@@ -6059,12 +6075,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       nextTempOrder.holder = raw.holder && _typeof(raw.holder) === 'object' ? _objectSpread({}, raw.holder) : null;
       var rawProducts = Array.isArray(raw.products) ? raw.products : [];
       nextTempOrder.products = rawProducts.length > 0 ? rawProducts.map(function (p) {
-        return _this33.normalizeHydratedOrderProduct(p, {
+        return _this32.normalizeHydratedOrderProduct(p, {
           makeEditMark: options === null || options === void 0 ? void 0 : options.makeEditMark
         });
       }) : [];
       nextTempOrder.bookings = Array.isArray(raw.bookings) ? raw.bookings.map(function (b) {
-        var booking = _this33.normalizeHydratedBookingHolder(b || {});
+        var booking = _this32.normalizeHydratedBookingHolder(b || {});
         return _objectSpread(_objectSpread({}, booking), {}, {
           is_all: normalizeBookingIsAll(booking),
           sub_type: normalizeBookingSubType(booking)
@@ -6251,7 +6267,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeHydratedOrderProduct",
     value: function normalizeHydratedOrderProduct(product, options) {
-      var _this34 = this;
+      var _this33 = this;
       var row = _objectSpread({}, product || {});
       if (row.num === undefined && row.product_quantity !== undefined) {
         row.num = row.product_quantity;
@@ -6259,7 +6275,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var productSku = ensureProductSku(row);
       row.product_sku = _objectSpread(_objectSpread({}, productSku), {}, {
         option: normalizeProductSkuOptions(productSku.option.map(function (optionItem) {
-          return _this34.normalizeHydratedProductOptionItem(optionItem || {});
+          return _this33.normalizeHydratedProductOptionItem(optionItem || {});
         }))
       });
       delete row["product_".concat('option', "_item")];