@pisell/pisellos 2.2.262 → 2.2.264

package/lib/solution/BaseSales/index.js

@@ -40,7 +40,6 @@ var import_decimal = __toESM(require("decimal.js"));
 var import_lodash_es = require("lodash-es");
 var import_types2 = require("../BookingByStep/types");
 var import_utils = require("../../modules/Order/utils");
-var import_orderCollectionIdentity = require("../../modules/Order/utils/orderCollectionIdentity");
 var import_dayjs = __toESM(require("dayjs"));
 __reExport(BaseSales_exports, require("./types"), module.exports);
 var import_Quotation = require("../../modules/Quotation");
@@ -77,18 +76,11 @@ function isBaseSalesHistoricalDiscountEntry(discount) {
     (discount == null ? void 0 : discount.isEditMode) || (discount == null ? void 0 : discount.isDisabled) || (discount == null ? void 0 : discount.order_discount_id) != null
   );
 }
-var BASE_SALES_PERSISTENT_ID_FIELD_BY_KIND = {
-  product: "order_detail_id",
-  booking: "schedule_event_id",
-  payment: "order_payment_id"
-};
-function getBaseSalesOrderCollectionKind(key) {
-  if (key === "products")
-    return "product";
-  if (key === "bookings")
-    return "booking";
+function getBaseSalesUniqueArrayMetadataKey(key) {
+  if (key === "products" || key === "bookings")
+    return "unique_identification_number";
   if (key === "payments" || key === "payment")
-    return "payment";
+    return "unique_payment_number";
   return null;
 }
 function isSameBaseSalesOrderRecord(left, right) {
@@ -103,140 +95,47 @@ function isSameBaseSalesOrderRecord(left, right) {
     (value) => value !== void 0 && value !== null && value !== "" && leftIdentities.has(String(value))
   );
 }
-function isBaseSalesBlankValue(value) {
-  return value === void 0 || value === null || value === "";
-}
-function mergeBaseSalesProductSnapshotFields(currentItem, loadedItem) {
-  var _a, _b, _c;
-  const mergedItem = (0, import_lodash_es.cloneDeep)(loadedItem);
-  if (isBaseSalesBlankValue(mergedItem.product_cover) && !isBaseSalesBlankValue(currentItem == null ? void 0 : currentItem.product_cover)) {
-    mergedItem.product_cover = currentItem.product_cover;
-  }
-  const currentHolderConfig = (_a = currentItem == null ? void 0 : currentItem.metadata) == null ? void 0 : _a.holder_config;
-  if ((((_b = mergedItem.metadata) == null ? void 0 : _b.holder_config) === void 0 || ((_c = mergedItem.metadata) == null ? void 0 : _c.holder_config) === null) && currentHolderConfig !== void 0 && currentHolderConfig !== null) {
-    mergedItem.metadata = {
-      ...mergedItem.metadata || {},
-      holder_config: currentHolderConfig
-    };
-  }
-  return mergedItem;
+function getBaseSalesMetadataUid(item, metadataKey) {
+  var _a;
+  const uid = ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a[metadataKey]) ?? (item == null ? void 0 : item[metadataKey]);
+  if (uid === void 0 || uid === null || uid === "")
+    return null;
+  return String(uid);
 }
-function mergeBaseSalesCollectionItem(kind, currentItem, incomingItem, uidRemaps) {
-  const currentReferenceUid = (0, import_orderCollectionIdentity.getOrderCollectionReferenceUid)(kind, currentItem);
-  const incomingReferenceUid = (0, import_orderCollectionIdentity.getOrderCollectionReferenceUid)(kind, incomingItem);
-  const identityMergedItem = (0, import_orderCollectionIdentity.mergeOrderCollectionItems)(
-    kind,
-    currentItem,
-    incomingItem
-  );
-  const mergedUid = (0, import_orderCollectionIdentity.getOrderCollectionUid)(kind, identityMergedItem);
-  if (mergedUid) {
-    for (const from of /* @__PURE__ */ new Set([currentReferenceUid, incomingReferenceUid])) {
-      if (!from || from === mergedUid)
-        continue;
-      uidRemaps.push({
-        kind,
-        from,
-        to: mergedUid,
-        persistentId: (0, import_orderCollectionIdentity.getOrderCollectionPersistentId)(kind, incomingItem) || (0, import_orderCollectionIdentity.getOrderCollectionPersistentId)(kind, currentItem)
-      });
+function mergeBaseSalesUniqueArray(currentValue, loadedValue, metadataKey) {
+  const result = [];
+  const indexByUid = /* @__PURE__ */ new Map();
+  const appendOrReplaceByUid = (item) => {
+    const clonedItem = (0, import_lodash_es.cloneDeep)(item);
+    const uid = getBaseSalesMetadataUid(clonedItem, metadataKey);
+    if (!uid) {
+      result.push(clonedItem);
+      return;
     }
-  }
-  const mergedItem = mergedUid ? (0, import_orderCollectionIdentity.setOrderCollectionUid)(kind, incomingItem, mergedUid) : (0, import_lodash_es.cloneDeep)(incomingItem);
-  const persistentIdField = BASE_SALES_PERSISTENT_ID_FIELD_BY_KIND[kind];
-  if (isBaseSalesBlankValue(mergedItem[persistentIdField]) && !isBaseSalesBlankValue(identityMergedItem[persistentIdField])) {
-    mergedItem[persistentIdField] = identityMergedItem[persistentIdField];
-  }
-  return kind === "product" ? mergeBaseSalesProductSnapshotFields(currentItem, mergedItem) : mergedItem;
-}
-function mergeBaseSalesOrderCollection(kind, currentValue, incomingValue, strategy, uidRemaps) {
-  const currentItems = (0, import_orderCollectionIdentity.normalizeOrderCollection)(kind, currentValue, {
-    ensureUid: false
-  }).items;
-  const incomingItems = (0, import_orderCollectionIdentity.normalizeOrderCollection)(kind, incomingValue, {
-    ensureUid: false
-  }).items;
-  if (strategy === "authoritative-incoming") {
-    const result2 = (0, import_lodash_es.cloneDeep)(incomingItems);
-    currentItems.forEach((currentItem) => {
-      const incomingIndex = result2.findIndex(
-        (incomingItem) => (0, import_orderCollectionIdentity.isSameOrderCollectionItem)(kind, currentItem, incomingItem)
-      );
-      if (incomingIndex !== -1) {
-        result2[incomingIndex] = mergeBaseSalesCollectionItem(
-          kind,
-          currentItem,
-          result2[incomingIndex],
-          uidRemaps
-        );
-        return;
-      }
-      if (!(0, import_orderCollectionIdentity.getOrderCollectionPersistentId)(kind, currentItem)) {
-        result2.push((0, import_lodash_es.cloneDeep)(currentItem));
-      }
-    });
-    return result2;
-  }
-  const result = (0, import_lodash_es.cloneDeep)(currentItems);
-  incomingItems.forEach((incomingItem) => {
-    const currentIndex = result.findIndex(
-      (currentItem) => (0, import_orderCollectionIdentity.isSameOrderCollectionItem)(kind, currentItem, incomingItem)
-    );
-    if (currentIndex !== -1) {
-      result[currentIndex] = mergeBaseSalesCollectionItem(
-        kind,
-        result[currentIndex],
-        incomingItem,
-        uidRemaps
-      );
+    const existingIndex = indexByUid.get(uid);
+    if (existingIndex !== void 0) {
+      result[existingIndex] = clonedItem;
       return;
     }
-    result.push((0, import_lodash_es.cloneDeep)(incomingItem));
-  });
+    indexByUid.set(uid, result.length);
+    result.push(clonedItem);
+  };
+  currentValue.forEach(appendOrReplaceByUid);
+  loadedValue.forEach(appendOrReplaceByUid);
   return result;
 }
-function normalizeBaseSalesRecordCollections(sourceRecord, options) {
-  const normalizedRecord = (0, import_orderCollectionIdentity.normalizeOrderCollections)(
-    (0, import_lodash_es.cloneDeep)(sourceRecord || {}),
-    options
-  ).order;
-  if (Array.isArray(normalizedRecord.payment)) {
-    normalizedRecord.payment = (0, import_orderCollectionIdentity.normalizeOrderCollection)(
-      "payment",
-      normalizedRecord.payment,
-      options
-    ).items;
-  }
-  return normalizedRecord;
-}
-function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord, strategy) {
-  const normalizedLoadedRecord = normalizeBaseSalesRecordCollections(
-    loadedRecord || {},
-    { ensureUid: false }
-  );
-  if (!currentTempOrder) {
-    return normalizeBaseSalesRecordCollections(normalizedLoadedRecord);
-  }
-  const normalizedCurrentTempOrder = normalizeBaseSalesRecordCollections(
-    currentTempOrder,
-    { ensureUid: false }
-  );
-  const uidRemaps = [];
+function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord) {
+  if (!currentTempOrder)
+    return loadedRecord;
   const mergedRecord = (0, import_lodash_es.mergeWith)(
-    normalizedCurrentTempOrder,
-    normalizedLoadedRecord,
+    (0, import_lodash_es.cloneDeep)(currentTempOrder),
+    (0, import_lodash_es.cloneDeep)(loadedRecord || {}),
     (currentValue, loadedValue, key) => {
-      const collectionKind = getBaseSalesOrderCollectionKind(key);
-      if (collectionKind && Array.isArray(loadedValue)) {
-        return mergeBaseSalesOrderCollection(
-          collectionKind,
-          Array.isArray(currentValue) ? currentValue : [],
-          loadedValue,
-          strategy,
-          uidRemaps
-        );
-      }
       if (Array.isArray(currentValue) && Array.isArray(loadedValue)) {
+        const metadataKey = getBaseSalesUniqueArrayMetadataKey(key);
+        if (metadataKey) {
+          return mergeBaseSalesUniqueArray(currentValue, loadedValue, metadataKey);
+        }
         return [
           ...(0, import_lodash_es.cloneDeep)(currentValue),
           ...(0, import_lodash_es.cloneDeep)(loadedValue)
@@ -251,9 +150,7 @@ function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord, str
     }
   );
   delete mergedRecord.request_unique_idempotency_token;
-  return normalizeBaseSalesRecordCollections(
-    (0, import_orderCollectionIdentity.applyOrderCollectionUidRemaps)(mergedRecord, uidRemaps)
-  );
+  return mergedRecord;
 }
 var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
@@ -275,13 +172,9 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     this.queuedAutoPaymentSync = false;
     this.autoPaymentSyncFlushing = false;
     this.autoPaymentSyncTimer = null;
-    this.salesDetailLoadInFlightCount = 0;
-    this.salesDetailLoadSequence = 0;
-    this.salesDetailHydrateQueue = Promise.resolve();
+    this.salesDetailLoadInFlight = false;
     this.serverOrderChangeUnsubscribe = null;
     this.serverOrderChangeHydrateInFlight = null;
-    this.queuedServerOrderChanges = [];
-    this.serverOrderChangeSyncEnabled = false;
   }
   /**
    * 子类可覆盖此方法以追加/收敛要注册的子模块。
@@ -355,59 +248,19 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     ].filter(Boolean);
     return currentRecords.some((record) => isSameBaseSalesOrderRecord(record, order));
   }
-  setServerOrderChangeSyncEnabled(enabled) {
-    this.serverOrderChangeSyncEnabled = enabled;
-    if (!enabled)
-      this.queuedServerOrderChanges = [];
-  }
-  queueLatestServerOrderChange(order) {
-    const snapshot = (0, import_lodash_es.cloneDeep)(order);
-    const existingIndex = this.queuedServerOrderChanges.findIndex(
-      (queued) => isSameBaseSalesOrderRecord(queued, snapshot)
-    );
-    if (existingIndex >= 0) {
-      this.queuedServerOrderChanges[existingIndex] = snapshot;
-      return;
-    }
-    this.queuedServerOrderChanges.push(snapshot);
-  }
-  async drainQueuedServerOrderChanges() {
-    if (!this.serverOrderChangeSyncEnabled || this.salesDetailLoadInFlightCount > 0 || this.serverOrderChangeHydrateInFlight || this.queuedServerOrderChanges.length === 0)
-      return;
-    const changedOrders = this.queuedServerOrderChanges;
-    this.queuedServerOrderChanges = [];
-    await this.syncCurrentSalesDetailFromServerOrderChange({ changedOrders });
-  }
   async syncCurrentSalesDetailFromServerOrderChange(payload) {
     const changedOrders = Array.isArray(payload) ? payload : Array.isArray(payload == null ? void 0 : payload.changedOrders) ? payload.changedOrders : (payload == null ? void 0 : payload.data) && typeof payload.data === "object" ? [payload.data] : [];
-    if (!this.serverOrderChangeSyncEnabled)
+    if (this.salesDetailLoadInFlight || this.serverOrderChangeHydrateInFlight)
       return;
-    if (this.salesDetailLoadInFlightCount > 0) {
-      changedOrders.forEach(
-        (order) => this.queueLatestServerOrderChange(order)
-      );
-      return;
-    }
     const changedOrder = changedOrders.find(
       (order) => this.isCurrentSalesOrderRecord(order)
     );
     if (!changedOrder)
       return;
-    if (this.serverOrderChangeHydrateInFlight) {
-      this.queueLatestServerOrderChange(changedOrder);
-      return;
-    }
     if (!this.store.order)
       return;
     this.serverOrderChangeHydrateInFlight = (async () => {
-      var _a, _b;
-      const currentTempOrder = (_b = (_a = this.store.order).getTempOrder) == null ? void 0 : _b.call(_a);
-      const record = mergeSalesDetailRecordWithTempOrder(
-        currentTempOrder,
-        changedOrder,
-        "authoritative-incoming"
-      );
-      const sales = await this.store.order.hydrateTempOrderFromRecord(record, {
+      const sales = await this.store.order.hydrateTempOrderFromRecord(changedOrder, {
         recalcOnHydrate: false
       });
       this.currentSalesDetail = sales;
@@ -417,7 +270,6 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       await this.serverOrderChangeHydrateInFlight;
     } finally {
       this.serverOrderChangeHydrateInFlight = null;
-      await this.drainQueuedServerOrderChanges();
     }
   }
   registerServerOrderChangeSync() {
@@ -427,42 +279,13 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     if (!effects || typeof effects.on !== "function")
       return;
     this.serverOrderChangeUnsubscribe = effects.on(SERVER_ORDER_CHANGED_EVENT, (payload) => {
-      return this.syncCurrentSalesDetailFromServerOrderChange(payload).catch((error) => {
+      void this.syncCurrentSalesDetailFromServerOrderChange(payload).catch((error) => {
         this.logError("sync sales detail from server order change failed", {
           error: error instanceof Error ? error.message : String(error)
         });
       });
     });
   }
-  async hydrateLatestLoadedSalesDetail(record, loadSequence) {
-    let hydratedSales = null;
-    let skippedBeforeHydrate = false;
-    const hydrateTask = async () => {
-      if (loadSequence !== this.salesDetailLoadSequence) {
-        skippedBeforeHydrate = true;
-        return;
-      }
-      if (!this.store.order)
-        throw new Error("order 模块未初始化");
-      const sales = await this.store.order.hydrateTempOrderFromRecord(record, {
-        recalcOnHydrate: false
-      });
-      hydratedSales = sales;
-      if (loadSequence !== this.salesDetailLoadSequence)
-        return;
-      this.currentSalesDetail = sales;
-      await this.core.effects.emit(`${this.name}:onSalesOrderLoaded`, { sales });
-    };
-    const queuedTask = this.salesDetailHydrateQueue.then(hydrateTask, hydrateTask);
-    this.salesDetailHydrateQueue = queuedTask.then(
-      () => void 0,
-      () => void 0
-    );
-    await queuedTask;
-    if (skippedBeforeHydrate)
-      return record;
-    return hydratedSales || this.currentSalesDetail || record;
-  }
   hydrateOrderPaymentNames(payments) {
     if (!payments.length)
       return [];
@@ -897,8 +720,6 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       }
     });
     this.currentSalesDetail = null;
-    this.queuedServerOrderChanges = [];
-    this.salesDetailLoadSequence += 1;
     await this.core.effects.emit(`${this.name}:onDestroy`, {});
     super.destroy();
   }
@@ -912,8 +733,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   async loadSalesDetail(orderIdOrParams) {
     if (!this.store.order)
       throw new Error("order 模块未初始化");
-    const loadSequence = ++this.salesDetailLoadSequence;
-    this.salesDetailLoadInFlightCount += 1;
+    this.salesDetailLoadInFlight = true;
     try {
       const params = typeof orderIdOrParams === "object" ? orderIdOrParams : { orderId: orderIdOrParams };
       const externalSaleNumber = params.externalSaleNumber || params.external_sale_number;
@@ -932,26 +752,15 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       }
       const remoteRecord = preloadedSalesDetail ?? loadedRecord.data;
       const currentTempOrder = params.merge ? this.store.order.getTempOrder() : null;
-      const record = params.merge ? mergeSalesDetailRecordWithTempOrder(
-        currentTempOrder,
-        remoteRecord,
-        "preserve-local"
-      ) : remoteRecord;
-      return await this.hydrateLatestLoadedSalesDetail(record, loadSequence);
+      const record = params.merge ? mergeSalesDetailRecordWithTempOrder(currentTempOrder, remoteRecord) : remoteRecord;
+      const sales = await this.store.order.hydrateTempOrderFromRecord(record, {
+        recalcOnHydrate: false
+      });
+      this.currentSalesDetail = sales;
+      await this.core.effects.emit(`${this.name}:onSalesOrderLoaded`, { sales });
+      return sales;
     } finally {
-      this.salesDetailLoadInFlightCount = Math.max(
-        0,
-        this.salesDetailLoadInFlightCount - 1
-      );
-      if (this.salesDetailLoadInFlightCount === 0) {
-        try {
-          await this.drainQueuedServerOrderChanges();
-        } catch (error) {
-          this.logError("drain queued server order changes failed", {
-            error: error instanceof Error ? error.message : String(error)
-          });
-        }
-      }
+      this.salesDetailLoadInFlight = false;
     }
   }
   /** 获取当前已加载的销售详情（只读快照）。未加载过则返回 null。 */
@@ -1285,7 +1094,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     });
   }
   async loadDiscountConfig(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s;
     if (!this.store.order)
       throw new Error("order 模块未初始化");
     const tempOrder = this.store.order.ensureTempOrder();
@@ -1323,8 +1132,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     if (hasManualDiscountSelection && currentDiscountList.length) {
       return {
         productList: tempOrder.products || [],
-        discountList: currentDiscountList,
-        availableWalletIds: this.getAvailableWalletIds()
+        discountList: currentDiscountList
       };
     }
     let nextDiscountList = this.mergeHistoricalDiscountList(
@@ -1353,17 +1161,17 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       });
       return {
         productList: tempOrder.products || [],
-        discountList: nextDiscountList,
-        availableWalletIds: this.getAvailableWalletIds()
+        discountList: nextDiscountList
       };
     }
     if (rulesModule) {
-      const orderTotalAmount = Number(((_l = orderStore.summary) == null ? void 0 : _l.total_amount) || 0);
+      const holders = ((_l = tempOrder.holder) == null ? void 0 : _l.form_record) || [];
+      const orderTotalAmount = Number(((_m = orderStore.summary) == null ? void 0 : _m.total_amount) || 0);
       console.log("[BaseSales.applyDiscountConfig.calcDiscount]");
       const result = rulesModule.calcDiscount({
         productList: tempOrder.products,
         discountList: nextDiscountList,
-        holders: [],
+        holders,
         isFormSubject: (product) => (0, import_utils.resolveIsFormSubject)(tempOrder, product),
         orderTotalAmount
       }) || { productList: tempOrder.products, discountList: nextDiscountList };
@@ -1374,8 +1182,8 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         );
       }
       for (const product of tempOrder.products || []) {
-        const productUid = (_m = product.metadata) == null ? void 0 : _m.unique_identification_number;
-        const runtimeOrigin = productUid ? (_p = (_o = (_n = tempOrder._extend) == null ? void 0 : _n.productsByUid) == null ? void 0 : _o[productUid]) == null ? void 0 : _p.origin : void 0;
+        const productUid = (_n = product.metadata) == null ? void 0 : _n.unique_identification_number;
+        const runtimeOrigin = productUid ? (_q = (_p = (_o = tempOrder._extend) == null ? void 0 : _o.productsByUid) == null ? void 0 : _p[productUid]) == null ? void 0 : _q.origin : void 0;
         if ((runtimeOrigin == null ? void 0 : runtimeOrigin.isManualDiscount) || isBaseSalesManualProductDiscountProduct(product))
           continue;
         const totalPerUnitDiscount = (product.discount_list || []).reduce(
@@ -1383,7 +1191,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
           0
         );
         const optionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(product));
