@pisell/pisellos 2.2.259 → 2.2.260

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

@@ -30,7 +30,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     protected defaultVersion: string;
     isSolution: boolean;
     protected initializeOptions: ModuleOptions;
-    protected logger: any;
+    private logger;
     protected appPlugin: AppPlugin;
     protected store: BaseSalesState;
     protected otherParams: Record<string, any>;
@@ -46,12 +46,6 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     protected hasManualDiscountSelection: boolean;
     private readonly reusedSharedSubModuleNames;
     private paymentMethodsCache;
-    private queuedAutoPaymentSync;
-    private autoPaymentSyncFlushing;
-    private autoPaymentSyncTimer;
-    private salesDetailLoadInFlight;
-    private serverOrderChangeUnsubscribe;
-    private serverOrderChangeHydrateInFlight;
     constructor(name?: string, version?: string);
     /**
      * 子类可覆盖此方法以追加/收敛要注册的子模块。
@@ -72,9 +66,6 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
      * 记录错误日志
      */
     private logError;
-    private isCurrentSalesOrderRecord;
-    private syncCurrentSalesDetailFromServerOrderChange;
-    private registerServerOrderChangeSync;
     private hydrateOrderPaymentNames;
     get payment(): PaymentModule | undefined;
     private getCurrentOrderCustomerId;
@@ -204,7 +195,6 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
         payments?: OrderPaymentSource[];
         paymentStatus?: BaseSalesPaymentStatus;
         smallTicketDataFlag?: number;
-        confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     /**
@@ -217,14 +207,12 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
         payments?: OrderPaymentSource[];
         paymentStatus?: BaseSalesPaymentStatus;
         smallTicketDataFlag?: number;
-        confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     submitTempOrderAsync<T = any>(params?: {
         payments?: OrderPaymentSource[];
         paymentStatus?: BaseSalesPaymentStatus;
         smallTicketDataFlag?: number;
-        confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     printLocalOrderReceipt<T = any>(lookup?: BaseSalesPrintLocalOrderReceiptParams): Promise<T>;
@@ -234,10 +222,6 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     getOrderPayments(): OrderPaymentData[];
     /** 覆盖当前订单支付项，内部由 OrderModule 清洗为 Sales 协议字段。 */
     setOrderPayments(payments: OrderPaymentSource[]): OrderPaymentData[];
-    private getPaymentStatusForSync;
-    private queueLatestAutoPaymentSync;
-    private scheduleQueuedAutoPaymentSyncFlush;
-    private flushQueuedAutoPaymentSync;
     /** 追加单个支付项到当前订单。 */
     addOrderPayment(payment: OrderPaymentSource): OrderPaymentData[];
     /** 更新当前订单中的指定支付项。 */
@@ -245,11 +229,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     /** 删除当前订单中的指定支付项。 */
     deleteOrderPayment(paymentIdentity: string | number): OrderPaymentData[];
     /** 覆盖 wallet pass 支付项，同时保留普通支付项。 */
