@pisell/pisellos 2.2.196 → 2.2.198

package/lib/modules/Order/index.js

@@ -86,6 +86,80 @@ var OrderModule = class extends import_BaseModule.BaseModule {
      */
     this.draftPersistEnabled = true;
   }
+  collectHydratedEditDiscounts(products) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    const discountMap = /* @__PURE__ */ new Map();
+    for (const product of products || []) {
+      for (const item of (product == null ? void 0 : product.discount_list) || []) {
+        const type = (item == null ? void 0 : item.type) ?? (item == null ? void 0 : item.tag);
+        if (!type || type === "product")
+          continue;
+        const resourceId = ((_a = item == null ? void 0 : item.discount) == null ? void 0 : _a.resource_id) ?? (item == null ? void 0 : item.resource_id) ?? (item == null ? void 0 : item.discount_id) ?? (item == null ? void 0 : item.order_discount_id);
+        if (resourceId === void 0 || resourceId === null || resourceId === "")
+          continue;
+        const id = Number(resourceId);
+        const key = Number.isFinite(id) ? id : String(resourceId);
+        const title = ((_b = item == null ? void 0 : item.discount) == null ? void 0 : _b.title) ?? {};
+        const amount = Number((item == null ? void 0 : item.amount) || 0);
+        const detail = {
+          amount: String((item == null ? void 0 : item.amount) ?? "0"),
+          type,
+          resource_id: key,
+          title,
+          original_amount: String(((_c = item == null ? void 0 : item.discount) == null ? void 0 : _c.original_amount) ?? (item == null ? void 0 : item.amount) ?? "0"),
+          num: Number(((_d = item == null ? void 0 : item.metadata) == null ? void 0 : _d.num) ?? (product == null ? void 0 : product.num) ?? (product == null ? void 0 : product.product_quantity) ?? 1) || 1,
+          metadata: item == null ? void 0 : item.metadata,
+          discount: item == null ? void 0 : item.discount,
+          _num: Number(((_e = item == null ? void 0 : item.metadata) == null ? void 0 : _e.num) ?? (product == null ? void 0 : product.num) ?? (product == null ? void 0 : product.product_quantity) ?? 1) || 1
+        };
+        discountMap.set(key, {
+          id: key,
+          product_name: "",
+          encoded: "",
+          code: "",
+          tag: type,
+          product_id: ((_f = item == null ? void 0 : item.discount) == null ? void 0 : _f.discount_product_id) ?? (product == null ? void 0 : product.product_id) ?? 0,
+          relation_type: "",
+          par_value: String(((_g = item == null ? void 0 : item.discount) == null ? void 0 : _g.original_amount) ?? (item == null ? void 0 : item.amount) ?? "0"),
+          used_par_value: String((item == null ? void 0 : item.amount) ?? "0"),
+          limit_status: "enable",
+          limited_relation_product_data: {
+            id: 0,
+            type: "products",
+            product_ids: [product == null ? void 0 : product.product_id].filter((value) => value !== void 0 && value !== null),
+            product_collection_id: [],
+            filter: 0,
+            exclude_product_ids: []
+          },
+          balance: String((item == null ? void 0 : item.amount) ?? "0"),
+          format_title: title,
+          product: {
+            id: (product == null ? void 0 : product.product_id) ?? 0,
+            title: "",
+            is_charge_tax: (product == null ? void 0 : product.is_charge_tax) ?? 0,
+            base_price: String((product == null ? void 0 : product.original_price) ?? (product == null ? void 0 : product.selling_price) ?? "0")
+          },
+          type,
+          resource_id: key,
+          isEditMode: true,
+          isSelected: true,
+          isAvailable: true,
+          isUsed: true,
+          isDisabled: true,
+          amount,
+          discount: {
+            ...(item == null ? void 0 : item.discount) || {},
+            resource_id: key,
+            discount_product_id: ((_h = item == null ? void 0 : item.discount) == null ? void 0 : _h.discount_product_id) ?? (product == null ? void 0 : product.product_id) ?? 0,
+            discount_calculation_mode: ((_i = item == null ? void 0 : item.discount) == null ? void 0 : _i.discount_calculation_mode) ?? "item_level"
+          },
+          applicableProductDetails: [detail],
+          appliedProductDetails: [detail]
+        });
+      }
+    }
+    return Array.from(discountMap.values());
+  }
   /**
    * Populate `savedAmount` on each discount based on product-level discount details.
    * Only selected discounts get a non-zero value.
@@ -244,7 +318,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   }
   // ─── Discount: 公共 API ───
   async loadDiscountConfig(params) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     const orderId = params.orderId || ((_a = this.store.tempOrder) == null ? void 0 : _a.order_id) || void 0;
     const discountList = await ((_b = this.store.discount) == null ? void 0 : _b.loadPrepareConfig({
       customer_id: params.customerId,
@@ -256,10 +330,18 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       ...orderId ? { order_id: orderId } : {}
     }));
     if (discountList) {
-      await ((_c = this.store.discount) == null ? void 0 : _c.setOriginalDiscountList(discountList));
-      await ((_d = this.store.discount) == null ? void 0 : _d.setDiscountList(discountList));
-    }
-    if (params.apply !== false && ((_f = (_e = this.store.tempOrder) == null ? void 0 : _e.products) == null ? void 0 : _f.length)) {
+      const currentEditDiscounts = (((_c = this.store.discount) == null ? void 0 : _c.getDiscountList()) || []).filter((discount) => discount == null ? void 0 : discount.isEditMode);
+      const currentEditDiscountIds = new Set(
+        currentEditDiscounts.map((discount) => discount == null ? void 0 : discount.id)
+      );
+      const mergedDiscountList = [
+        ...currentEditDiscounts,
+        ...discountList.filter((discount) => !currentEditDiscountIds.has(discount == null ? void 0 : discount.id))
+      ];
+      await ((_d = this.store.discount) == null ? void 0 : _d.setOriginalDiscountList(mergedDiscountList));
+      await ((_e = this.store.discount) == null ? void 0 : _e.setDiscountList(mergedDiscountList));
+    }
+    if (params.apply !== false && ((_g = (_f = this.store.tempOrder) == null ? void 0 : _f.products) == null ? void 0 : _g.length)) {
       this.applyDiscount();
     }
     return this.getDiscountList();
@@ -268,6 +350,25 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     var _a;
     return ((_a = this.store.discount) == null ? void 0 : _a.getDiscountList()) || [];
   }
+  async ensureEditDiscountConfigForProductChange(tempOrder) {
+    var _a, _b, _c, _d, _e, _f;
+    const orderId = tempOrder.order_id;
+    const customerId = Number(
+      tempOrder.customer_id || ((_a = tempOrder.customer) == null ? void 0 : _a.id) || ((_c = (_b = tempOrder._extend) == null ? void 0 : _b.customerSnapshot) == null ? void 0 : _c.id) || ((_e = (_d = tempOrder._extend) == null ? void 0 : _d.customerSnapshot) == null ? void 0 : _e.customer_id) || 0
+    );
+    if (!orderId || !customerId || customerId === 1)
+      return;
+    const currentDiscountList = ((_f = this.store.discount) == null ? void 0 : _f.getDiscountList()) || [];
+    const hasRuntimeDiscounts = currentDiscountList.some((discount) => !(discount == null ? void 0 : discount.isEditMode));
+    if (hasRuntimeDiscounts)
+      return;
+    await this.loadDiscountConfig({
+      customerId,
+      action: "edit",
+      orderId: Number(orderId),
+      apply: false
+    });
+  }
   async scanCode(code, customerId) {
     var _a, _b, _c, _d, _e;
     const resultDiscountWithReason = await ((_a = this.store.discount) == null ? void 0 : _a.batchSearch(code, { customerId })) || { discountList: [], unavailableReasonKey: null };
@@ -741,14 +842,16 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           customerPaidAmount: summary.customerPaidAmount.plus(paymentRecord.amount || 0),
           orderPaidAmount: summary.orderPaidAmount.plus(paymentRecord.origin_amount || 0),
           gapPaidAmount: summary.gapPaidAmount.plus(this.calculatePaymentGapAmount(paymentRecord)),
-          payServiceChargeAmount: summary.payServiceChargeAmount.plus(this.calculatePaymentServiceFee(paymentRecord))
+          payServiceChargeAmount: summary.payServiceChargeAmount.plus(this.calculatePaymentServiceFee(paymentRecord)),
+          roundingAmount: summary.roundingAmount.plus(this.calculatePaymentRoundingAmount(paymentRecord))
         };
       },
       {
         customerPaidAmount: new import_decimal.default(0),
         orderPaidAmount: new import_decimal.default(0),
         gapPaidAmount: new import_decimal.default(0),
-        payServiceChargeAmount: new import_decimal.default(0)
+        payServiceChargeAmount: new import_decimal.default(0),
+        roundingAmount: new import_decimal.default(0)
       }
     );
   }
@@ -768,6 +871,12 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const rounding = new import_decimal.default(payment.rounding_amount || 0);
     return new import_decimal.default(payment.origin_amount || 0).minus(rounding);
   }
+  calculatePaymentRoundingAmount(payment) {
+    if (payment.rounding_amount === void 0 || payment.rounding_amount === null || payment.rounding_amount === "") {
+      return new import_decimal.default(0);
+    }
+    return new import_decimal.default(payment.rounding_amount || 0);
+  }
   formatSummaryMetadataMoney(value) {
     if (value === void 0 || value === null || value === "")
       return void 0;
@@ -834,7 +943,219 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   calculatePaymentTargetAmount(tempOrder, summary) {
     const depositAmount = summary.deposit_amount || tempOrder.deposit_amount || "0.00";
     const isDeposit = tempOrder.is_deposit === 1 || new import_decimal.default(depositAmount || 0).gt(0);
-    return isDeposit ? new import_decimal.default(depositAmount || 0) : new import_decimal.default(summary.total_amount || summary.expect_amount || 0);
+    return isDeposit ? new import_decimal.default(depositAmount || 0) : new import_decimal.default(summary.expect_amount || summary.total_amount || 0);
+  }
+  normalizeFingerprintMoney(value) {
+    if (value === void 0 || value === null || value === "")
+      return "";
+    try {
+      const parsed = new import_decimal.default(String(value || 0));
+      return parsed.toFixed(4);
+    } catch {
+      return String(value);
+    }
+  }
+  normalizeFingerprintValue(value) {
+    if (Array.isArray(value)) {
+      return value.map((item) => this.normalizeFingerprintValue(item));
+    }
+    if (!value || typeof value !== "object")
+      return value ?? "";
+    return Object.keys(value).sort().reduce((result, key) => {
+      result[key] = this.normalizeFingerprintValue(value[key]);
+      return result;
+    }, {});
+  }
+  buildProductFingerprintItem(product) {
+    const sku = (product == null ? void 0 : product.product_sku) || {};
+    const metadata = (product == null ? void 0 : product.metadata) || {};
+    const discountTypes = ((product == null ? void 0 : product.discount_list) || []).map((discount) => (discount == null ? void 0 : discount.type) ?? (discount == null ? void 0 : discount.tag));
+    const extensionType = (product == null ? void 0 : product.extension_type) || (discountTypes.includes("good_pass") ? "good_pass" : "normal");
+    return {
+      product_id: (product == null ? void 0 : product.product_id) ?? null,
+      product_variant_id: (product == null ? void 0 : product.product_variant_id) ?? null,
+      extension_type: extensionType,
+      num: (0, import_utils3.getSafeProductNum)((product == null ? void 0 : product.num) ?? (product == null ? void 0 : product.product_quantity)),
+      selling_price: this.normalizeFingerprintMoney(product == null ? void 0 : product.selling_price),
+      original_price: this.normalizeFingerprintMoney(product == null ? void 0 : product.original_price),
+      payment_price: this.normalizeFingerprintMoney((product == null ? void 0 : product.payment_price) ?? (product == null ? void 0 : product.selling_price)),
+      metadata: {
+        source_product_price: this.normalizeFingerprintMoney(metadata.source_product_price),
+        main_product_selling_price: this.normalizeFingerprintMoney(metadata.main_product_selling_price),
+        main_product_original_price: this.normalizeFingerprintMoney(metadata.main_product_original_price),
+        product_discount_difference: this.normalizeFingerprintMoney(metadata.product_discount_difference)
+      },
+      product_sku: this.normalizeFingerprintValue({
+        code: sku.code ?? "",
+        barcode: sku.barcode ?? "",
+        variant_id: sku.variant_id ?? (product == null ? void 0 : product.product_variant_id) ?? 0,
+        variant: sku.variant || [],
+        option: (0, import_utils.getProductSkuOptions)(product || {}).map((option) => ({
+          id: (option == null ? void 0 : option.id) ?? (option == null ? void 0 : option.option_group_item_id) ?? null,
+          option_group_id: (option == null ? void 0 : option.option_group_id) ?? null,
+          option_group_item_id: (option == null ? void 0 : option.option_group_item_id) ?? (option == null ? void 0 : option.id) ?? null,
+          num: Number((option == null ? void 0 : option.num) ?? 1) || 1,
+          add_price: this.normalizeFingerprintMoney((option == null ? void 0 : option.add_price) ?? (option == null ? void 0 : option.price))
+        }))
+      }),
+      product_bundle: this.normalizeFingerprintValue(((product == null ? void 0 : product.product_bundle) || []).map((bundle) => ({
+        bundle_product_id: (bundle == null ? void 0 : bundle.bundle_product_id) ?? (bundle == null ? void 0 : bundle._bundle_product_id) ?? (bundle == null ? void 0 : bundle.product_id) ?? null,
+        bundle_variant_id: (bundle == null ? void 0 : bundle.bundle_variant_id) ?? (bundle == null ? void 0 : bundle.product_variant_id) ?? 0,
+        num: (0, import_utils3.getSafeProductNum)((bundle == null ? void 0 : bundle.num) ?? (bundle == null ? void 0 : bundle.quantity)),
+        price: this.normalizeFingerprintMoney(bundle == null ? void 0 : bundle.price),
+        bundle_selling_price: this.normalizeFingerprintMoney(bundle == null ? void 0 : bundle.bundle_selling_price),
+        price_type: (bundle == null ? void 0 : bundle.price_type) ?? "",
+        price_type_ext: (bundle == null ? void 0 : bundle.price_type_ext) ?? ""
+      }))),
+      discount_list: this.normalizeFingerprintValue(((product == null ? void 0 : product.discount_list) || []).map((discount) => {
+        var _a;
+        return {
+          type: (discount == null ? void 0 : discount.type) ?? (discount == null ? void 0 : discount.tag) ?? "",
+          discount_id: (discount == null ? void 0 : discount.discount_id) ?? (discount == null ? void 0 : discount.order_discount_id) ?? ((_a = discount == null ? void 0 : discount.discount) == null ? void 0 : _a.resource_id) ?? null,
+          amount: this.normalizeFingerprintMoney(discount == null ? void 0 : discount.amount)
+        };
+      }))
+    };
+  }
+  buildOrderProductsFingerprint(products) {
+    const items = (products || []).map((product) => this.buildProductFingerprintItem(product));
+    items.sort((left, right) => JSON.stringify(left).localeCompare(JSON.stringify(right)));
+    return JSON.stringify(items);
+  }
+  buildProductStructuralFingerprintItem(product) {
+    const sku = (product == null ? void 0 : product.product_sku) || {};
+    const metadata = (product == null ? void 0 : product.metadata) || {};
+    const discountTypes = ((product == null ? void 0 : product.discount_list) || []).map((discount) => (discount == null ? void 0 : discount.type) ?? (discount == null ? void 0 : discount.tag));
+    const extensionType = (product == null ? void 0 : product.extension_type) || (discountTypes.includes("good_pass") ? "good_pass" : "normal");
+    return {
+      product_id: (product == null ? void 0 : product.product_id) ?? null,
+      product_variant_id: (product == null ? void 0 : product.product_variant_id) ?? null,
+      extension_type: extensionType,
+      num: (0, import_utils3.getSafeProductNum)((product == null ? void 0 : product.num) ?? (product == null ? void 0 : product.product_quantity)),
+      metadata: {
+        unique_identification_number: metadata.unique_identification_number ?? (product == null ? void 0 : product.unique_identification_number) ?? "",
+        price_override: metadata.price_override ?? "",
+        is_manual_discount: metadata.is_manual_discount ?? "",
+        product_discount_reason: metadata.product_discount_reason ?? ""
+      },
+      product_sku: this.normalizeFingerprintValue({
+        code: sku.code ?? "",
+        barcode: sku.barcode ?? "",
+        variant_id: sku.variant_id ?? (product == null ? void 0 : product.product_variant_id) ?? 0,
+        variant: sku.variant || [],
+        option: (0, import_utils.getProductSkuOptions)(product || {}).map((option) => ({
+          id: (option == null ? void 0 : option.id) ?? (option == null ? void 0 : option.option_group_item_id) ?? null,
+          option_group_id: (option == null ? void 0 : option.option_group_id) ?? null,
+          option_group_item_id: (option == null ? void 0 : option.option_group_item_id) ?? (option == null ? void 0 : option.id) ?? null,
+          num: Number((option == null ? void 0 : option.num) ?? 1) || 1,
+          add_price: this.normalizeFingerprintMoney((option == null ? void 0 : option.add_price) ?? (option == null ? void 0 : option.price))
+        }))
+      }),
+      product_bundle: this.normalizeFingerprintValue(((product == null ? void 0 : product.product_bundle) || []).map((bundle) => ({
+        bundle_id: (bundle == null ? void 0 : bundle.bundle_id) ?? (bundle == null ? void 0 : bundle.id) ?? null,
+        bundle_group_id: (bundle == null ? void 0 : bundle.bundle_group_id) ?? (bundle == null ? void 0 : bundle.group_id) ?? null,
+        bundle_product_id: (bundle == null ? void 0 : bundle.bundle_product_id) ?? (bundle == null ? void 0 : bundle._bundle_product_id) ?? (bundle == null ? void 0 : bundle.product_id) ?? null,
+        bundle_variant_id: (bundle == null ? void 0 : bundle.bundle_variant_id) ?? (bundle == null ? void 0 : bundle.product_variant_id) ?? 0,
+        num: (0, import_utils3.getSafeProductNum)((bundle == null ? void 0 : bundle.num) ?? (bundle == null ? void 0 : bundle.quantity)),
+        price_type: (bundle == null ? void 0 : bundle.price_type) ?? "",
+        price_type_ext: (bundle == null ? void 0 : bundle.price_type_ext) ?? "",
+        option: this.normalizeFingerprintValue(((bundle == null ? void 0 : bundle.option) || []).map((option) => ({
+          id: (option == null ? void 0 : option.id) ?? (option == null ? void 0 : option.option_group_item_id) ?? null,
+          option_group_id: (option == null ? void 0 : option.option_group_id) ?? null,
+          option_group_item_id: (option == null ? void 0 : option.option_group_item_id) ?? (option == null ? void 0 : option.id) ?? null,
+          num: Number((option == null ? void 0 : option.num) ?? 1) || 1,
+          add_price: this.normalizeFingerprintMoney((option == null ? void 0 : option.add_price) ?? (option == null ? void 0 : option.price))
+        })))
+      }))),
+      discount_list: this.normalizeFingerprintValue(((product == null ? void 0 : product.discount_list) || []).map((discount) => {
+        var _a;
+        return {
+          type: (discount == null ? void 0 : discount.type) ?? (discount == null ? void 0 : discount.tag) ?? "",
+          discount_id: (discount == null ? void 0 : discount.discount_id) ?? (discount == null ? void 0 : discount.order_discount_id) ?? ((_a = discount == null ? void 0 : discount.discount) == null ? void 0 : _a.resource_id) ?? null,
+          amount: this.normalizeFingerprintMoney(discount == null ? void 0 : discount.amount)
+        };
+      }))
+    };
+  }
+  buildOrderProductsStructuralFingerprint(products) {
+    const items = (products || []).map((product) => this.buildProductStructuralFingerprintItem(product));
+    items.sort((left, right) => JSON.stringify(left).localeCompare(JSON.stringify(right)));
+    return JSON.stringify(items);
+  }
+  getOriginalSalesSnapshot(tempOrder) {
+    var _a;
+    const snapshot = (_a = tempOrder._extend) == null ? void 0 : _a.originalSalesSnapshot;
+    if (!snapshot || typeof snapshot !== "object")
+      return null;
+    if (typeof snapshot.productFingerprint !== "string")
+      return null;
+    return snapshot;
+  }
+  restoreOriginalSnapshotIfProductsUnchanged(tempOrder) {
+    const snapshot = this.getOriginalSalesSnapshot(tempOrder);
+    if (!snapshot)
+      return null;
+    const currentFingerprint = this.buildOrderProductsFingerprint(tempOrder.products);
+    if (currentFingerprint !== snapshot.productFingerprint) {
+      const currentStructuralFingerprint = this.buildOrderProductsStructuralFingerprint(tempOrder.products);
+      const snapshotStructuralFingerprint = this.buildOrderProductsStructuralFingerprint(
+        Array.isArray(snapshot.products) ? snapshot.products : []
+      );
+      if (currentStructuralFingerprint !== snapshotStructuralFingerprint)
+        return null;
+    }
+    const summary = {
+      ...(0, import_utils.createEmptySummary)(),
+      ...(0, import_lodash_es.cloneDeep)(snapshot.summary || {})
+    };
+    if (Array.isArray(snapshot.products)) {
+      tempOrder.products = (0, import_lodash_es.cloneDeep)(snapshot.products);
+    }
+    if (Array.isArray(snapshot.surcharges)) {
+      tempOrder.surcharges = (0, import_lodash_es.cloneDeep)(snapshot.surcharges);
+    }
+    tempOrder.surcharge_fee = summary.surcharge_fee || tempOrder.surcharge_fee;
+    tempOrder.deposit_amount = summary.deposit_amount || "0.00";
+    tempOrder.is_deposit = summary.deposit_amount !== "0.00" ? 1 : 0;
+    this.store.summary = summary;
+    return summary;
+  }
+  clearPersistedAmountFieldsForFullRecalc(products) {
+    const moneyKeys = [
+      "surcharge_fee",
+      "main_product_attached_bundle_surcharge_fee",
+      "surcharge_rounding_remainder",
+      "main_product_attached_bundle_tax_fee",
+      "tax_fee",
+      "original_tax_fee",
+      "tax_fee_rounding_remainder",
+      "original_tax_fee_rounding_remainder"
+    ];
+    const metadataMoneyKeys = [
+      "main_product_attached_bundle_surcharge_fee",
+      "surcharge_rounding_remainder",
+      "main_product_attached_bundle_tax_fee",
+      "tax_fee_rounding_remainder"
+    ];
+    for (const product of products || []) {
+      const record = product;
+      for (const key of moneyKeys)
+        delete record[key];
+      if (record.metadata && typeof record.metadata === "object") {
+        record.metadata = { ...record.metadata };
+        for (const key of metadataMoneyKeys)
+          delete record.metadata[key];
+      }
+      for (const bundle of record.product_bundle || []) {
+        for (const key of moneyKeys)
+          delete bundle[key];
+        if (bundle.metadata && typeof bundle.metadata === "object") {
+          bundle.metadata = { ...bundle.metadata };
+          for (const key of metadataMoneyKeys)
+            delete bundle.metadata[key];
+        }
+      }
+    }
   }
   getPaymentTargetAmount() {
     const tempOrder = this.ensureTempOrder();
@@ -1092,6 +1413,14 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if (!tempOrder)
       return null;
     this.sanitizeTempOrderProducts(tempOrder);
+    const snapshotSummary = this.restoreOriginalSnapshotIfProductsUnchanged(tempOrder);
+    if (snapshotSummary)
+      return snapshotSummary;
+    const shouldFullRecalculateFromSnapshot = Boolean(this.getOriginalSalesSnapshot(tempOrder));
+    const summaryProducts = shouldFullRecalculateFromSnapshot ? (0, import_lodash_es.cloneDeep)(tempOrder.products || []) : tempOrder.products;
+    if (shouldFullRecalculateFromSnapshot) {
+      this.clearPersistedAmountFieldsForFullRecalc(summaryProducts || []);
+    }
     const salesSummary = this.getSalesSummary();
     const existedSummary = this.store.summary || (0, import_utils.createEmptySummary)();
     const totalRefundAmount = existedSummary.total_refund_amount || "0.00";
@@ -1112,7 +1441,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           summary: emptyBaseSummary,
           orderPaidAmount: paidPaymentSummary.gapPaidAmount
         }),
-        pay_service_charge_amount: paidPaymentSummary.payServiceChargeAmount.toFixed(2)
+        pay_service_charge_amount: paidPaymentSummary.payServiceChargeAmount.toFixed(2),
+        rounding_amount: paidPaymentSummary.roundingAmount.toFixed(2)
       };
       tempOrder.surcharge_fee = emptySummary.surcharge_fee;
       this.store.summary = emptySummary;
@@ -1123,26 +1453,47 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return this.store.summary;
     }
     const salesSummaryResult = await salesSummary.getSummary({
-      products: tempOrder.products,
+      products: summaryProducts,
       isPriceIncludeTax: tempOrder.is_price_include_tax,
       shopDiscount: tempOrder.shop_discount
     });
+    if (shouldFullRecalculateFromSnapshot) {
+      tempOrder.products = summaryProducts;
+    }
     this.syncSummaryProductMetadata(tempOrder.products || []);
+    const roundingAmount = paidPaymentSummary.roundingAmount;
+    const payServiceChargeAmount = paidPaymentSummary.payServiceChargeAmount;
+    const hasSalesSummaryAmount = salesSummaryResult.expect_amount !== void 0 || salesSummaryResult.total_amount !== void 0;
+    const expectAmount = hasSalesSummaryAmount ? new import_decimal.default(salesSummaryResult.expect_amount ?? salesSummaryResult.total_amount ?? 0) : null;
+    const amountPaymentPatch = hasSalesSummaryAmount || !roundingAmount.eq(0) || !payServiceChargeAmount.eq(0) ? {
+      rounding_amount: roundingAmount.toFixed(2),
+      ...expectAmount ? {
+        total_amount: import_decimal.default.max(
+          0,
+          expectAmount.plus(roundingAmount).plus(payServiceChargeAmount)
+        ).toFixed(2)
+      } : {}
+    } : {};
+    const normalizedExpectAmountPatch = expectAmount && salesSummaryResult.expect_amount === void 0 ? { expect_amount: expectAmount.toFixed(2) } : {};
     const summaryForGap = {
       ...salesSummaryResult,
-      total_refund_amount: totalRefundAmount
+      total_refund_amount: totalRefundAmount,
+      ...amountPaymentPatch,
+      ...normalizedExpectAmountPatch
     };
     const summary = {
       ...salesSummaryResult,
       total_refund_amount: totalRefundAmount,
       customer_paid_amount: paidPaymentSummary.customerPaidAmount.toFixed(2),
       order_paid_amount: paidPaymentSummary.orderPaidAmount.toFixed(2),
+      ...amountPaymentPatch,
+      ...normalizedExpectAmountPatch,
       amount_gap: this.calculateSummaryAmountGap({
         tempOrder,
         summary: summaryForGap,
         orderPaidAmount: paidPaymentSummary.gapPaidAmount
       }),
-      pay_service_charge_amount: paidPaymentSummary.payServiceChargeAmount.toFixed(2)
+      pay_service_charge_amount: payServiceChargeAmount.toFixed(2)
     };
     this.store.summary = summary;
     if (summary.is_price_include_tax !== void 0) {
@@ -1226,6 +1577,49 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       email: String(source.email ?? params.email)
     };
   }
+  isCustomerBoundDiscount(discount) {
+    const type = (discount == null ? void 0 : discount.type) ?? (discount == null ? void 0 : discount.tag);
+    return type === "good_pass" || type === "discount_card" || type === "product_discount_card";
+  }
+  clearCustomerBoundDiscounts(tempOrder) {
+    var _a, _b, _c, _d;
+    const filterDiscountList = (discountList) => {
+      if (!Array.isArray(discountList))
+        return [];
+      return discountList.filter((discount) => !this.isCustomerBoundDiscount(discount));
+    };
+    tempOrder.products = (tempOrder.products || []).map((product) => {
+      const nextProduct = {
+        ...product,
+        discount_list: filterDiscountList(product.discount_list)
+      };
+      if (Array.isArray(nextProduct.product_bundle)) {
+        nextProduct.product_bundle = nextProduct.product_bundle.map((bundle) => ({
+          ...bundle,
+          discount_list: filterDiscountList(bundle.discount_list)
+        }));
+      }
+      return nextProduct;
+    });
+    delete tempOrder.discount_list;
+    const discountModule = this.store.discount;
+    if (!discountModule)
+      return;
+    const currentDiscounts = ((_a = discountModule.getDiscountList) == null ? void 0 : _a.call(discountModule)) || [];
+    const currentOriginalDiscounts = ((_b = discountModule.getOriginalDiscountList) == null ? void 0 : _b.call(discountModule)) || [];
+    const nextDiscounts = currentDiscounts.filter((discount) => {
+      if (discount == null ? void 0 : discount.isEditMode)
+        return true;
+      return !this.isCustomerBoundDiscount(discount);
+    });
+    const nextOriginalDiscounts = currentOriginalDiscounts.filter((discount) => {
+      if (discount == null ? void 0 : discount.isEditMode)
+        return true;
+      return !this.isCustomerBoundDiscount(discount);
+    });
+    void ((_c = discountModule.setDiscountList) == null ? void 0 : _c.call(discountModule, nextDiscounts));
+    void ((_d = discountModule.setOriginalDiscountList) == null ? void 0 : _d.call(discountModule, nextOriginalDiscounts));
+  }
   /**
    * 更新当前 tempOrder 的客户协议字段。
    *
@@ -1234,6 +1628,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    */
   updateTempOrderCustomer(customer) {
     const tempOrder = this.ensureTempOrder();
+    const previousCustomerId = tempOrder.customer_id ?? null;
     const customerId = customer.customer_id ?? customer.customerId ?? customer.id ?? null;
     const customerName = customer.customer_name ?? customer.customerName ?? customer.display_name ?? customer.name ?? "";
     tempOrder.customer_id = customerId === null || customerId === void 0 || customerId === "" ? null : Number(customerId);
@@ -1251,6 +1646,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       phone: tempOrder.phone,
       email: tempOrder.email
     });