-        const sourcePrice = ((_q = product.metadata) == null ? void 0 : _q.source_product_price) ?? (((_r = product.metadata) == null ? void 0 : _r.main_product_original_price) != null ? new import_decimal.default(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : product.original_price ?? "0");
+        const sourcePrice = ((_r = product.metadata) == null ? void 0 : _r.source_product_price) ?? (((_s = product.metadata) == null ? void 0 : _s.main_product_original_price) != null ? new import_decimal.default(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : product.original_price ?? "0");
         const newSourceSellingPrice = new import_decimal.default(Number(sourcePrice) || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
         const newMainSellingPrice = new import_decimal.default(Number(newSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
         if (product.metadata) {
@@ -1415,18 +1223,11 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     });
     return {
       productList: tempOrder.products || [],
-      discountList: nextDiscountList,
-      availableWalletIds: this.getAvailableWalletIds()
+      discountList: nextDiscountList
     };
   }
-  getAvailableWalletIds() {
-    var _a;
-    if (!((_a = this.store.order) == null ? void 0 : _a.getAvailableWalletIds))
-      return [];
-    return this.store.order.getAvailableWalletIds();
-  }
   async bestDiscount(cb) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     if (!this.store.order)
       throw new Error("order 模块未初始化");
     const tempOrder = this.store.order.ensureTempOrder();
@@ -1445,12 +1246,13 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     };
     await (discountModule == null ? void 0 : discountModule.setDiscountList(nextDiscountList));
     if (rulesModule) {
-      const orderTotalAmount = Number(((_c = orderStore.summary) == null ? void 0 : _c.total_amount) || 0);
+      const holders = ((_c = tempOrder.holder) == null ? void 0 : _c.form_record) || [];
+      const orderTotalAmount = Number(((_d = orderStore.summary) == null ? void 0 : _d.total_amount) || 0);
       console.log("[BaseSales.bestDiscount.calcDiscount]");
       result = rulesModule.calcDiscount({
         productList: tempOrder.products,
         discountList: nextDiscountList,
-        holders: [],
+        holders,
         isFormSubject: (product) => (0, import_utils.resolveIsFormSubject)(tempOrder, product),
         orderTotalAmount
       }) || result;
@@ -1476,12 +1278,6 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     }
     await this.store.order.recalculateSummary({ createIfMissing: true });
     this.store.order.persistTempOrder();
-    await this.effectsEmit("onDiscountApplied", {
-      productList: tempOrder.products || [],
-      discountList: nextDiscountList,
-      selectedDiscountList: tempOrder.discount_list || [],
-      tempOrder
-    });
     cb == null ? void 0 : cb(result);
     return result;
   }
@@ -1490,30 +1286,6 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       return [];
     return this.store.order.getDiscountList();
   }
