@pisell/pisellos 2.1.24 → 2.1.26

package/lib/solution/Checkout/index.js

@@ -40,6 +40,7 @@ var import_Payment = require("../../modules/Payment");
 var import_types = require("./types");
 var import_types2 = require("../../modules/Payment/types");
 var import_utils = require("./utils");
+var import_utils2 = require("../../modules/Cart/utils");
 __reExport(Checkout_exports, require("./types"), module.exports);
 var CheckoutImpl = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
@@ -221,7 +222,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
     return [...productList, ...relationProducts];
   }
   async initWalletData(params) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f, _g;
     this.logInfo("initWalletData called", {
       params
     });
@@ -236,11 +237,16 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       customer_id: ((_c = this.store.currentCustomer) == null ? void 0 : _c.customer_id) ? Number(this.store.currentCustomer.customer_id) : void 0,
       amountInfo: {
         totalAmount: amountInfo.totalAmount,
-        subTotal: amountInfo.subTotal
+        subTotal: amountInfo.subTotal,
+        depositAmount: (_d = this.store.currentOrder) == null ? void 0 : _d.deposit_amount,
+        isDeposit: (_e = this.store.currentOrder) == null ? void 0 : _e.is_deposit
       },
       products: this.getProductListByOrder(),
       ...params
     };
+    if (this.store.isOrderSynced) {
+      walletBusinessData.payment_order_id = (_f = this.store.currentOrder) == null ? void 0 : _f.order_id;
+    }
     this.logInfo("开始拉取:initializeWalletDataFromBusinessAsync", {
       walletBusinessData
     });
@@ -257,7 +263,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       currentOrder: this.store.currentOrder
     });
     await this.core.effects.emit(import_types.CheckoutHooks.OnWalletDataInitialized, {
-      orderUuid: (_d = this.store.currentOrder) == null ? void 0 : _d.uuid,
+      orderUuid: (_g = this.store.currentOrder) == null ? void 0 : _g.uuid,
       customerId: walletBusinessData.customer_id,
       walletBusinessData: {
         customer_id: walletBusinessData.customer_id,
@@ -267,6 +273,57 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       timestamp: Date.now()
     });
   }
