@pisell/pisellos 0.0.438 → 0.0.440

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

@@ -444,7 +444,7 @@ export interface CheckoutModuleAPI extends Module {
     /**
      * 为当前订单添加支付项
      */
-    addPaymentItemAsync(paymentItem: PaymentItemInput): Promise<void>;
+    addPaymentItemAsync(paymentItem: PaymentItemInput, orderUuid?: string): Promise<void>;
     /**
      * 删除当前订单的支付项
      */

package/dist/solution/ShopDiscount/index.js

@@ -755,7 +755,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 action: 'create',
                 with_good_pass: 1,
                 with_discount_card: 1,
-                with_wallet_pass_holder: 1
+                with_wallet_pass_holder: 1,
+                request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
               });
             case 4:
               goodPassList = _context9.sent;

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

@@ -22,6 +22,7 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
         with_discount_card: 0 | 1;
         customer_id: number;
         with_wallet_pass_holder: 0 | 1;
+        request_timezone: string;
     }): Promise<Discount[]>;
     batchSearch(code: string, customerId?: number): Promise<Discount[]>;
     filterEnabledDiscountList(discountList: Discount[]): Discount[];

package/lib/modules/Discount/index.js

@@ -111,7 +111,8 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
       relation_product: 1,
       with: ["extensionData", "customScheduleSnapshot", "holder.detail"],
       order_behavior_count: 1,
-      order_behavior_count_customer_id: customerId || 1
+      order_behavior_count_customer_id: customerId || 1,
+      request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
     });
     const resultDiscountList = this.filterEnabledDiscountList((result == null ? void 0 : result.data) || []) || [];
     return resultDiscountList;

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