-  /** 读取 Discount 模块原始券列表（未经过 bookingTime 等过滤）。 */
-  getOriginalDiscountList() {
-    var _a, _b;
-    if (!this.store.order)
-      return [];
-    const discountModule = (_a = this.store.order.store) == null ? void 0 : _a.discount;
-    return ((_b = discountModule == null ? void 0 : discountModule.getOriginalDiscountList) == null ? void 0 : _b.call(discountModule)) || [];
-  }
-  /**
-   * 同步写入 Discount 模块的 discountList / originalDiscountList。
-   * 供 Holder 补全等场景在 OS store 层更新 machinecode holder 字段。
-   */
-  async replaceDiscountStoreLists(params) {
-    var _a;
-    if (!this.store.order)
-      throw new Error("order 模块未初始化");
-    const discountModule = (_a = this.store.order.store) == null ? void 0 : _a.discount;
-    if (!discountModule)
-      return;
-    if (params.originalDiscountList) {
-      await discountModule.setOriginalDiscountList(params.originalDiscountList);
-    }
-    await discountModule.setDiscountList(params.discountList);
-  }
   async scanPromotionCode(code, customerId) {
     try {
       if (!this.store.order)
@@ -1522,19 +1294,11 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       if (raw.isAvailable) {
         await this.store.order.recalculateSummary({ createIfMissing: true });
         this.store.order.persistTempOrder();
-        const tempOrder = this.store.order.ensureTempOrder();
-        await this.effectsEmit("onDiscountApplied", {
-          productList: tempOrder.products || [],
-          discountList: this.store.order.getDiscountList(),
-          selectedDiscountList: tempOrder.discount_list || [],
-          tempOrder
-        });
       }
       return {
         isAvailable: raw.isAvailable,
         type: raw.type,
-        unavailableReason: raw.unavailableReason,
-        scannedDiscountList: raw.scannedDiscountList
+        unavailableReason: raw.unavailableReason
       };
     } catch (error) {
       throw error;
@@ -1542,7 +1306,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   }
   // TODO 需要优化，这段逻辑太长了，里面应该有些历史遗留问题
   async setDiscountSelected(params) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     try {
       if (!this.store.order)
         throw new Error("order 模块未初始化");
@@ -1559,16 +1323,17 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       const orderStore = this.store.order.store || {};
       const discountModule = orderStore.discount;
       const rulesModule = orderStore.rules;
+      const holders = ((_a = tempOrder.holder) == null ? void 0 : _a.form_record) || [];
       let nextDiscountList = updated;
       await (discountModule == null ? void 0 : discountModule.setDiscountList(updated));
       if (rulesModule) {
-        const orderTotalAmount = Number(((_a = orderStore.summary) == null ? void 0 : _a.total_amount) || 0);
+        const orderTotalAmount = Number(((_b = orderStore.summary) == null ? void 0 : _b.total_amount) || 0);
         console.log("[BaseSales.setDiscountSelected.calcDiscount]");
         const result = rulesModule.calcDiscount(
           {
             productList: tempOrder.products,
             discountList: updated,
-            holders: [],
+            holders,
             isFormSubject: (product) => (0, import_utils.resolveIsFormSubject)(tempOrder, product),
             orderTotalAmount
           },
@@ -1608,8 +1373,8 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         return rid != null && selectedResourceIds.has(rid);
       });
       for (const product of tempOrder.products) {
-        const productUid = (_b = product.metadata) == null ? void 0 : _b.unique_identification_number;
-        const runtimeOrigin = productUid ? (_e = (_d = (_c = tempOrder._extend) == null ? void 0 : _c.productsByUid) == null ? void 0 : _d[productUid]) == null ? void 0 : _e.origin : void 0;
+        const productUid = (_c = product.metadata) == null ? void 0 : _c.unique_identification_number;
+        const runtimeOrigin = productUid ? (_f = (_e = (_d = tempOrder._extend) == null ? void 0 : _d.productsByUid) == null ? void 0 : _e[productUid]) == null ? void 0 : _f.origin : void 0;
         if ((runtimeOrigin == null ? void 0 : runtimeOrigin.isManualDiscount) || isBaseSalesManualProductDiscountProduct(product))
           continue;
         product.discount_list = filterSelectedDiscountDetails(product.discount_list);
@@ -1633,7 +1398,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
           0
         );
         const optionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(product));
-        const sourcePrice = ((_f = product.metadata) == null ? void 0 : _f.source_product_price) ?? (((_g = product.metadata) == null ? void 0 : _g.main_product_original_price) != null ? new import_decimal.default(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : product.original_price ?? "0");
+        const sourcePrice = ((_g = product.metadata) == null ? void 0 : _g.source_product_price) ?? (((_h = product.metadata) == null ? void 0 : _h.main_product_original_price) != null ? new import_decimal.default(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : product.original_price ?? "0");
         const newSourceSellingPrice = new import_decimal.default(Number(sourcePrice) || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
         const newMainSellingPrice = new import_decimal.default(Number(newSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
         if (product.metadata) {
@@ -1687,12 +1452,6 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       }
       await this.store.order.recalculateSummary({ createIfMissing: true });
       this.store.order.persistTempOrder();
-      await this.effectsEmit("onDiscountApplied", {
-        productList: tempOrder.products || [],
-        discountList: result.discountList || [],
-        selectedDiscountList: tempOrder.discount_list || [],
-        tempOrder
-      });
     } catch (error) {
       throw error;
     }

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

@@ -1,4 +1,3 @@
-import type { Discount } from '../../modules/Discount/types';
 import { OrderModule, ProductList, QuotationModule, SalesSummaryModule, ScanOrderLoggerModule as BaseSalesLoggerModule, ScheduleModule } from '../../modules';
 import type { ScanOrderLogInput as BaseSalesLogInput, ScanOrderLoggerProviderConfig as BaseSalesLoggerProviderConfig, ScanOrderLoggerProviderType as BaseSalesLoggerProviderType } from '../../modules/ScanOrderLogger/types';
 import type { QuantityCheckResult, QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
@@ -86,8 +85,6 @@ export interface BaseSalesOrderProduct extends BaseSalesOrderProductIdentity {
     booking_uid?: string;
     /** 多语言商品标题快照，随 tempOrder 提交到 checkout。 */
     product_title?: BaseSalesLocalizedText;
-    /** 商品封面图快照，随 tempOrder 提交到 checkout。 */
-    product_cover?: string;
     /**
      * 行级扩展 metadata。价格相关的权威字段：
      *
@@ -384,11 +381,9 @@ export interface BaseSalesLoggerRuntimeConfig {
 }
 export interface BaseSalesAddLogParams extends BaseSalesLogInput {
 }
-/** BaseSales.scanPromotionCode 对外的轻量结果（UI 可用 getDiscountList 或 scannedDiscountList 补 Holder） */
+/** BaseSales.scanPromotionCode 对外的轻量结果（不含 discountList，UI 在 resolve 后调 getDiscountList） */
 export interface BaseSalesScanCodeResult {
     isAvailable: boolean;
     type?: 'server' | string;
     unavailableReason?: 'time_limit' | string;
-    /** batchSearch 原始结果；isAvailable=false 时 discountList 可能未写入 store，Holder 补全需读此字段 */
-    scannedDiscountList?: Discount[];
 }

package/lib/solution/BaseSales/utils/cartPromotion.d.ts

@@ -78,6 +78,7 @@ export interface CartPromotionEvaluator {
         }>;
         hasApplicableStrategy: boolean;
     }>;
+    getStrategyConfigs?: () => unknown[];
 }
 /** 单个赠品减量项 */
 export interface GiftReduceItem {
@@ -267,7 +268,8 @@ export declare function appendPromotionTags<T extends Record<string, any>>(produ
  * 处理购物车的促销计算与赠品差异化。
  *
  * 流程：
- * 1. 分离 main / gift / edit-product 三类（带 `booking_id` 的编辑态商品不参与促销）
+ * 1. 分离 main / gift / edit-product 三类（普通促销下带 `booking_id` 的编辑态商品不参与；
+ *    配置 ITEM_REWARD 时，编辑态商品也参与商品奖励重算）
  * 2. 转 PromotionProduct 喂评估器 → 拿到 `evaluateCartWithPricing` 与 `getProductsApplicableStrategies`
  * 3. 把 PricedProduct 映射回 OrderProduct 形态：
  *    - 参与促销的，写 `metadata._promotion` + 调整 `selling_price` / `main_product_selling_price`