@pisell/pisellos 2.2.7 → 2.2.9

package/lib/solution/Checkout/index.js

@@ -196,6 +196,16 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       throw error;
     }
   }
+  getHolderIdFromBooking(obj) {
+    var _a;
+    if (!obj)
+      return void 0;
+    let ret = obj.holder_id || ((_a = obj.holder) == null ? void 0 : _a.form_record);
+    if (Array.isArray(ret)) {
+      return ret.length > 0 ? Number(ret[0]) : void 0;
+    }
+    return Number(ret) || void 0;
+  }
   getProductListByOrder() {
     var _a, _b, _c, _d, _e;
     if (!this.store.currentOrder) {
@@ -211,7 +221,8 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         product_id: item.product.product_id,
         product_variant_id: item.product.product_variant_id,
         quantity: item.product.num,
-        selling_price: item.product.calculated_selling_price
+        selling_price: item.product.calculated_selling_price,
+        holder_id: this.getHolderIdFromBooking(item)
       })
     )) || [];
     const relationProducts = ((_e = (_d = (_c = this.store.currentOrder.order_info) == null ? void 0 : _c.original_order_data) == null ? void 0 : _d.relation_products) == null ? void 0 : _e.map(
@@ -225,7 +236,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
     return [...productList, ...relationProducts];
   }
   async initWalletData(params) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     this.logInfo("initWalletData called", {
       params
     });
@@ -238,17 +249,18 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
     }
     const walletBusinessData = {
       customer_id: ((_c = this.store.currentCustomer) == null ? void 0 : _c.customer_id) ? Number(this.store.currentCustomer.customer_id) : void 0,
+      holder: (_f = (_e = (_d = this.store.currentOrder) == null ? void 0 : _d.order_info) == null ? void 0 : _e.original_order_data) == null ? void 0 : _f.holder,
       amountInfo: {
         totalAmount: amountInfo.totalAmount,
         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
+        depositAmount: (_g = this.store.currentOrder) == null ? void 0 : _g.deposit_amount,
+        isDeposit: (_h = this.store.currentOrder) == null ? void 0 : _h.is_deposit
       },
       products: this.getProductListByOrder(),
       ...params
     };
     if (this.store.isOrderSynced) {
-      walletBusinessData.payment_order_id = (_f = this.store.currentOrder) == null ? void 0 : _f.order_id;
+      walletBusinessData.payment_order_id = (_i = this.store.currentOrder) == null ? void 0 : _i.order_id;
     }
     this.logInfo("开始拉取:initializeWalletDataFromBusinessAsync", {
       walletBusinessData
@@ -266,7 +278,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       currentOrder: this.store.currentOrder
     });
     await this.core.effects.emit(`${this.name}:onWalletDataInitialized`, {
-      orderUuid: (_g = this.store.currentOrder) == null ? void 0 : _g.uuid,
+      orderUuid: (_j = this.store.currentOrder) == null ? void 0 : _j.uuid,
       customerId: walletBusinessData.customer_id,
       walletBusinessData: {
         customer_id: walletBusinessData.customer_id,
@@ -441,7 +453,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
    * 会覆盖 order_info 与金额等字段，并重新计算待付金额，最后设置为 currentOrder。
    */
   async updateLocalOrderAsync(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
     this.logInfo("updateLocalOrderAsync called", {
       orderId: params.orderId,
       orderDataType: (_a = params.orderData) == null ? void 0 : _a.type,
@@ -479,6 +491,82 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       (o) => String(o.id) === String(params.orderId) || String(o.order_id) === String(params.orderId)
     );
     if (existingOrder) {
+      if (params.existPayment && params.existPayment.length > 0) {
+        this.logInfo("检测到云端支付项，将替换本地订单的支付项列表", {
+          orderId: params.orderId,
+          existingPaymentCount: ((_m = existingOrder.payment) == null ? void 0 : _m.length) || 0,
+          newPaymentCount: params.existPayment.length
+        });
+        this.store.isOrderSynced = true;
+        const currentTime = (0, import_utils.formatDateTime)(/* @__PURE__ */ new Date());
+        const formattedExistPayments = params.existPayment.map((payment) => ({
+          ...payment,
+          isSynced: true,
+          // 标记为已同步
+          status: payment.status || "active",
+          created_at: payment.created_at || currentTime,
+          updated_at: payment.updated_at || currentTime
+        }));
+        const isNeedDeposit3 = this.checkIsNeedDepositAsync(
+          params.orderData.bookings,
+          params.orderData.relation_products
+        );
+        await this.payment.updateOrderAsync(existingOrder.uuid, {
+          total_amount: amountInfo.totalAmount,
+          is_deposit: isNeedDeposit3.hasDeposit ? 1 : 0,
+          deposit_amount: isNeedDeposit3.total ? isNeedDeposit3.total.toString() : "0.00",
+          payment: formattedExistPayments,
+          // 🔧 替换支付项列表
+          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 updated2 = await this.payment.getPaymentOrderByUuidAsync(
+          existingOrder.uuid
+        );
+        if (!updated2)
+          throw (0, import_utils.createCheckoutError)(
+            import_types.CheckoutErrorType.UnknownError,
+            "订单更新失败"
+          );
+        this.store.currentOrder = updated2;
+        await this.updateStateAmountToRemaining(false);
+        this.logInfo("本地订单更新成功(已替换云端支付项):", {
+          orderId: params.orderId,
+          uuid: updated2.uuid,
+          payments: ((_n = updated2.payment) == null ? void 0 : _n.length) || 0,
+          totalAmount: updated2.total_amount,
+          expectAmount: updated2.expect_amount,
+          isOrderSynced: true
+        });
+        await this.core.effects.emit(`${this.name}:onOrderCreated`, {
+          order: updated2,
+          timestamp: Date.now()
+        });
+        const syncedPayments = updated2.payment.filter((p) => p.isSynced && p.status !== "voided");
+        const syncedAmount2 = syncedPayments.reduce((sum, p) => {
+          const amt = new import_decimal.default(p.amount || "0");
+          const rounding = new import_decimal.default(Number(p.rounding_amount) > 0 ? 0 : p.rounding_amount || "0").abs();
+          return sum.plus(amt).plus(rounding);
+        }, new import_decimal.default(0));
+        const totalAmount2 = new import_decimal.default(amountInfo.totalAmount || "0");
+        const remainingExpectAmount2 = import_decimal.default.max(0, totalAmount2.minus(syncedAmount2)).toFixed(2);
+        let depositDiffAmount2 = new import_decimal.default(0).toFixed(2);
+        if (updated2.is_deposit === 1) {
+          depositDiffAmount2 = new import_decimal.default(updated2.deposit_amount).minus(syncedAmount2).toFixed(2);
+        }
+        this.initWalletData({
+          order_wait_pay_amount: Number(depositDiffAmount2) > 0 ? Number(depositDiffAmount2) : Number(remainingExpectAmount2)
+        });
+        return updated2;
+      }
       const totalAmount = new import_decimal.default(amountInfo.totalAmount || "0");
       const activePayments = (existingOrder.payment || []).filter(
         (p) => p.status !== "voided"
@@ -524,7 +612,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       this.logInfo("本地订单更新成功(保留支付项):", {
         orderId: params.orderId,
         uuid: updated.uuid,
-        payments: ((_m = updated.payment) == null ? void 0 : _m.length) || 0,
+        payments: ((_o = updated.payment) == null ? void 0 : _o.length) || 0,
         totalAmount: updated.total_amount,
         expectAmount: updated.expect_amount
       });
@@ -558,6 +646,8 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       total_amount: amountInfo.totalAmount,
       is_deposit: isNeedDeposit.hasDeposit ? 1 : 0,
       deposit_amount: isNeedDeposit.total ? isNeedDeposit.total.toString() : "0.00",
+      existPayment: params.existPayment,
+      // 🔧 新增: 传递云端支付项
       order_info: {
         original_order_data: params.orderData,
         cart_summary: params.cartSummary,
@@ -570,7 +660,28 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       }
     });
     this.store.currentOrder = created;
-    this.initWalletData();
+    if (params.existPayment && params.existPayment.length > 0) {
+      this.store.isOrderSynced = true;
+      const syncedPayments = created.payment.filter((p) => p.isSynced && p.status !== "voided");
+      const syncedAmount = syncedPayments.reduce((sum, p) => {
+        const amt = new import_decimal.default(p.amount || "0");
+        const rounding = new import_decimal.default(Number(p.rounding_amount) > 0 ? 0 : p.rounding_amount || "0").abs();
+        return sum.plus(amt).plus(rounding);
+      }, new import_decimal.default(0));
+      this.logInfo("云端订单初始化钱包数据", {
+        orderId: params.orderId,
+        totalAmount: created.total_amount,
+        expectAmount: created.expect_amount,
+        syncedAmount: syncedAmount.toFixed(2),
+        syncedPaymentCount: syncedPayments.length,
+        isOrderSynced: true
+      });
+      this.initWalletData({
+        order_wait_pay_amount: Number(created.expect_amount)
+      });
+    } else {
+      this.initWalletData();
+    }
     return created;
   }
   /**
@@ -1967,7 +2078,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         const depositPaidAmount = paymentItems.filter(
           (item) => item.order_payment_type === "deposit" && item.status !== "voided"
         ).reduce((sum, item) => {
-          if (item.voucher_id && !item.isSynced) {
+          if (item.voucher_id && !item.isSynced && paymentItems.filter((item2) => !item2.voucher_id).length === 0) {
             return sum;
           }
           const amount = new import_decimal.default(item.amount || "0");

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

@@ -103,6 +103,8 @@ export interface UpdateLocalOrderParams {
     cartSummary: CartSummaryItem[];
     /** total 信息（用于拆解金额） */
     totalInfo: any;
+    /** 云端已存在的支付项（可选，用于处理订单在其他设备或云端生成的场景） */
+    existPayment?: PaymentItem[];
 }
 /**
  * 本地订单数据结构 (基于 appointmentDemo.json)

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

@@ -19,6 +19,9 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     private registerDependentModules;
     private registerEventListeners;
     setCustomer(customer: Customer): Promise<void>;
+    setHolders(holders: {
+        form_record_id: number;
+    }[]): void;
     calcDiscount(productList: Record<string, any>[], options?: SetDiscountSelectedParams): {
         productList: Record<string, any>[];
         discountList: Discount[];

package/lib/solution/ShopDiscount/index.js

@@ -50,7 +50,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       productList: [],
       discount: null,
       rules: null,
-      originalDiscountList: []
+      originalDiscountList: [],
+      holders: []
     };
   }
   // =========== 生命周期方法 ===========
@@ -150,6 +151,10 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       );
     }
   }
+  // 设置holders
+  setHolders(holders) {
+    this.store.holders = holders;
+  }
   // 计算优惠券
   calcDiscount(productList, options) {
     this.store.productList = productList;
@@ -160,7 +165,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     let { productList: newProductList, discountList: newDiscountList } = rulesModule.calcDiscount(
       {
         productList,
-        discountList: this.getDiscountList()
+        discountList: this.getDiscountList(),
+        holders: this.store.holders || []
       },
       options
     ) || { productList, discountList: this.getDiscountList() };
@@ -249,7 +255,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       } = rulesModule.isDiscountListAvailable({
         productList: this.store.productList || [],
         oldDiscountList: this.getDiscountList(),
-        newDiscountList: withScanList
+        newDiscountList: withScanList,
+        holders: this.store.holders || []
       }) || {
         isAvailable: false,
         productList: this.store.productList || [],
@@ -432,7 +439,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         customer_id: customerId,
         action: "create",
         with_good_pass: 1,
-        with_discount_card: 1
+        with_discount_card: 1,
+        with_wallet_pass_holder: 1
       }));
       const scanDiscount = (_c = this.getDiscountList()) == null ? void 0 : _c.filter(
         (item) => item.isScan

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

@@ -23,6 +23,11 @@ export interface ShopDiscountState {
     rules: RulesModule | null;
     productList: Record<string, any>[];
     originalDiscountList: Discount[];
+    holders?: {
+        form_record_id: number;
+        form_id?: number;
+        main_field?: string;
+    }[];
 }
 export interface SetDiscountSelectedParams {
     discountId: number;

package/package.json

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