@@ -20,7 +20,9 @@ export declare enum PaymentStatus {
     /** 部分支付 - 支付金额不足订单总金额 */
     PartiallyPaid = "partially_paid",
     /** 已完成 - 本地支付完成，后台自动同步到服务器 */
-    Finished = "finish"
+    Finished = "finish",
+    /** 已撤销 - 本地订单取消 */
+    Voided = "voided"
 }
 /**
  * 任务状态枚举

package/lib/modules/Payment/types.js

@@ -39,6 +39,7 @@ var PaymentStatus = /* @__PURE__ */ ((PaymentStatus2) => {
   PaymentStatus2["Sync"] = "sync";
   PaymentStatus2["PartiallyPaid"] = "partially_paid";
   PaymentStatus2["Finished"] = "finish";
+  PaymentStatus2["Voided"] = "voided";
   return PaymentStatus2;
 })(PaymentStatus || {});
 var TaskRunStatus = /* @__PURE__ */ ((TaskRunStatus2) => {

package/lib/modules/Summary/index.js

@@ -74,10 +74,9 @@ var SummaryModule = class extends import_BaseModule.BaseModule {
     this.store.surchargeList = (surchargeList == null ? void 0 : surchargeList.data) || [];
   }
   async getSummary(cartItems) {
-    var _a, _b;
+    var _a, _b, _c;
     const shopInfo = ((_b = (_a = this.shopStore.get("core")) == null ? void 0 : _a.core) == null ? void 0 : _b.shop) || {};
-    const scheduleModule = this.core.getModule("appointmentBooking_schedule");
-    const summary = (0, import_utils.calculatePriceDetails)(shopInfo, cartItems, scheduleModule == null ? void 0 : scheduleModule.isInScheduleByDate, this.store.surchargeList);
+    const summary = (0, import_utils.calculatePriceDetails)(shopInfo, cartItems, (_c = import_Schedule.ScheduleModule) == null ? void 0 : _c.isInScheduleByDate, this.store.surchargeList);
     this.store.summary = summary;
     return this.store.summary;
   }

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 5 | 4 | 6;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -123,7 +123,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

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

@@ -169,7 +169,7 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * @param paymentItem 支付项数据
      * @throws 当前没有活跃订单时抛出错误
      */
-    addPaymentItemAsync(paymentItem: PaymentItemInput): Promise<void>;
+    addPaymentItemAsync(paymentItem: PaymentItemInput, orderUuid?: string): Promise<void>;
     /**
      * 删除当前订单的支付项
      *
@@ -373,6 +373,8 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * 在 updateStateAmountToRemaining 中会使用优化版本。
      */
     private checkOrderPaymentCompletion;
+    private repairEftposPaymentFromIndexDbAsync;
+    private syncOrderToBackendFromIndexDbAsync;
     /**
      * 同步订单到后端并返回真实订单ID
      *

package/lib/solution/Checkout/index.js

@@ -1009,9 +1009,31 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
    * @param paymentItem 支付项数据
    * @throws 当前没有活跃订单时抛出错误
    */
-  async addPaymentItemAsync(paymentItem) {
-    var _a, _b;
-    this.logInfo("addPaymentItemAsync called", paymentItem);
+  async addPaymentItemAsync(paymentItem, orderUuid) {
+    var _a, _b, _c, _d, _e;
+    this.logInfo("addPaymentItemAsync called", { paymentItem, orderUuid });
+    const isEftposPayment = ((_a = paymentItem.type) == null ? void 0 : _a.toLowerCase()) === "eftpos" || ((_b = paymentItem.code) == null ? void 0 : _b.toUpperCase().includes("EFTPOS"));
+    const shouldRepairFromIndexDb = !!orderUuid && isEftposPayment && (!this.store.currentOrder || this.store.currentOrder.uuid !== orderUuid);
+    if (shouldRepairFromIndexDb) {
+      this.logError("EFTPOS push payment repair triggered", {
+        orderUuid,
+        currentOrderUuid: (_c = this.store.currentOrder) == null ? void 0 : _c.uuid,
+        paymentCode: paymentItem.code,
+        paymentType: paymentItem.type
+      });
+      try {
+        await this.repairEftposPaymentFromIndexDbAsync({
+          orderUuid,
+          paymentItem
+        });
+      } catch (error) {
+        this.logError("EFTPOS push payment repair failed", {
+          orderUuid,
+          error: error instanceof Error ? error.message : String(error)
+        });
+      }
+      return;
+    }
     try {
       if (!this.store.currentOrder) {
         throw (0, import_utils.createCheckoutError)(
@@ -1041,16 +1063,16 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       const remainingAmount = await this.calculateRemainingAmountAsync();
       if (Number(remainingAmount) > 0) {
         this.logInfo("订单金额还有待付的，同步 EFTPOS 支付");
-        const isEftposPayment = ((_a = paymentItem.type) == null ? void 0 : _a.toLowerCase()) === "eftpos" || ((_b = paymentItem.code) == null ? void 0 : _b.toUpperCase().includes("EFTPOS"));
+        const isEftposPayment2 = ((_d = paymentItem.type) == null ? void 0 : _d.toLowerCase()) === "eftpos" || ((_e = paymentItem.code) == null ? void 0 : _e.toUpperCase().includes("EFTPOS"));
         const isCashPayment2 = paymentItem.code === "CASHMANUAL";
         const isCustomePayment = paymentItem.type === "custom";
         this.logInfo("EFTPOS 支付检查:", {
           paymentCode: paymentItem.code,
           paymentType: paymentItem.type,
-          isEftposPayment,
+          isEftposPayment: isEftposPayment2,
           currentOrderSynced: this.store.isOrderSynced
         });
-        if (isEftposPayment || isCashPayment2 || isCustomePayment) {
+        if (isEftposPayment2 || isCashPayment2 || isCustomePayment) {
           this.logInfo("检测到 EFTPOS 支付，立即同步订单到后端...");
           try {
             const syncResult = await this.syncOrderToBackendWithReturn(true);
@@ -1568,11 +1590,13 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         };
       }
       try {
-        this.logInfo("删除本地订单数据");
-        await this.payment.deletePaymentOrderAsync(currentOrderUuid);
-        this.logInfo("本地订单数据删除成功");
+        this.logInfo("标记本地订单为已删除");
+        await this.payment.updateOrderAsync(currentOrderUuid, {
+          payment_status: import_types2.PaymentStatus.Voided
+        });
+        this.logInfo("本地订单删除标记成功");
       } catch (error) {
-        this.logWarning("删除本地订单数据失败，但继续执行:", error);
+        this.logWarning("标记本地订单删除失败，但继续执行:", error);
       }
       this.logInfo("清理订单相关状态");
       this.store.currentOrder = void 0;
@@ -2363,6 +2387,221 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       this.logError("检查订单支付完成状态失败:", error);
     }
   }
+  async repairEftposPaymentFromIndexDbAsync(params) {
+    const { orderUuid, paymentItem } = params;
+    const order = await this.payment.getPaymentOrderByUuidAsync(orderUuid);
+    if (!order) {
+      this.logError("EFTPOS repair failed: order not found in IndexDB", {
+        orderUuid,
+        paymentItem
+      });
+      return;
+    }
+    const orderPaymentType = order.is_deposit === 1 ? "deposit" : "normal";
+    const processedPaymentItem = await this.processCashPaymentItem(paymentItem);
+    const metadata = {
+      ...processedPaymentItem.metadata,
+      rounding_rule: this.otherParams.order_rounding_setting,
+      shop_wallet_pass_id: this.otherParams.shop_wallet_pass_id
+    };
+    const paymentItemWithType = {
+      ...processedPaymentItem,
+      order_payment_type: orderPaymentType,
+      metadata
+    };
+    await this.payment.addPaymentItemAsync(orderUuid, paymentItemWithType);
+    await this.syncOrderToBackendFromIndexDbAsync({ orderUuid });
+  }
+  async syncOrderToBackendFromIndexDbAsync(params) {
+    var _a, _b, _c, _d, _e, _f, _g;
+    const { orderUuid } = params;
+    const paymentOrder = await this.payment.getPaymentOrderByUuidAsync(orderUuid);
+    if (!paymentOrder) {
+      this.logError("EFTPOS repair sync failed: missing payment order", {
+        orderUuid
+      });
+      return { success: false };
+    }
+    const localOrderData = ((_a = paymentOrder.order_info) == null ? void 0 : _a.original_order_data) || ((_b = paymentOrder.order_info) == null ? void 0 : _b.order_data);
+    if (!localOrderData) {
+      this.logError("EFTPOS repair sync failed: missing local order data", {
+        orderUuid,
+        orderInfoKeys: Object.keys(paymentOrder.order_info || {})
+      });
+      return { success: false };
+    }
+    const paymentItems = await this.payment.getPaymentItemsAsync(orderUuid);
+    const processedPaymentItems = paymentItems.map((item) => {
+      var _a2, _b2;
+      return {
+        ...item,
+        metadata: {
+          ...item.metadata,
+          rounding_rule: ((_a2 = item.metadata) == null ? void 0 : _a2.rounding_rule) || this.otherParams.order_rounding_setting,
+          shop_wallet_pass_id: ((_b2 = item.metadata) == null ? void 0 : _b2.shop_wallet_pass_id) || this.otherParams.shop_wallet_pass_id
+        }
+      };
+    });
+    let finalDepositAmount;
+    const manualDepositAmount = paymentOrder.deposit_amount || "0.00";
+    const manualDepositValue = new import_decimal.default(manualDepositAmount);
+    if (manualDepositValue.gt(0)) {
+      finalDepositAmount = manualDepositAmount;
+    } else {
+      finalDepositAmount = "0.00";
+    }
+    if (paymentOrder.is_deposit === 0 && processedPaymentItems.every((item) => item.order_payment_type !== "deposit")) {
+      finalDepositAmount = "0.00";
+    }
+    if (paymentOrder.is_deposit === 0 && processedPaymentItems.some((item) => item.order_payment_type === "deposit")) {
+      finalDepositAmount = processedPaymentItems.filter(
+        (item) => item.status !== "voided" && item.order_payment_type === "deposit"
+      ).reduce((sum, item) => {
+        const amountValue = new import_decimal.default(item.amount || "0");
+        const roundingValue = new import_decimal.default(item.rounding_amount || "0");
+        return sum.plus(amountValue).sub(roundingValue);
+      }, new import_decimal.default(0)).toFixed(2);
+    }
+    if (paymentOrder.is_deposit === 1 && new import_decimal.default(finalDepositAmount).gte(
+      new import_decimal.default(paymentOrder.total_amount)
+    )) {
+      finalDepositAmount = processedPaymentItems.filter(
+        (item) => item.status !== "voided" && item.order_payment_type === "deposit"
+      ).reduce((sum, item) => {
+        const amountValue = new import_decimal.default(item.amount || "0");
+        const roundingValue = new import_decimal.default(item.rounding_amount || "0");
+        return sum.plus(amountValue).sub(roundingValue);
+      }, new import_decimal.default(0)).toFixed(2);
+    }
+    let orderPaymentStatus;
+    const totalPaidAmount = processedPaymentItems.filter((item) => item.status !== "voided").reduce((sum, item) => {
+      const amountValue = new import_decimal.default(item.amount || "0");
+      const roundingValue = new import_decimal.default(item.rounding_amount || "0");
+      return sum.plus(amountValue).sub(roundingValue);
+    }, new import_decimal.default(0));
+    if (totalPaidAmount.gte(new import_decimal.default(paymentOrder.total_amount))) {
+      orderPaymentStatus = "paid";
+    } else if (totalPaidAmount.gt(0)) {
+      orderPaymentStatus = "partially_paid";
+    } else {
+      orderPaymentStatus = "unpaid";
+    }
+    const orderParams = {
+      ...localOrderData,
+      payment_status: orderPaymentStatus,
+      type: localOrderData.type,
+      platform: localOrderData.platform,
+      payments: processedPaymentItems,
+      customer_id: localOrderData.customer_id,
+      is_price_include_tax: this.otherParams.is_price_include_tax,
+      tax_title: this.otherParams.tax_title,
+      tax_rate: this.otherParams.tax_rate,
+      tax_country_code: this.otherParams.tax_country_code,
+      currency_code: this.otherParams.currency_code,
+      currency_symbol: this.otherParams.currency_symbol,
+      currency_format: this.otherParams.currency_format,
+      business_code: ((_c = this.otherParams) == null ? void 0 : _c.business_code) || void 0,
+      is_deposit: (paymentOrder.is_deposit || Number(finalDepositAmount) > 0 ? 1 : 0) || 0,
+      deposit_amount: finalDepositAmount,
+      product_tax_fee: localOrderData.tax_fee,
+      note: localOrderData.shop_note,
+      bookings: (_d = localOrderData.bookings) == null ? void 0 : _d.map((item) => {
+        return {
+          ...item,
+          product: {
+            ...item.product,
+            custom_deposit_data: void 0
+          },
+          deposit: void 0
+        };
+      }),
+      relation_products: (_e = localOrderData.relation_products) == null ? void 0 : _e.map((item) => {
+        return {
+          ...item,
+          custom_deposit_data: void 0,
+          deposit: void 0
+        };
+      })
+    };
+    const currentOrderId = paymentOrder.order_id;
+    const isUpdateOperation = currentOrderId && !(0, import_utils.isVirtualOrderId)(currentOrderId);
+    if (isUpdateOperation) {
+      orderParams.order_id = currentOrderId;
+    }
+    this.logError("EFTPOS repair sync start", {
+      orderUuid,
+      orderId: currentOrderId,
+      isUpdateOperation,
+      paymentItemCount: processedPaymentItems.length
+    });
+    let checkoutResponse;
+    try {
+      this.logError("EFTPOS repair calling backend checkout API", {
+        url: "/order/checkout",
+        isManual: true,
+        ...orderParams
+      });
+      checkoutResponse = await this.order.createOrderByCheckout(orderParams);
+    } catch (error) {
+      this.logError("EFTPOS repair checkout API failed", {
+        orderUuid,
+        error: error instanceof Error ? error.message : String(error)
+      });
+      throw error;
+    } finally {
+      this.logError("EFTPOS repair sync end", {
+        orderUuid,
+        orderId: currentOrderId,
+        responseStatus: checkoutResponse == null ? void 0 : checkoutResponse.status
+      });
+    }
+    const responseStatus = checkoutResponse == null ? void 0 : checkoutResponse.status;
+    const isSuccessResponse = responseStatus === true || responseStatus === 200 || responseStatus === "success" || responseStatus === 1 && (checkoutResponse == null ? void 0 : checkoutResponse.code) === 200;
+    if (!isSuccessResponse) {
+      const errorMessage = (checkoutResponse == null ? void 0 : checkoutResponse.message) || "订单同步失败，后端返回非成功状态";
+      this.logError("EFTPOS repair sync failed: api error", {
+        orderUuid,
+        errorMessage,
+        response: checkoutResponse
+      });
+      return { success: false, response: checkoutResponse };
+    }
+    let realOrderId = currentOrderId;
+    if (!isUpdateOperation) {
+      let extractedOrderId = (_f = checkoutResponse == null ? void 0 : checkoutResponse.data) == null ? void 0 : _f.order_id;
+      if (!extractedOrderId) {
+        extractedOrderId = checkoutResponse == null ? void 0 : checkoutResponse.order_id;
+      }
+      if (extractedOrderId !== void 0 && extractedOrderId !== null) {
+        extractedOrderId = String(extractedOrderId);
+      }
+      realOrderId = extractedOrderId;
+      if (realOrderId) {
+        await this.payment.replaceOrderIdByUuidAsync(orderUuid, realOrderId);
+      } else {
+        this.logError("EFTPOS repair missing order_id in response", {
+          orderUuid,
+          response: checkoutResponse
+        });
+      }
+    }
+    const syncedPaymentUuids = processedPaymentItems.filter((item) => item.status !== "voided").map((item) => item.uuid).filter(Boolean);
+    for (const paymentUuid of syncedPaymentUuids) {
+      await this.payment.updatePaymentAsync(orderUuid, paymentUuid, {
+        isSynced: true,
+        syncError: void 0
+      });
+    }
+    const latestPaymentStatus = ((_g = checkoutResponse == null ? void 0 : checkoutResponse.data) == null ? void 0 : _g.payment_status) || orderPaymentStatus;
+    await this.payment.updateOrderAsync(orderUuid, {
+      payment_status: latestPaymentStatus
+    });
+    return {
+      success: true,
+      orderId: realOrderId,
+      response: checkoutResponse
+    };
+  }
   /**
    * 同步订单到后端并返回真实订单ID
    *

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

@@ -444,7 +444,7 @@ export interface CheckoutModuleAPI extends Module {
     /**
      * 为当前订单添加支付项
      */
-    addPaymentItemAsync(paymentItem: PaymentItemInput): Promise<void>;
+    addPaymentItemAsync(paymentItem: PaymentItemInput, orderUuid?: string): Promise<void>;
     /**
      * 删除当前订单的支付项
      */

package/lib/solution/ShopDiscount/index.js

@@ -501,7 +501,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         action: "create",
         with_good_pass: 1,
         with_discount_card: 1,
-        with_wallet_pass_holder: 1
+        with_wallet_pass_holder: 1,
+        request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
       }));
       const scanDiscount = (_c = this.getDiscountList()) == null ? void 0 : _c.filter(
         (item) => item.isScan

package/package.json

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