-    updateVoucherOrderPayments(payments: OrderPaymentSource[], options?: {
-        status?: 'paid' | 'payment_pending';
-    }): OrderPaymentData[];
-    confirmPendingVoucherPayments(): OrderPaymentData[];
-    discardPendingVoucherPayments(): OrderPaymentData[];
+    updateVoucherOrderPayments(payments: OrderPaymentSource[]): OrderPaymentData[];
     private getWalletProductList;
     initWalletData(params?: {
         order_wait_pay_amount?: number;

package/lib/solution/BaseSales/index.js

@@ -45,7 +45,6 @@ __reExport(BaseSales_exports, require("./types"), module.exports);
 var import_Quotation = require("../../modules/Quotation");
 var import_transformBaseProductToOrderProduct = require("./utils/transformBaseProductToOrderProduct");
 var import_quotationPrice = require("./utils/quotationPrice");
-var SERVER_ORDER_CHANGED_EVENT = "order:onOrdersChanged";
 function isBaseSalesManualProductDiscountProduct(product) {
   var _a, _b;
   return ((_a = product == null ? void 0 : product.metadata) == null ? void 0 : _a.is_manual_discount) === true || ((_b = product == null ? void 0 : product.metadata) == null ? void 0 : _b.is_manual_discount) === 1 || ((product == null ? void 0 : product.discount_list) || []).some((item) => (item == null ? void 0 : item.type) === "product");
@@ -83,18 +82,6 @@ function getBaseSalesUniqueArrayMetadataKey(key) {
     return "unique_payment_number";
   return null;
 }
-function isSameBaseSalesOrderRecord(left, right) {
-  if (!left || !right || typeof left !== "object" || typeof right !== "object")
-    return false;
-  const leftIdentities = new Set(
-    [left.order_id, left.id, left.external_sale_number, left.order_number].filter((value) => value !== void 0 && value !== null && value !== "").map(String)
-  );
-  if (leftIdentities.size === 0)
-    return false;
-  return [right.order_id, right.id, right.external_sale_number, right.order_number].some(
-    (value) => value !== void 0 && value !== null && value !== "" && leftIdentities.has(String(value))
-  );
-}
 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]);
@@ -169,12 +156,6 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     this.hasManualDiscountSelection = false;
     this.reusedSharedSubModuleNames = /* @__PURE__ */ new Set();
     this.paymentMethodsCache = [];
-    this.queuedAutoPaymentSync = false;
-    this.autoPaymentSyncFlushing = false;
-    this.autoPaymentSyncTimer = null;
-    this.salesDetailLoadInFlight = false;
-    this.serverOrderChangeUnsubscribe = null;
-    this.serverOrderChangeHydrateInFlight = null;
   }
   /**
    * 子类可覆盖此方法以追加/收敛要注册的子模块。
@@ -184,10 +165,10 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     return ["products", "order", "salesSummary", "schedule", "payment", "quotation"];
   }
   getReusableSharedSubModule(moduleName) {
-    var _a, _b;
+    var _a;
     if (moduleName !== "schedule" && moduleName !== "quotation")
       return null;
-    return ((_b = (_a = this.core) == null ? void 0 : _a.getModule) == null ? void 0 : _b.call(_a, moduleName)) || null;
+    return ((_a = this.core) == null ? void 0 : _a.getModule(moduleName)) || null;
   }
   isScheduleListLoaded(scheduleModule) {
     if (!scheduleModule)
@@ -239,53 +220,6 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       });
     }
   }
-  isCurrentSalesOrderRecord(order) {
-    var _a, _b;
-    const currentTempOrder = (_b = (_a = this.store.order) == null ? void 0 : _a.getTempOrder) == null ? void 0 : _b.call(_a);
-    const currentRecords = [
-      currentTempOrder,
-      this.currentSalesDetail
-    ].filter(Boolean);
-    return currentRecords.some((record) => isSameBaseSalesOrderRecord(record, order));
-  }
-  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.salesDetailLoadInFlight || this.serverOrderChangeHydrateInFlight)
-      return;
-    const changedOrder = changedOrders.find(
-      (order) => this.isCurrentSalesOrderRecord(order)
-    );
-    if (!changedOrder)
-      return;
-    if (!this.store.order)
-      return;
-    this.serverOrderChangeHydrateInFlight = (async () => {
-      const sales = await this.store.order.hydrateTempOrderFromRecord(changedOrder, {
-        recalcOnHydrate: false
-      });
-      this.currentSalesDetail = sales;
-      await this.core.effects.emit(`${this.name}:onSalesOrderLoaded`, { sales });
-    })();
-    try {
-      await this.serverOrderChangeHydrateInFlight;
-    } finally {
-      this.serverOrderChangeHydrateInFlight = null;
-    }
-  }
-  registerServerOrderChangeSync() {
-    var _a, _b;
-    (_a = this.serverOrderChangeUnsubscribe) == null ? void 0 : _a.call(this);
-    const effects = (_b = this.core) == null ? void 0 : _b.effects;
-    if (!effects || typeof effects.on !== "function")
-      return;
-    this.serverOrderChangeUnsubscribe = effects.on(SERVER_ORDER_CHANGED_EVENT, (payload) => {
-      void this.syncCurrentSalesDetailFromServerOrderChange(payload).catch((error) => {
-        this.logError("sync sales detail from server order change failed", {
-          error: error instanceof Error ? error.message : String(error)
-        });
-      });
-    });
-  }
   hydrateOrderPaymentNames(payments) {
     if (!payments.length)
       return [];
@@ -700,13 +634,9 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       );
     }
     await this.getPaymentMethodsAsync();
-    this.registerServerOrderChangeSync();
     this.core.effects.emit(`${this.name}:onInited`, {});
   }
   async destroy() {
-    var _a;
-    (_a = this.serverOrderChangeUnsubscribe) == null ? void 0 : _a.call(this);
-    this.serverOrderChangeUnsubscribe = null;
     Object.keys(this.store).forEach((key) => {
       if (this.reusedSharedSubModuleNames.has(key))
         return;
@@ -733,35 +663,30 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   async loadSalesDetail(orderIdOrParams) {
     if (!this.store.order)
       throw new Error("order 模块未初始化");
-    this.salesDetailLoadInFlight = true;
-    try {
-      const params = typeof orderIdOrParams === "object" ? orderIdOrParams : { orderId: orderIdOrParams };
-      const externalSaleNumber = params.externalSaleNumber || params.external_sale_number;
-      const preloadedSalesDetail = params.preloadedSalesDetail;
-      const lookup = params.orderId ?? externalSaleNumber ?? params.orderNumber ?? (preloadedSalesDetail == null ? void 0 : preloadedSalesDetail.order_id) ?? (preloadedSalesDetail == null ? void 0 : preloadedSalesDetail.external_sale_number) ?? (preloadedSalesDetail == null ? void 0 : preloadedSalesDetail.order_number);
-      if (!preloadedSalesDetail && (lookup === void 0 || lookup === null || lookup === "")) {
-        throw new Error("加载销售详情需要 orderId、externalSaleNumber 或 orderNumber");
-      }
-      const loadedRecord = preloadedSalesDetail ?? await this.store.order.getSalesOrderByLookup({
-        lookup,
-        forceRemote: params.forceRemote
-      });
-      if (!preloadedSalesDetail && (!loadedRecord || loadedRecord.code !== 200)) {
-        const message = loadedRecord && (loadedRecord.message || loadedRecord.msg) || `加载销售详情失败: ${lookup}`;
-        throw new Error(message);
-      }
-      const remoteRecord = preloadedSalesDetail ?? loadedRecord.data;
-      const currentTempOrder = params.merge ? this.store.order.getTempOrder() : null;
-      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.salesDetailLoadInFlight = false;
-    }
+    const params = typeof orderIdOrParams === "object" ? orderIdOrParams : { orderId: orderIdOrParams };
+    const externalSaleNumber = params.externalSaleNumber || params.external_sale_number;
+    const preloadedSalesDetail = params.preloadedSalesDetail;
+    const lookup = params.orderId ?? externalSaleNumber ?? params.orderNumber ?? (preloadedSalesDetail == null ? void 0 : preloadedSalesDetail.order_id) ?? (preloadedSalesDetail == null ? void 0 : preloadedSalesDetail.external_sale_number) ?? (preloadedSalesDetail == null ? void 0 : preloadedSalesDetail.order_number);
+    if (!preloadedSalesDetail && (lookup === void 0 || lookup === null || lookup === "")) {
+      throw new Error("加载销售详情需要 orderId、externalSaleNumber 或 orderNumber");
+    }
+    const loadedRecord = preloadedSalesDetail ?? await this.store.order.getSalesOrderByLookup({
+      lookup,
+      forceRemote: params.forceRemote
+    });
+    if (!preloadedSalesDetail && (!loadedRecord || loadedRecord.code !== 200)) {
+      const message = loadedRecord && (loadedRecord.message || loadedRecord.msg) || `加载销售详情失败: ${lookup}`;
+      throw new Error(message);
+    }
+    const remoteRecord = preloadedSalesDetail ?? loadedRecord.data;
+    const currentTempOrder = params.merge ? this.store.order.getTempOrder() : null;
+    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;
   }
   /** 获取当前已加载的销售详情（只读快照）。未加载过则返回 null。 */
   getSalesOrder() {
@@ -1094,7 +1019,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, _s;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t;
     if (!this.store.order)
       throw new Error("order 模块未初始化");
     const tempOrder = this.store.order.ensureTempOrder();
@@ -1165,15 +1090,13 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       };
     }
     if (rulesModule) {
-      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 holders = ((_l = tempOrder.holder) == null ? void 0 : _l.form_record_id) ? [{ form_record_id: tempOrder.holder.form_record_id }] : [];
       const result = rulesModule.calcDiscount({
         productList: tempOrder.products,
         discountList: nextDiscountList,
         holders,
-        isFormSubject: (product) => (0, import_utils.resolveIsFormSubject)(tempOrder, product),
-        orderTotalAmount
+        isFormSubject: !!((_m = tempOrder.holder) == null ? void 0 : _m.type) && tempOrder.holder.type === "form",
+        orderTotalAmount: Number(((_n = orderStore.summary) == null ? void 0 : _n.total_amount) || 0)
       }) || { productList: tempOrder.products, discountList: nextDiscountList };
       if (result.productList) {
         tempOrder.products = preserveManualProductDiscountProducts(
@@ -1182,8 +1105,8 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         );
       }
       for (const product of tempOrder.products || []) {
-        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;
+        const productUid = (_o = product.metadata) == null ? void 0 : _o.unique_identification_number;
+        const runtimeOrigin = productUid ? (_r = (_q = (_p = tempOrder._extend) == null ? void 0 : _p.productsByUid) == null ? void 0 : _q[productUid]) == null ? void 0 : _r.origin : void 0;
         if ((runtimeOrigin == null ? void 0 : runtimeOrigin.isManualDiscount) || isBaseSalesManualProductDiscountProduct(product))
           continue;
         const totalPerUnitDiscount = (product.discount_list || []).reduce(
@@ -1191,7 +1114,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
           0
         );
         const optionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(product));
-        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 sourcePrice = ((_s = product.metadata) == null ? void 0 : _s.source_product_price) ?? (((_t = product.metadata) == null ? void 0 : _t.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) {
@@ -1227,7 +1150,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     };
   }
   async bestDiscount(cb) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     if (!this.store.order)
       throw new Error("order 模块未初始化");
     const tempOrder = this.store.order.ensureTempOrder();
@@ -1246,15 +1169,13 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     };
     await (discountModule == null ? void 0 : discountModule.setDiscountList(nextDiscountList));
     if (rulesModule) {
-      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]");
+      const holders = ((_c = tempOrder.holder) == null ? void 0 : _c.form_record_id) ? [{ form_record_id: tempOrder.holder.form_record_id }] : [];
       result = rulesModule.calcDiscount({
         productList: tempOrder.products,
         discountList: nextDiscountList,
         holders,
-        isFormSubject: (product) => (0, import_utils.resolveIsFormSubject)(tempOrder, product),
-        orderTotalAmount
+        isFormSubject: !!((_d = tempOrder.holder) == null ? void 0 : _d.type) && tempOrder.holder.type === "form",
+        orderTotalAmount: Number(((_e = orderStore.summary) == null ? void 0 : _e.total_amount) || 0)
       }) || result;
       if (result.productList) {
         tempOrder.products = preserveManualProductDiscountProducts(
@@ -1323,19 +1244,16 @@ 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) || [];
+      const holders = ((_a = tempOrder.holder) == null ? void 0 : _a.form_record_id) ? [{ form_record_id: tempOrder.holder.form_record_id }] : [];
       let nextDiscountList = updated;
       await (discountModule == null ? void 0 : discountModule.setDiscountList(updated));
       if (rulesModule) {
-        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,
-            isFormSubject: (product) => (0, import_utils.resolveIsFormSubject)(tempOrder, product),
-            orderTotalAmount
+            isFormSubject: !!((_b = tempOrder.holder) == null ? void 0 : _b.type) && tempOrder.holder.type === "form"
           },
           {
             discountId: params.discountId,
@@ -1358,7 +1276,6 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
               if (d.isSelected && !beforeSelectedIds.has(d.id)) {
                 d.isSelected = false;
                 d.isManualSelect = true;
-                d.appliedProductDetails = [];
               }
             }
           }
