@pisell/pisellos 0.0.285 → 0.0.286

package/dist/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/dist/solution/Checkout/types.js

@@ -30,6 +30,10 @@ export var CheckoutErrorType = /*#__PURE__*/function (CheckoutErrorType) {
  * 本地订单创建参数
  */
 
+/**
+ * 本地订单更新参数
+ */
+
 /**
  * 本地订单数据结构 (基于 appointmentDemo.json)
  */

package/lib/modules/Cart/index.d.ts

@@ -3,6 +3,7 @@ import { BaseModule } from '../BaseModule';
 import { CartItem, CartModuleAPI, ECartItemCheckType, ECartItemInfoType, IAddItemParams, IUpdateItemParams } from './types';
 import { Account } from '../Account';
 export * from './types';
+export { getProductDeposit } from './utils';
 /**
  * 购物车模块实现
  */

package/lib/modules/Cart/index.js

@@ -20,7 +20,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/modules/Cart/index.ts
 var Cart_exports = {};
 __export(Cart_exports, {
-  CartModule: () => CartModule
+  CartModule: () => CartModule,
+  getProductDeposit: () => import_utils3.getProductDeposit
 });
 module.exports = __toCommonJS(Cart_exports);
 var import_BaseModule = require("../BaseModule");
@@ -29,6 +30,7 @@ var import_utils = require("./utils");
 var import_lodash_es = require("lodash-es");
 var import_utils2 = require("../Product/utils");
 __reExport(Cart_exports, require("./types"), module.exports);
+var import_utils3 = require("./utils");
 var CartModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name || "cart", version || "1.0.0");
@@ -361,5 +363,6 @@ var CartModule = class extends import_BaseModule.BaseModule {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   CartModule,
+  getProductDeposit,
   ...require("./types")
 });

package/lib/modules/Cart/utils/cartResource.js

@@ -107,8 +107,6 @@ var formatResourceToCartItemOrigin = (params) => {
     origin.end_date = null;
     origin.end_time = null;
   }
-  origin.relation_type = "";
-  origin.relation_id = 0;
   return origin;
 };
 var deleteResourceFromCartItem = (cartItem) => {

package/lib/modules/Order/index.js

@@ -226,16 +226,13 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         relation_products: [],
         relation_forms: [],
         payments: [],
+        is_full_overwrite_flag: 1,
         ...params
         // 使用传入的参数覆盖默认值
       };
       if ((_h = orderData.payments) == null ? void 0 : _h.length) {
         orderData.small_ticket_data_flag = 1;
       }
-      if (params.order_id) {
-        orderData.bookings = [];
-        orderData.relation_products = [];
-      }
       if (!params.order_id && !orderData.schedule_date) {
         orderData.schedule_date = (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss");
       }

package/lib/modules/Payment/index.js

@@ -671,7 +671,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         throw new Error(`订单不存在: ${orderUuid}`);
       }
       const existingVoucherItems = order.payment.filter(
-        (payment) => payment.voucher_id && payment.status !== "voided"
+        (payment) => payment.voucher_id && payment.status !== "voided" && !payment.isSynced
       );
       console.log("[PaymentModule] 发现现有代金券支付项:", {
         orderUuid,
@@ -680,7 +680,8 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
           uuid: item.uuid,
           code: item.code,
           amount: item.amount,
-          voucher_id: item.voucher_id
+          voucher_id: item.voucher_id,
+          isSynced: item.isSynced
         }))
       });
       for (const voucherItem of existingVoucherItems) {

package/lib/modules/Payment/types.d.ts

@@ -129,6 +129,15 @@ export interface PaymentItem {
     origin_amount?: string;
     /** 订单支付类型 */
     order_payment_type?: 'normal' | 'deposit';
+    /** 本支付项是否已成功同步到后端 */
+    isSynced?: boolean;
+    /** 最近一次同步失败信息（存在则代表同步失败过） */
+    syncError?: {
+        error: string;
+        errorCode?: string;
+        statusCode?: number;
+        timestamp: number;
+    };
 }
 /**
  * 订单信息
@@ -614,6 +623,8 @@ export interface WalletDeductionRecommendParams {
         amount: number;
         tag: string;
     }[];
+    /** 订单ID */
+    payment_order_id?: string;
 }
 /**
  * 钱包初始化业务数据接口
@@ -635,6 +646,8 @@ export interface WalletInitBusinessData {
         selling_price: number;
     }[];
     order_wait_pay_amount?: number;
+    /** 订单ID */
+    payment_order_id?: string;
 }
 /**
  * 查询用户识别码列表请求参数
@@ -652,6 +665,8 @@ export interface UserIdentificationCodeParams extends WalletDeductionRecommendPa
         amount: number;
         tag: string;
     }[];
+    /** 订单ID */
+    payment_order_id?: string;
 }
 /**
  * 钱包推荐扣款响应数据
@@ -703,6 +718,8 @@ export interface UserIdentificationCodeItem {
 export interface SearchIdentificationCodeParams extends WalletDeductionRecommendParams {
     /** 识别码 */
     code: string;