+  checkIsNeedDepositAsync(bookings, relationProducts) {
+    const summaryDeposit = {
+      total: 0,
+      protocols: [],
+      hasDeposit: false
+    };
+    bookings == null ? void 0 : bookings.forEach((item) => {
+      const total = item.product.calculated_selling_price;
+      const deposit = (0, import_utils2.getProductDeposit)({
+        cartItem: {
+          total
+        },
+        product: item.product,
+        bundle: item.bundle,
+        options: item.options,
+        num: item.num
+      });
+      item.deposit = deposit;
+      if ((deposit == null ? void 0 : deposit.total) && Number(deposit.total) > 0) {
+        summaryDeposit.protocols = summaryDeposit.protocols.concat(
+          deposit.protocols
+        );
+        summaryDeposit.total = new import_decimal.default(summaryDeposit.total).plus(deposit.total).toNumber();
+        summaryDeposit.hasDeposit = true;
+      }
+    });
+    relationProducts == null ? void 0 : relationProducts.forEach((item) => {
+      const deposit = (0, import_utils2.getProductDeposit)({
+        cartItem: {
+          total: item.price * item.num
+        },
+        product: item,
+        bundle: item.product_bundle,
+        options: item.product_option_item,
+        num: item.num
+      });
+      item.deposit = deposit;
+      if ((deposit == null ? void 0 : deposit.total) && Number(deposit.total) > 0) {
+        summaryDeposit.total = new import_decimal.default(summaryDeposit.total).plus(deposit.total).toNumber();
+        item.discount_list.forEach((discount) => {
+          summaryDeposit.total = new import_decimal.default(summaryDeposit.total).minus(discount.amount || 0).toNumber();
+        });
+        summaryDeposit.protocols = summaryDeposit.protocols.concat(
+          deposit.protocols
+        );
+        summaryDeposit.hasDeposit = true;
+      }
+    });
+    summaryDeposit.total = new import_decimal.default(summaryDeposit.total).toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).toNumber();
+    return summaryDeposit;
+  }
   /**
    * 创建本地订单 (前端模拟下单流程)
    *
@@ -316,11 +373,15 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         this.store.currentCustomer = void 0;
         console.log("[Checkout] 未提供客户信息");
       }
+      const isNeedDeposit = this.checkIsNeedDepositAsync(
+        params.orderData.bookings,
+        params.orderData.relation_products
+      );
       const paymentOrder = await this.payment.createPaymentOrderAsync({
         order_id: localOrderId,
         total_amount: amountInfo.totalAmount,
-        is_deposit: params.orderData.is_deposit || 0,
-        deposit_amount: amountInfo.depositAmount || "0.00",
+        is_deposit: isNeedDeposit.hasDeposit ? 1 : 0,
+        deposit_amount: isNeedDeposit.total ? isNeedDeposit.total.toString() : "0.00",
         order_info: {
           original_order_data: params.orderData,
           cart_summary: params.cartSummary,
@@ -339,7 +400,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         order: paymentOrder,
         timestamp: Date.now()
       });
-      await this.updateStateAmountToRemaining();
+      await this.updateStateAmountToRemaining(false);
       this.logInfo("本地订单创建成功:", {
         localOrderId,
         uuid: paymentOrder.uuid,
@@ -363,6 +424,141 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       throw error;
     }
   }
+  /**
+   * 更新本地订单（已同步后端的订单）并设置为当前订单
+   *
+   * 通过传入真实的 orderId，对已缓存的订单数据进行更新，
+   * 会覆盖 order_info 与金额等字段，并重新计算待付金额，最后设置为 currentOrder。
+   */
+  async updateLocalOrderAsync(params) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+    this.logInfo("updateLocalOrderAsync called", {
+      orderId: params.orderId,
+      orderDataType: (_a = params.orderData) == null ? void 0 : _a.type,
+      bookingsCount: ((_c = (_b = params.orderData) == null ? void 0 : _b.bookings) == null ? void 0 : _c.length) || 0,
+      cartSummaryCount: ((_d = params.cartSummary) == null ? void 0 : _d.length) || 0,
+      totalInfoKeys: params.totalInfo ? Object.keys(params.totalInfo) : []
+    });
+    const validation = (0, import_utils.validateLocalOrderData)(params.orderData);
+    if (!validation.valid) {
+      throw (0, import_utils.createCheckoutError)(
+        import_types.CheckoutErrorType.ValidationFailed,
+        `订单数据验证失败: ${validation.errors.join(", ")}`
+      );
+    }
+    const amountInfo = (0, import_utils.extractAmountFromCartSummary)(params.cartSummary);
+    params.orderData.created_at = (0, import_utils.formatDateTime)(/* @__PURE__ */ new Date());
+    params.orderData.platform = "pos";
+    params.orderData.surcharge_fee = (_f = (_e = params.totalInfo) == null ? void 0 : _e.total) == null ? void 0 : _f.otherAmount;
+    params.orderData.surcharges = (_h = (_g = params.totalInfo) == null ? void 0 : _g.total) == null ? void 0 : _h.surcharge;
+    params.orderData.shop_discount = (_j = (_i = params.totalInfo) == null ? void 0 : _i.total) == null ? void 0 : _j.shopDiscount;
+    params.orderData.tax_fee = (_l = (_k = params.totalInfo) == null ? void 0 : _k.total) == null ? void 0 : _l.tax;
+    this.store.localOrderData = params.orderData;
+    this.store.cartSummary = params.cartSummary;
+    const customerInfo = {
+      customer_id: params.orderData.customer_id,
+      customer_name: params.orderData.customer_name
+    };
+    if (customerInfo.customer_id || customerInfo.customer_name) {
+      this.store.currentCustomer = customerInfo;
+    } else {
+      this.store.currentCustomer = void 0;
+    }
+    const allOrders = await this.payment.getOrderListAsync();
+    const existingOrder = allOrders.find(
+      (o) => String(o.id) === String(params.orderId) || String(o.order_id) === String(params.orderId)
+    );
+    if (existingOrder) {
+      const totalAmount = new import_decimal.default(amountInfo.totalAmount || "0");
+      const activePayments = (existingOrder.payment || []).filter(
+        (p) => p.status !== "voided"
+      );
+      const paidAmount = activePayments.reduce((sum, p) => {
+        const amt = new import_decimal.default(p.amount || "0");
+        const rounding = new import_decimal.default(p.rounding_amount || "0").abs();
+        return sum.plus(amt).plus(rounding);
+      }, new import_decimal.default(0));
+      const remaining = import_decimal.default.max(0, totalAmount.minus(paidAmount)).toFixed(
+        2
+      );
+      const isNeedDeposit2 = this.checkIsNeedDepositAsync(
+        params.orderData.bookings,
+        params.orderData.relation_products
+      );
+      await this.payment.updateOrderAsync(existingOrder.uuid, {
+        total_amount: amountInfo.totalAmount,
+        is_deposit: isNeedDeposit2.hasDeposit ? 1 : 0,
+        deposit_amount: isNeedDeposit2.total ? isNeedDeposit2.total.toString() : "0.00",
+        expect_amount: remaining,
+        order_info: {
+          original_order_data: params.orderData,
+          cart_summary: params.cartSummary,
+          created_at: (/* @__PURE__ */ new Date()).toISOString(),
+          platform: params.orderData.platform,
+          type: params.orderData.type,
+          schedule_date: params.orderData.schedule_date,
+          shop_note: params.orderData.shop_note,
+          amount_breakdown: amountInfo
+        }
+      });
+      const updated = await this.payment.getPaymentOrderByUuidAsync(
+        existingOrder.uuid
+      );
+      if (!updated)
+        throw (0, import_utils.createCheckoutError)(
+          import_types.CheckoutErrorType.UnknownError,
+          "订单更新失败"
+        );
+      this.store.currentOrder = updated;
+      await this.updateStateAmountToRemaining(false);
+      this.logInfo("本地订单更新成功(保留支付项):", {
+        orderId: params.orderId,
+        uuid: updated.uuid,
+        payments: ((_m = updated.payment) == null ? void 0 : _m.length) || 0,
+        totalAmount: updated.total_amount,
+        expectAmount: updated.expect_amount
+      });
+      await this.core.effects.emit(import_types.CheckoutHooks.OnOrderCreated, {
+        order: updated,
+        timestamp: Date.now()
+      });
+      const syncedAmount = activePayments.reduce((sum, p) => {
+        const amt = new import_decimal.default(p.amount || "0");
+        const rounding = new import_decimal.default(p.rounding_amount || "0").abs();
+        return sum.plus(amt).plus(rounding);
+      }, new import_decimal.default(0));
+      const remainingExpectAmount = import_decimal.default.max(0, totalAmount.minus(syncedAmount)).toFixed(
+        2
+      );
+      this.initWalletData({
+        order_wait_pay_amount: Number(remainingExpectAmount)
+      });
+      return updated;
+    }
+    const isNeedDeposit = this.checkIsNeedDepositAsync(
+      params.orderData.bookings,
+      params.orderData.relation_products
+    );
+    const created = await this.payment.createPaymentOrderAsync({
+      order_id: String(params.orderId),
+      total_amount: amountInfo.totalAmount,
+      is_deposit: isNeedDeposit.hasDeposit ? 1 : 0,
+      deposit_amount: isNeedDeposit.total ? isNeedDeposit.total.toString() : "0.00",
+      order_info: {
+        original_order_data: params.orderData,
+        cart_summary: params.cartSummary,
+        created_at: (/* @__PURE__ */ new Date()).toISOString(),
+        platform: params.orderData.platform,
+        type: params.orderData.type,
+        schedule_date: params.orderData.schedule_date,
+        shop_note: params.orderData.shop_note,
+        amount_breakdown: amountInfo
+      }
+    });
+    this.store.currentOrder = created;
+    this.initWalletData();
+    return created;
+  }
   /**
    * 完成结账
    */