@@ -1367,32 +1284,16 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       const selectedResourceIds = new Set(
         nextDiscountList.filter((d) => d.isSelected).map((d) => d.id)
       );
-      const filterSelectedDiscountDetails = (discountList) => (discountList || []).filter((pd) => {
-        var _a2;
-        const rid = ((_a2 = pd.discount) == null ? void 0 : _a2.resource_id) ?? pd.id;
-        return rid != null && selectedResourceIds.has(rid);
-      });
       for (const product of tempOrder.products) {
         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);
-        if (Array.isArray(product.product_bundle)) {
-          product.product_bundle = product.product_bundle.map((bundle) => {
-            const nextBundleDiscountList = filterSelectedDiscountDetails(bundle == null ? void 0 : bundle.discount_list);
-            const shouldRestoreBundlePrice = nextBundleDiscountList.length === 0;
-            const restoredBundlePrice = (bundle == null ? void 0 : bundle.original_price) ?? (bundle == null ? void 0 : bundle.product_price) ?? (bundle == null ? void 0 : bundle.price);
-            return {
-              ...bundle,
-              ...shouldRestoreBundlePrice ? {
-                price: restoredBundlePrice,
-                bundle_selling_price: restoredBundlePrice
-              } : {},
-              discount_list: nextBundleDiscountList
-            };
-          });
-        }
+        product.discount_list = (product.discount_list || []).filter((pd) => {
+          var _a2;
+          const rid = ((_a2 = pd.discount) == null ? void 0 : _a2.resource_id) ?? pd.id;
+          return rid != null && selectedResourceIds.has(rid);
+        });
         const totalPerUnitDiscount = (product.discount_list || []).reduce(
           (sum, pd) => sum + (pd.amount || 0),
           0
@@ -1481,7 +1382,6 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       ...(params == null ? void 0 : params.payments) !== void 0 ? { payments: params.payments } : {},
       ...inferredPaymentStatus !== void 0 ? { paymentStatus: inferredPaymentStatus } : {},
       ...(params == null ? void 0 : params.smallTicketDataFlag) !== void 0 ? { smallTicketDataFlag: params.smallTicketDataFlag } : {},
-      ...(params == null ? void 0 : params.confirmPendingVoucherPayments) !== void 0 ? { confirmPendingVoucherPayments: params.confirmPendingVoucherPayments } : {},
       ...(params == null ? void 0 : params.enhancePayload) !== void 0 ? { enhancePayload: params.enhancePayload } : {}
     };
     return this.store.order.submitTempOrder(submitParams);