+    /** 订单ID */
+    payment_order_id?: string;
 }
 /**
  * 搜索识别码响应数据

package/lib/modules/Payment/walletpass.js

@@ -49,7 +49,7 @@ var WalletPassPaymentImpl = class {
    */
   generateWalletParams(businessData) {
     var _a;
-    const { customer_id, amountInfo, products, order_wait_pay_amount } = businessData;
+    const { customer_id, amountInfo, products, order_wait_pay_amount, payment_order_id } = businessData;
     const totalAmount = Number(amountInfo.totalAmount);
     const subTotal = Number(amountInfo.subTotal);
     const walletParams = {
@@ -63,7 +63,8 @@ var WalletPassPaymentImpl = class {
       order_wait_pay_amount: order_wait_pay_amount || totalAmount,
       // order_behavior_count_customer_id: 1,
       products,
-      prepare_payments: []
+      prepare_payments: [],
+      payment_order_id
     };
     this.walletParams = walletParams;
     this.paymentModule.logInfo("[WalletPass] 钱包默认参数已生成并存储", {
@@ -178,11 +179,13 @@ var WalletPassPaymentImpl = class {
     }
   }
   async getWalletPassRecommendListAsync(params) {
+    var _a;
     try {
       this.paymentModule.logInfo("[WalletPass] 开始获取钱包推荐列表", {
         customer_id: params.customer_id,
         order_expect_amount: params.order_expect_amount,
-        sale_channel: params.sale_channel
+        sale_channel: params.sale_channel,
+        payment_order_id: (_a = this.walletParams) == null ? void 0 : _a.payment_order_id
       });
       const response = await this.paymentModule.request.post(
         "/machinecode/prepare/deduction/recommend",
@@ -216,7 +219,7 @@ var WalletPassPaymentImpl = class {
     return (0, import_utils.formatWalletPassList2PreparePayments)(list);
   }
   async getUserIdentificationCodeListAsync(params) {
-    var _a;
+    var _a, _b;
     try {
       const newParams = {
         ...this.walletParams,
@@ -226,7 +229,8 @@ var WalletPassPaymentImpl = class {
         customer_id: newParams.customer_id,
         available: newParams.available,
         prepare_payments_count: ((_a = newParams.prepare_payments) == null ? void 0 : _a.length) || 0,
-        filter_prepare_wallet_pass: newParams.filter_prepare_wallet_pass
+        filter_prepare_wallet_pass: newParams.filter_prepare_wallet_pass,
+        payment_order_id: (_b = this.walletParams) == null ? void 0 : _b.payment_order_id
       });
       const response = await this.paymentModule.request.post(
         "/machinecode/prepare/deduction",
@@ -308,13 +312,15 @@ var WalletPassPaymentImpl = class {
         prepare_payments: params.prepare_payments || (baseWalletParams == null ? void 0 : baseWalletParams.prepare_payments),
         multiple: 1,
         // 搜索特有参数
-        code: params.code
+        code: params.code,
+        payment_order_id: baseWalletParams == null ? void 0 : baseWalletParams.payment_order_id
       };
       this.paymentModule.logInfo("[WalletPass] 搜索普通识别码", {
         code: searchParams.code,
         customer_id: searchParams.customer_id,
         order_expect_amount: searchParams.order_expect_amount,
-        multiple: searchParams.multiple
+        multiple: searchParams.multiple,
+        payment_order_id: baseWalletParams == null ? void 0 : baseWalletParams.payment_order_id
       });
       const response = await this.paymentModule.request.post(
         "/machinecode/prepare/deduction/search",

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

@@ -2,7 +2,7 @@ import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
 import { OrderModule } from '../../modules/Order';
 import { PaymentModule } from '../../modules/Payment';
-import { CheckoutModuleAPI, CheckoutInitParams, CreateLocalOrderParams, CurrentOrderInfo, CartSummaryItem, SendCustomerPayLinkParams } from './types';
+import { CheckoutModuleAPI, CheckoutInitParams, CreateLocalOrderParams, UpdateLocalOrderParams, CurrentOrderInfo, CartSummaryItem, SendCustomerPayLinkParams } from './types';
 import { PaymentOrder, PaymentMethod, PaymentItem, PaymentItemInput } from '../../modules/Payment/types';
 export * from './types';
 /**
@@ -64,6 +64,13 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * 方法会记录参数并创建本地虚拟订单，然后用 Payment 模块管理支付流程。
      */
     createLocalOrderAsync(params: CreateLocalOrderParams): Promise<PaymentOrder>;
+    /**
+     * 更新本地订单（已同步后端的订单）并设置为当前订单
+     *
+     * 通过传入真实的 orderId，对已缓存的订单数据进行更新，
+     * 会覆盖 order_info 与金额等字段，并重新计算待付金额，最后设置为 currentOrder。
+     */
+    updateLocalOrderAsync(params: UpdateLocalOrderParams): Promise<PaymentOrder>;
     /**
      * 完成结账
      */

package/lib/solution/Checkout/index.js

@@ -221,7 +221,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;
     this.logInfo("initWalletData called", {
       params
     });
@@ -241,6 +241,9 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       products: this.getProductListByOrder(),
       ...params
     };
+    if (this.store.isOrderSynced) {
+      walletBusinessData.payment_order_id = (_d = this.store.currentOrder) == null ? void 0 : _d.order_id;
+    }
     this.logInfo("开始拉取:initializeWalletDataFromBusinessAsync", {
       walletBusinessData
     });
@@ -257,7 +260,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: (_e = this.store.currentOrder) == null ? void 0 : _e.uuid,
       customerId: walletBusinessData.customer_id,
       walletBusinessData: {
         customer_id: walletBusinessData.customer_id,
@@ -363,6 +366,117 @@ 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);
+      await this.payment.updateOrderAsync(existingOrder.uuid, {
+        total_amount: amountInfo.totalAmount,
+        is_deposit: params.orderData.is_deposit || 0,
+        deposit_amount: amountInfo.depositAmount || "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();
+      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()
+      });
+      this.initWalletData({
+        order_wait_pay_amount: Number(updated.expect_amount)
+      });
+      return updated;
+    }
+    const created = await this.payment.createPaymentOrderAsync({
+      order_id: String(params.orderId),
+      total_amount: amountInfo.totalAmount,
+      is_deposit: params.orderData.is_deposit || 0,
+      deposit_amount: amountInfo.depositAmount || "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;
+    await this.updateStateAmountToRemaining();
+    this.initWalletData();
+    return created;
+  }
   /**
    * 完成结账
    */
@@ -1979,6 +2093,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/package.json

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