+    const nextCustomerId = tempOrder.customer_id ?? null;
     this.persistTempOrder();
     return {
       customerId: tempOrder.customer_id,
@@ -1289,6 +1685,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const nextCustomerId = tempOrder.customer_id ?? null;
     if (String(previousCustomerId ?? "") !== String(nextCustomerId ?? "")) {
       (0, import_utils.clearTempOrderHolderAssignments)(tempOrder);
+      this.clearCustomerBoundDiscounts(tempOrder);
     }
     this.persistTempOrder();
     this.saveDraftInBackground();
@@ -1325,6 +1722,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     tempOrder.customer = null;
     if (tempOrder._extend)
       delete tempOrder._extend.customerSnapshot;
+    this.clearCustomerBoundDiscounts(tempOrder);
     this.persistTempOrder();
     this.saveDraftInBackground();
     this.core.effects.emit(import_types.OrderHooks.OnOrderCustomerChange, null);
@@ -1447,7 +1845,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const tempOrder = this.ensureTempOrder();
     const mappedVouchers = (0, import_utils.mapPaymentItemsToOrderPayments)(
       payments.map(
-        (payment) => this.normalizePaymentSource(payment, { defaultPaid: false })
+        (payment) => this.normalizePaymentSource(payment, { defaultPaid: true })
       )
     ).filter((payment) => {
       return payment.voucher_id !== void 0 && Number(payment.voucher_id) !== 0;
@@ -1610,6 +2008,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if (linked) {
       tempOrder.bookings = [...tempOrder.bookings || [], linked.booking];
     }
+    await this.ensureEditDiscountConfigForProductChange(tempOrder);
     await this.applyPromotion();
     this.applyDiscount();
     this.sanitizeTempOrderProducts(tempOrder);
@@ -1635,6 +2034,44 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       (item) => (item == null ? void 0 : item.type) === "good_pass" || (item == null ? void 0 : item.tag) === "good_pass"
     );
   }
+  getBundleRuntimeIdentity(bundle) {
+    if (!bundle || typeof bundle !== "object")
+      return "";
+    return [
+      bundle.bundle_id ?? bundle.id ?? "",
+      bundle.bundle_group_id ?? bundle.group_id ?? "",
+      bundle.bundle_product_id ?? bundle._bundle_product_id ?? bundle.product_id ?? "",
+      bundle.bundle_variant_id ?? bundle.product_variant_id ?? 0
+    ].join("|");
+  }
+  preservePersistedBundlePriceFields(previousBundles, nextBundles) {
+    if (!Array.isArray(nextBundles))
+      return nextBundles;
+    if (!Array.isArray(previousBundles) || previousBundles.length === 0)
+      return nextBundles;
+    const previousByIdentity = /* @__PURE__ */ new Map();
+    previousBundles.forEach((bundle) => {
+      const identity = this.getBundleRuntimeIdentity(bundle);
+      if (identity)
+        previousByIdentity.set(identity, bundle);
+    });
+    return nextBundles.map((bundle, index) => {
+      if (!bundle || typeof bundle !== "object")
+        return bundle;
+      const previous = previousByIdentity.get(this.getBundleRuntimeIdentity(bundle)) || previousBundles[index];
+      if (!previous || typeof previous !== "object")
+        return bundle;
+      return {
+        ...bundle,
+        price: previous.price,
+        custom_price: previous.custom_price,
+        bundle_payment_price: previous.bundle_payment_price,
+        bundle_selling_price: previous.bundle_selling_price,
+        original_price: previous.original_price,
+        product_price: previous.product_price
+      };
+    });
+  }
   async updateOrderProduct(params) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
     const {
@@ -1715,6 +2152,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         main_product_original_price: (_k = targetProduct.metadata) == null ? void 0 : _k.main_product_original_price,
         price_schema_version: ((_l = targetProduct.metadata) == null ? void 0 : _l.price_schema_version) ?? 2
       };
+      nextProduct.product_bundle = this.preservePersistedBundlePriceFields(
+        targetProduct.product_bundle,
+        nextProduct.product_bundle
+      );
     } else if (callerUpdatesTopPrice && !callerUpdatesMainMeta) {
       const existedMeta = nextProduct.metadata || {};
       nextProduct.metadata = { ...existedMeta };
@@ -2380,11 +2821,25 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * 例如数组字段、商品行唯一值、价格 metadata、summary 派生状态和 _extend。
    */
   async hydrateTempOrderFromRecord(record, options) {
+    var _a, _b;
     const raw = record && typeof record === "object" && record.data && record.order_id == null ? record.data : record || {};
     const nextTempOrder = this.normalizeTempOrderForRuntime(raw);
     this.store.tempOrder = nextTempOrder;
     this.store.summary = raw.summary && typeof raw.summary === "object" ? { ...(0, import_utils.createEmptySummary)(), ...raw.summary } : (0, import_utils.createEmptySummary)();
+    nextTempOrder._extend = {
+      ...nextTempOrder._extend || {},
+      originalSalesSnapshot: {
+        summary: (0, import_lodash_es.cloneDeep)(this.store.summary),
+        products: (0, import_lodash_es.cloneDeep)(nextTempOrder.products || []),
+        payments: (0, import_lodash_es.cloneDeep)(nextTempOrder.payments || []),
+        surcharges: (0, import_lodash_es.cloneDeep)(nextTempOrder.surcharges || []),
+        productFingerprint: this.buildOrderProductsFingerprint(nextTempOrder.products || [])
+      }
+    };
     this.store.lastOrderInfo = raw.lastOrderInfo || raw;
+    const hydratedEditDiscounts = this.collectHydratedEditDiscounts(nextTempOrder.products);
+    await ((_a = this.store.discount) == null ? void 0 : _a.setOriginalDiscountList(hydratedEditDiscounts));
+    await ((_b = this.store.discount) == null ? void 0 : _b.setDiscountList(hydratedEditDiscounts));
     if (options == null ? void 0 : options.recalcOnHydrate) {
       await this.recalculateSummary({ createIfMissing: false });
     }

package/lib/modules/Payment/walletpass.js

@@ -296,18 +296,22 @@ var WalletPassPaymentImpl = class {
     return (0, import_utils.formatWalletPassList2PreparePayments)(list);
   }
   async getUserIdentificationCodeListAsync(params) {
-    var _a, _b;
+    var _a, _b, _c;
     try {
       const newParams = {
         ...this.walletParams,
         ...params
       };
+      if (!((_a = newParams.products) == null ? void 0 : _a.length)) {
+        this.paymentModule.logInfo("[WalletPass] 商品列表为空，跳过获取用户识别码列表");
+        return [];
+      }
       this.paymentModule.logInfo("[WalletPass] 开始获取用户识别码列表", {
         customer_id: newParams.customer_id,
         available: newParams.available,
-        prepare_payments_count: ((_a = newParams.prepare_payments) == null ? void 0 : _a.length) || 0,
+        prepare_payments_count: ((_b = newParams.prepare_payments) == null ? void 0 : _b.length) || 0,
         filter_prepare_wallet_pass: newParams.filter_prepare_wallet_pass,
-        payment_order_id: (_b = this.walletParams) == null ? void 0 : _b.payment_order_id
+        payment_order_id: (_c = this.walletParams) == null ? void 0 : _c.payment_order_id
       });
       const response = await this.paymentModule.request.post(
         "/machinecode/prepare/deduction",