@@ -1501,7 +1401,6 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       ...(params == null ? void 0 : params.payments) !== void 0 ? { payments: params.payments } : {},
       ...inferredPaymentStatus !== void 0 ? { paymentStatus: inferredPaymentStatus } : {},
       ...(params == null ? void 0 : params.smallTicketDataFlag) !== void 0 ? { smallTicketDataFlag: params.smallTicketDataFlag } : {},
-      ...(params == null ? void 0 : params.confirmPendingVoucherPayments) !== void 0 ? { confirmPendingVoucherPayments: params.confirmPendingVoucherPayments } : {},
       ...(params == null ? void 0 : params.enhancePayload) !== void 0 ? { enhancePayload: params.enhancePayload } : {}
     };
     return this.store.order.submitTempOrderAsync(submitParams);
@@ -1570,7 +1469,6 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     };
     const syncState = this.store.order.getOrderSyncState();
     if (params.submitWhenPaid && syncState === "submitting") {
-      this.queueLatestAutoPaymentSync();
       return this.store.order.syncPaymentsToOrder(syncParams);
     }
     const payments = params.payments || [];
@@ -1582,28 +1480,14 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     });
     try {
       const syncResult = await this.store.order.syncPaymentsToOrder(syncParams);
-      const latestPayments = this.store.order.getOrderPayments();
-      const amountSnapshot = this.store.order.getOrderAmountSnapshot();
-      const orderSnapshot = this.store.order.getOrderSnapshot();
-      const syncPayload = {
+      await this.effectsEmit(import_types.BaseSalesHookNames.onPaymentSyncEnd, {
         ok: true,
         syncResult,
-        payments: latestPayments,
+        payments: this.store.order.getOrderPayments(),
         params: syncParams,
-        amountSnapshot,
-        orderSnapshot,
-        isFullyPaid: syncResult.isFullyPaid,
-        isOrderFullyPaid: syncResult.isOrderFullyPaid,
-        isDepositFullyPaid: syncResult.isDepositFullyPaid,
-        paymentStage: syncResult.paymentStage,
-        depositAmount: syncResult.depositAmount,
-        orderExpectedAmount: syncResult.orderExpectedAmount
-      };
-      await this.effectsEmit(import_types.BaseSalesHookNames.onPaymentSyncEnd, syncPayload);
-      if (syncResult.isDepositFullyPaid && !syncResult.isOrderFullyPaid) {
-        await this.effectsEmit(import_types.BaseSalesHookNames.onDepositPaymentSyncEnd, syncPayload);
-      }
-      this.scheduleQueuedAutoPaymentSyncFlush(0);
+        amountSnapshot: this.store.order.getOrderAmountSnapshot(),
+        orderSnapshot: this.store.order.getOrderSnapshot()
+      });
       return syncResult;
     } catch (error) {
       await this.effectsEmit(import_types.BaseSalesHookNames.onPaymentSyncEnd, {
@@ -1614,7 +1498,6 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         amountSnapshot: this.store.order.getOrderAmountSnapshot(),
         orderSnapshot: this.store.order.getOrderSnapshot()
       });
-      this.scheduleQueuedAutoPaymentSyncFlush(0);
       throw error;
     }
   }