@@ -504,7 +700,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           newOrderId: updatedOrder.id
         });
         this.store.isOrderSynced = true;
-        await this.updateStateAmountToRemaining();
+        await this.updateStateAmountToRemaining(false);
       }
       return updatedOrder;
     } catch (error) {
@@ -687,7 +883,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           }
         }
       }
-      await this.core.effects.emit(import_types.CheckoutHooks.OnPaymentItemAdded, {
+      this.core.effects.emit(import_types.CheckoutHooks.OnPaymentItemAdded, {
         orderUuid: this.store.currentOrder.uuid,
         paymentMethodCode: paymentItem.code,
         paymentMethodName: paymentItem.name,
@@ -762,7 +958,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         }
         this.store.currentOrder = updatedOrder;
       }
-      await this.updateStateAmountToRemaining();
+      await this.updateStateAmountToRemaining(false);
       await this.core.effects.emit(import_types.CheckoutHooks.OnPaymentStarted, {
         orderUuid: this.store.currentOrder.uuid,
         paymentMethodCode: paymentItem.code,
@@ -794,10 +990,14 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           "当前没有活跃订单，无法更新代金券支付项"
         );
       }
+      const paymentItems = await this.payment.getPaymentItemsAsync(
+        this.store.currentOrder.uuid
+      );
+      const allPaymentItemsSynced = paymentItems.every((item) => item.isSynced);
       const remainingAmount = await this.calculateRemainingAmountAsync();
       const remainingValue = new import_decimal.default(remainingAmount);
       const isOrderSynced = this.store.isOrderSynced;
-      if (remainingValue.lte(0) && isOrderSynced && voucherPaymentItems.length === 0) {
+      if (remainingValue.lte(0) && isOrderSynced && voucherPaymentItems.length === 0 && allPaymentItemsSynced) {
         this.logInfo("订单已同步且支付完成，跳过清空代金券操作避免重复同步:", {
           orderUuid: this.store.currentOrder.uuid,
           orderId: this.store.currentOrder.order_id,
@@ -852,7 +1052,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         }
         this.store.currentOrder = updatedOrder;
       }
-      await this.updateStateAmountToRemaining();
+      await this.updateStateAmountToRemaining(false);
       await this.core.effects.emit(import_types.CheckoutHooks.OnPaymentStarted, {
         orderUuid: this.store.currentOrder.uuid,
         paymentMethodCode: "VOUCHER_BATCH",
@@ -894,13 +1094,14 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         console.log("[Checkout] 定金状态无变化，跳过更新");
         return;
       }
+      let deposit_amount = newDepositValue === 1 ? this.store.currentOrder.deposit_amount : "0.00";
+      if (!deposit_amount || Number(deposit_amount) === 0) {
+        deposit_amount = this.store.currentOrder.expect_amount;
+      }
       const updateParams = {
-        is_deposit: newDepositValue
+        is_deposit: newDepositValue,
+        deposit_amount
       };
-      if (isDeposit === 0 && this.store.currentOrder.deposit_amount !== "0.00") {
-        updateParams.deposit_amount = "0.00";
-        this.logInfo("订单从定金改为全款，清空定金金额");
-      }
       await this.payment.updateOrderAsync(
         this.store.currentOrder.uuid,
         updateParams
@@ -912,6 +1113,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       if (this.store.localOrderData) {
         this.store.localOrderData.is_deposit = newDepositValue;
       }
+      this.updateStateAmountToRemaining(false);
       await this.core.effects.emit(import_types.CheckoutHooks.OnOrderCreated, {
         order: this.store.currentOrder,
         timestamp: Date.now()
@@ -960,13 +1162,6 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           "未找到当前订单，无法设置定金金额"
         );
       }
-      const totalAmount = new import_decimal.default(this.store.currentOrder.total_amount || "0");
-      if (depositValue.gt(totalAmount)) {
-        throw (0, import_utils.createCheckoutError)(
-          import_types.CheckoutErrorType.ValidationFailed,
-          `定金金额 ${depositAmount} 不能超过订单总额 ${totalAmount.toFixed(2)}`
-        );
-      }
       const formattedDepositAmount = depositValue.toFixed(2);
       const oldDepositAmount = this.store.currentOrder.deposit_amount || "0.00";
       if (formattedDepositAmount === oldDepositAmount) {
@@ -981,7 +1176,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         orderId: this.store.currentOrder.order_id,
         oldDepositAmount,
         newDepositAmount: formattedDepositAmount,
-        totalAmount: totalAmount.toFixed(2)
+        totalAmount: this.store.currentOrder.total_amount
       });
       const updateParams = {
         deposit_amount: formattedDepositAmount
@@ -1009,6 +1204,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           this.store.localOrderData.is_deposit = updateParams.is_deposit;
         }
       }
+      this.updateStateAmountToRemaining(false);
       await this.core.effects.emit(import_types.CheckoutHooks.OnOrderCreated, {
         order: this.store.currentOrder,
         timestamp: Date.now()
@@ -1036,7 +1232,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
    * 用于强制同步订单到后端，特别适用于纯代金券支付完成的订单
    */
   async manualSyncOrderAsync() {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     this.logInfo("manualSyncOrderAsync called", {
       hasCurrentOrder: !!this.store.currentOrder,
       currentOrderId: (_a = this.store.currentOrder) == null ? void 0 : _a.order_id,
@@ -1081,14 +1277,19 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           "[Checkout] 严重警告：返回的订单ID与存储的订单ID不一致！"
         );
       }
-      return syncResult;
+      let newRes = {
+        ...syncResult,
+        is_deposit: ((_d = this.store.currentOrder) == null ? void 0 : _d.is_deposit) || 0
+      };
+      await this.updateStateAmountToRemaining(false);
+      return newRes;
     } catch (error) {
       this.logError("手动同步订单失败:", error);
       const errorMessage = error instanceof Error ? error.message : "同步失败";
       return {
         success: false,
         message: `订单同步失败: ${errorMessage}`,
-        orderUuid: (_d = this.store.currentOrder) == null ? void 0 : _d.uuid
+        orderUuid: (_e = this.store.currentOrder) == null ? void 0 : _e.uuid
       };
     }
   }
@@ -1599,9 +1800,13 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       this.logWarning("calculateRemainingAmountAsync: 没有当前订单");
       return "0.00";
     }
-    const totalAmount = new import_decimal.default(
-      this.store.currentOrder.total_amount || "0"
+    let totalAmount = new import_decimal.default(this.store.currentOrder.total_amount || "0");
+    const currentOrder = await this.payment.getPaymentOrderByUuidAsync(
+      this.store.currentOrder.uuid
     );
+    if ((currentOrder == null ? void 0 : currentOrder.is_deposit) && (currentOrder == null ? void 0 : currentOrder.deposit_amount) && Number(currentOrder == null ? void 0 : currentOrder.deposit_amount) > 0) {
+      totalAmount = new import_decimal.default(currentOrder == null ? void 0 : currentOrder.deposit_amount);
+    }
     const paidAmountStr = await this.calculatePaidAmountAsync();
     const paidAmount = new import_decimal.default(paidAmountStr);
     const remainingAmount = totalAmount.sub(paidAmount);
@@ -1640,8 +1845,33 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
   /**
    * 更新 stateAmount 为当前剩余未支付金额
    */
-  async updateStateAmountToRemaining() {
+  async updateStateAmountToRemaining(checkOrder = true) {
+    var _a, _b, _c, _d;
     try {
+      if (((_a = this.store.currentOrder) == null ? void 0 : _a.is_deposit) === 1) {
+        const paymentItems = await this.payment.getPaymentItemsAsync(
+          (_b = this.store.currentOrder) == null ? void 0 : _b.uuid
+        );
+        const depositPaidAmount = paymentItems.filter(
+          (item) => item.order_payment_type === "deposit" && item.status !== "voided"
+        ).reduce((sum, item) => {
+          if (item.voucher_id && !item.isSynced) {
+            return sum;
+          }
+          const amount = new import_decimal.default(item.amount || "0");
+          const roundingAmount = new import_decimal.default(item.rounding_amount || "0");
+          return sum.add(amount.add(roundingAmount.abs()));
+        }, new import_decimal.default(0));
+        if (depositPaidAmount.gte((_c = this.store.currentOrder) == null ? void 0 : _c.deposit_amount)) {
+          this.store.currentOrder = {
+            ...this.store.currentOrder,
+            is_deposit: 0
+          };
+          await this.payment.updateOrderAsync((_d = this.store.currentOrder) == null ? void 0 : _d.uuid, {
+            is_deposit: 0
+          });
+        }
+      }
       const remainingAmount = await this.calculateRemainingAmountAsync();
       const currentStateAmount = this.store.stateAmount;
       if (remainingAmount !== currentStateAmount) {
@@ -1662,7 +1892,11 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         });
       }
       await this.updateBalanceDueAmount();
-      await this.checkOrderPaymentCompletion();
+      if (checkOrder) {
+        await this.checkOrderPaymentCompletion();
+      } else {
+        this.logInfo("外部传入无需 checkOrder，不执行订单支付完成检测和同步");
+      }
     } catch (error) {
       this.logError("更新 stateAmount 为剩余金额失败:", error);
     }
@@ -1748,7 +1982,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
    * @returns 包含订单ID、UUID和完整后端响应的对象
    */
   async syncOrderToBackendWithReturn(isManual = false, customPaymentItems) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     if (!this.store.localOrderData || !this.store.currentOrder) {
       throw new Error("缺少必要的订单数据，无法同步到后端");
     }
@@ -1776,42 +2010,23 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
     });
     let finalDepositAmount;
     const manualDepositAmount = ((_a = this.store.currentOrder) == null ? void 0 : _a.deposit_amount) || "0.00";
-    const depositPaymentItems = processedPaymentItems.filter(
-      (item) => item.order_payment_type === "deposit" && item.status !== "voided"
-    );
-    const calculatedDepositAmount = depositPaymentItems.reduce((sum, item) => {
-      const amount = new import_decimal.default(item.amount || "0");
-      const roundingAmount = new import_decimal.default(item.rounding_amount || "0");
-      const effectiveAmount = amount.add(roundingAmount.abs());
-      return sum.add(effectiveAmount);
-    }, new import_decimal.default(0)).toFixed(2);
     const manualDepositValue = new import_decimal.default(manualDepositAmount);
-    const calculatedDepositValue = new import_decimal.default(calculatedDepositAmount);
     if (manualDepositValue.gt(0)) {
       finalDepositAmount = manualDepositAmount;
       this.logInfo("使用手动设置的定金金额", {
         manualDepositAmount,
-        calculatedDepositAmount,
         reason: "用户通过setDepositAmountAsync手动设置了定金金额"
       });
-    } else if (calculatedDepositValue.gt(0)) {
-      finalDepositAmount = calculatedDepositAmount;
-      this.logInfo("使用从支付项计算的定金金额", {
-        manualDepositAmount,
-        calculatedDepositAmount,
-        reason: "未手动设置定金金额，从定金类型支付项计算得出"
-      });
     } else {
       finalDepositAmount = "0.00";
       this.logInfo("定金金额为0", {
         manualDepositAmount,
-        calculatedDepositAmount,
         reason: "手动设置和计算值均为0"
       });
     }
     this.logInfo("定金金额确定结果", {
-      depositPaymentItemsCount: depositPaymentItems.length,
-      depositPaymentItems: depositPaymentItems.map((item) => ({
+      depositPaymentItemsCount: processedPaymentItems.length,
+      depositPaymentItems: processedPaymentItems.map((item) => ({
         uuid: item.uuid,
         code: item.code,
         amount: item.amount,
@@ -1820,7 +2035,6 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         status: item.status
       })),
       manualDepositAmount,
-      calculatedDepositAmount,
       finalDepositAmount,
       isDeposit: ((_b = this.store.currentOrder) == null ? void 0 : _b.is_deposit) || 0
     });
@@ -1843,11 +2057,30 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       currency_code: this.otherParams.currency_code,
       currency_symbol: this.otherParams.currency_symbol,
       currency_format: this.otherParams.currency_format,
-      is_deposit: ((_d = this.store.currentOrder) == null ? void 0 : _d.is_deposit) || 0,
+      is_deposit: (((_d = this.store.currentOrder) == null ? void 0 : _d.is_deposit) || Number(finalDepositAmount) > 0 ? 1 : 0) || 0,
       deposit_amount: finalDepositAmount,
       // 使用最终确定的定金金额（手动设置优先）
       product_tax_fee: this.store.localOrderData.tax_fee,
-      note: this.store.localOrderData.shop_note
+      note: this.store.localOrderData.shop_note,
+      bookings: (_e = this.store.localOrderData.bookings) == null ? void 0 : _e.map((item) => {
+        return {
+          ...item,
+          product: {
+            ...item.product,
+            custom_deposit_data: void 0
+          },
+          deposit: void 0
+        };
+      }),
+      relation_products: (_f = this.store.localOrderData.relation_products) == null ? void 0 : _f.map(
+        (item) => {
+          return {
+            ...item,
+            custom_deposit_data: void 0,
+            deposit: void 0
+          };
+        }
+      )
     };
     if (isUpdateOperation) {
       if ((0, import_utils.isVirtualOrderId)(currentOrderId)) {
@@ -1898,7 +2131,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         orderUuid: this.store.currentOrder.uuid,
         operation: isUpdateOperation ? "update" : "create",
         isManual,
-        orderId: submitSuccess ? ((_e = checkoutResponse == null ? void 0 : checkoutResponse.data) == null ? void 0 : _e.order_id) || (checkoutResponse == null ? void 0 : checkoutResponse.order_id) : void 0,
+        orderId: submitSuccess ? ((_g = checkoutResponse == null ? void 0 : checkoutResponse.data) == null ? void 0 : _g.order_id) || (checkoutResponse == null ? void 0 : checkoutResponse.order_id) : void 0,
         error: submitError,
         duration: Date.now() - startTime,
         timestamp: Date.now()
@@ -1924,7 +2157,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
     if (isUpdateOperation) {
       realOrderId = currentOrderId;
     } else {
-      let extractedOrderId = (_f = checkoutResponse == null ? void 0 : checkoutResponse.data) == null ? void 0 : _f.order_id;
+      let extractedOrderId = (_h = checkoutResponse == null ? void 0 : checkoutResponse.data) == null ? void 0 : _h.order_id;
       if (!extractedOrderId) {
         extractedOrderId = checkoutResponse == null ? void 0 : checkoutResponse.order_id;
       }
@@ -1979,6 +2212,18 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         this.logInfo("错误恢复：手动设置订单ID:", realOrderId);
       }
     }
+    try {
+      const syncedPaymentUuids = processedPaymentItems.filter((item) => item.status !== "voided").map((item) => item.uuid).filter(Boolean);
+      for (const paymentUuid of syncedPaymentUuids) {
+        await this.payment.updatePaymentAsync(
+          this.store.currentOrder.uuid,
+          paymentUuid,
+          { isSynced: true, syncError: void 0 }
+        );
+      }
+    } catch (e) {
+      this.logWarning("标记支付项已同步失败（不阻塞主流程）", { error: e });
+    }
     this.store.isOrderSynced = true;
     await this.core.effects.emit(import_types.CheckoutHooks.OnOrderSynced, {
       orderUuid: this.store.currentOrder.uuid,

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

@@ -91,6 +91,19 @@ export interface CreateLocalOrderParams {
     autoPayment?: boolean;
     totalInfo: any;
 }
+/**
+ * 本地订单更新参数
+ */
+export interface UpdateLocalOrderParams {
+    /** 要更新的后端订单ID（已同步过后端的订单） */
+    orderId: string;
+    /** 更新后的订单数据（结构与创建时一致，允许部分字段变化） */
+    orderData: LocalOrderData;
+    /** 更新后的购物车小计数据 */
+    cartSummary: CartSummaryItem[];
+    /** total 信息（用于拆解金额） */
+    totalInfo: any;
+}
 /**
  * 本地订单数据结构 (基于 appointmentDemo.json)
  */
@@ -373,6 +386,10 @@ export interface CheckoutModuleAPI extends Module {
      * 创建本地订单 (前端模拟下单流程)
      */
     createLocalOrderAsync(params: CreateLocalOrderParams): Promise<PaymentOrder>;
+    /**
+     * 更新本地订单（基于已同步后的真实 orderId）并设置为当前订单
+     */
+    updateLocalOrderAsync(params: UpdateLocalOrderParams): Promise<PaymentOrder>;
     /**
      * 完成结账
      */

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

@@ -42,6 +42,11 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     private getDiscountList;
     private getCustomerWallet;
     private bestDiscount;
-    private loadPrepareConfig;
+    loadPrepareConfig(params: {
+        customerId: number;
+        action?: 'create' | 'update';
+        with_good_pass?: 0 | 1;
+        with_discount_card?: 0 | 1;
+    }): Promise<void>;
 }
 export default ShopDiscountImpl;

package/lib/solution/ShopDiscount/index.js

@@ -324,6 +324,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
               }
               editModeDiscountList.push({
                 ...discount,
+                name: discount.name || discount.discount.title.auto,
                 isEditMode: true,
                 limited_relation_product_data: {},
                 savedAmount: discount.amount * ((product == null ? void 0 : product.num) || 1),

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.1.24",
+  "version": "2.1.26",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",