@@ -1631,61 +1514,6 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       throw new Error("order 模块未初始化");
     return this.store.order.setOrderPayments(payments);
   }
-  getPaymentStatusForSync(payments) {
-    const order = this.store.order;
-    if (!order)
-      throw new Error("order 模块未初始化");
-    const completion = order.getPaymentCompletion(payments);
-    return completion.isOrderFullyPaid ? "paid" : "partially_paid";
-  }
-  queueLatestAutoPaymentSync() {
-    this.queuedAutoPaymentSync = true;
-    this.scheduleQueuedAutoPaymentSyncFlush();
-  }
-  scheduleQueuedAutoPaymentSyncFlush(delay = 100) {
-    if (!this.queuedAutoPaymentSync)
-      return;
-    if (this.autoPaymentSyncTimer)
-      return;
-    this.autoPaymentSyncTimer = setTimeout(() => {
-      this.autoPaymentSyncTimer = null;
-      void this.flushQueuedAutoPaymentSync();
-    }, delay);
-  }
-  async flushQueuedAutoPaymentSync() {
-    if (!this.store.order)
-      return;
-    if (!this.queuedAutoPaymentSync || this.autoPaymentSyncFlushing)
-      return;
-    if (this.store.order.getOrderSyncState() === "submitting") {
-      this.scheduleQueuedAutoPaymentSyncFlush();
-      return;
-    }
-    this.autoPaymentSyncFlushing = true;
-    try {
-      while (this.queuedAutoPaymentSync) {
-        this.queuedAutoPaymentSync = false;
-        const payments = this.store.order.getOrderPayments();
-        if (!payments.length)
-          continue;
-        await this.syncPaymentsToOrder({
-          payments,
-          paymentStatus: this.getPaymentStatusForSync(payments),
-          submitWhenPaid: true,
-          smallTicketDataFlag: 1
-        });
-      }
-    } catch (error) {
-      this.logError("queued auto sync payments failed", {
-        error: error instanceof Error ? error.message : String(error)
-      });
-    } finally {
-      this.autoPaymentSyncFlushing = false;
-      if (this.queuedAutoPaymentSync) {
-        this.scheduleQueuedAutoPaymentSyncFlush(0);
-      }
-    }
-  }
   /** 追加单个支付项到当前订单。 */
   addOrderPayment(payment) {
     var _a;
@@ -1721,14 +1549,11 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     });
     const amountSnapshot = this.store.order.getOrderAmountSnapshot();
     const syncState = this.store.order.getOrderSyncState();
-    if (amountSnapshot) {
-      if (syncState === "submitting") {
-        this.queueLatestAutoPaymentSync();
-        return payments;
-      }
+    if (amountSnapshot && syncState !== "submitting") {
+      const paymentStatus = Number(amountSnapshot.amountGap || 0) <= 0 ? "paid" : "partially_paid";
       void this.syncPaymentsToOrder({
         payments,
-        paymentStatus: this.getPaymentStatusForSync(payments),
+        paymentStatus,
         submitWhenPaid: true,
         smallTicketDataFlag: 1
       }).catch((error) => {
@@ -1736,6 +1561,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
           error: error instanceof Error ? error.message : String(error)
         });
       });
+    } else {
     }
     return payments;
   }
@@ -1752,33 +1578,21 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     return this.store.order.deleteOrderPayment(paymentIdentity);
   }
   /** 覆盖 wallet pass 支付项，同时保留普通支付项。 */
-  updateVoucherOrderPayments(payments, options) {
+  updateVoucherOrderPayments(payments) {
     if (!this.store.order)
       throw new Error("order 模块未初始化");
-    return this.store.order.updateVoucherOrderPayments(payments, options);
-  }
-  confirmPendingVoucherPayments() {
-    if (!this.store.order)
-      throw new Error("order 模块未初始化");
-    return this.store.order.confirmPendingVoucherPayments();
-  }
-  discardPendingVoucherPayments() {
-    if (!this.store.order)
-      throw new Error("order 模块未初始化");
-    return this.store.order.discardPendingVoucherPayments();
+    return this.store.order.updateVoucherOrderPayments(payments);
   }
   getWalletProductList() {
-    var _a, _b;
+    var _a, _b, _c;
     const tempOrder = (_a = this.store.order) == null ? void 0 : _a.getTempOrder();
     if (!((_b = tempOrder == null ? void 0 : tempOrder.products) == null ? void 0 : _b.length))
       return [];
-    const walletProducts = tempOrder == null ? void 0 : tempOrder.products.map((product) => {
+    const products = (_c = tempOrder == null ? void 0 : tempOrder.products) == null ? void 0 : _c.filter((n) => n.product_id);
+    const walletProducts = products.map((product) => {
       const metadata = product.metadata || {};
-      const rawHolderId = product.holder_id ?? metadata.holder_id;
-      const holderIdValue = Array.isArray(rawHolderId) ? rawHolderId[0] : rawHolderId;
-      const holder_id = Number.isInteger(Number(holderIdValue)) ? Number(holderIdValue) : void 0;
       return {
-        product_id: product.product_id || 0,
+        product_id: product.product_id,
         product_variant_id: String(product.product_variant_id ?? ""),
         quantity: product.num || 1,
         is_price_include_tax: tempOrder.is_price_include_tax,
@@ -1786,7 +1600,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         tax_fee: product.tax_fee,
         selling_price: Number(product.selling_price || 0),
         discount_list: product.discount_list || [],
-        holder_id,
+        holder_id: product.holder_id ?? metadata.holder_id,
         original_price: product.original_price,
         main_product_original_price: metadata.main_product_original_price ?? product.original_price,
         main_product_selling_price: metadata.main_product_selling_price ?? product.selling_price,

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

@@ -14,7 +14,6 @@ export declare const BaseSalesHookNames: {
     readonly onCartValidationChanged: "onCartValidationChanged";
     readonly onPaymentSyncStart: "onPaymentSyncStart";
     readonly onPaymentSyncEnd: "onPaymentSyncEnd";
-    readonly onDepositPaymentSyncEnd: "onDepositPaymentSyncEnd";
 };
 export type BaseSalesHookName = typeof BaseSalesHookNames[keyof typeof BaseSalesHookNames];
 export declare function createBaseSalesHook(moduleName: string, hookName: BaseSalesHookName): string;

package/lib/solution/BaseSales/types.js

@@ -30,8 +30,7 @@ var BaseSalesHookNames = {
   onRefresh: "onRefresh",
   onCartValidationChanged: "onCartValidationChanged",
   onPaymentSyncStart: "onPaymentSyncStart",
-  onPaymentSyncEnd: "onPaymentSyncEnd",
-  onDepositPaymentSyncEnd: "onDepositPaymentSyncEnd"
+  onPaymentSyncEnd: "onPaymentSyncEnd"
 };
 function createBaseSalesHook(moduleName, hookName) {
   return `${moduleName}:${hookName}`;

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

@@ -88,8 +88,7 @@ function normalizeBundleItems(bundleItems, preferPriceField = false) {
       price: bundleItem.price ?? unitStr,
       bundle_selling_price: unitStr,
       original_price: bundleItem.original_price ?? bundleItem.product_price ?? bundleItem.price ?? unitStr,
-      option: normalizeOptionItems(bundleItem == null ? void 0 : bundleItem.option),
-      discount_list: preferPriceField ? [] : bundleItem.discount_list
+      option: normalizeOptionItems(bundleItem == null ? void 0 : bundleItem.option)
     };
     normalizedItem.bundle_selling_price = (0, import_utils.getBundleSellingMagnitude)(magnitudeSource).toFixed(2);
     if ((normalizedItem.price_type ?? normalizedItem.custom_price_type) === "markdown" && (normalizedItem.price_type_ext === "" || normalizedItem.price_type_ext === void 0 || normalizedItem.price_type_ext === null)) {
@@ -130,9 +129,10 @@ function transformBaseProductToOrderProduct(params) {
     payload.price ?? payload.selling_price ?? (matchedVariant == null ? void 0 : matchedVariant.price) ?? (matchedVariant == null ? void 0 : matchedVariant.base_price) ?? (origin == null ? void 0 : origin.price) ?? (origin == null ? void 0 : origin.base_price) ?? (sourceProduct == null ? void 0 : sourceProduct.price) ?? (sourceProduct == null ? void 0 : sourceProduct.selling_price) ?? (sourceProduct == null ? void 0 : sourceProduct.base_price),
     "0.00"
   );
-  const explicitLineTotal = payload.line_total ?? payload.total ?? ((_c = payload._extend) == null ? void 0 : _c.total);
-  const hasExplicitLineTotal = Number.isFinite(Number(explicitLineTotal));
-  const lineCompositeTotal = toPriceString(explicitLineTotal, sourceProductPrice);
+  const lineCompositeTotal = toPriceString(
+    payload.line_total ?? payload.total ?? ((_c = payload._extend) == null ? void 0 : _c.total),
+    sourceProductPrice
+  );
   const hasPriceOverride = payload.price_override !== void 0 && payload.price_override !== null && payload.price_override !== "";
   const productOptionItem = (0, import_utils.normalizeProductSkuOptions)(
     normalizeOptionItems(
@@ -180,7 +180,7 @@ function transformBaseProductToOrderProduct(params) {
   const optionSum = (0, import_utils.sumOptionUnitPrice)(productOptionItem).toNumber();
   const mainProductOriginalPrice = toPriceString(Number(sourceProductPrice) + optionSum);
   const bundleOnlyComposite = (0, import_utils.composeLinePrice)({ mainPrice: 0, bundle: productBundle });
-  const derivedMainSelling = hasExplicitLineTotal ? Number(lineCompositeTotal) - Number(bundleOnlyComposite) : Number(mainProductOriginalPrice);
+  const derivedMainSelling = Number(lineCompositeTotal) - Number(bundleOnlyComposite);
   const mainProductSellingPrice = toPriceString(
     Number.isFinite(derivedMainSelling) && derivedMainSelling >= 0 ? derivedMainSelling : Number(mainProductOriginalPrice)
   );