@pisell/pisellos 2.3.24 → 2.3.26

package/lib/modules/Order/index.js

@@ -308,9 +308,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if (!this.store.summary) {
       this.store.summary = (0, import_utils.createEmptySummary)();
     }
-    if (!Array.isArray(this.store.availableWalletIds)) {
-      this.store.availableWalletIds = [];
-    }
     this.request = this.core.getPlugin("request");
     const appPlugin = this.core.getPlugin("app");
     if (!appPlugin) {
@@ -438,19 +435,15 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   async loadDiscountConfig(params) {
     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 prepareConfigResult = await ((_b = this.store.discount) == null ? void 0 : _b.loadPrepareConfig({
+    const discountList = await ((_b = this.store.discount) == null ? void 0 : _b.loadPrepareConfig({
       customer_id: params.customerId,
       action: params.action || (orderId ? "edit" : "create"),
       with_good_pass: 1,
       with_discount_card: 1,
       with_wallet_pass_holder: 1,
-      with_available_wallet_flag: 1,
-      with_available_wallet_pass_flag: 1,
       request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
       ...orderId ? { order_id: orderId } : {}
     }));
-    const discountList = prepareConfigResult == null ? void 0 : prepareConfigResult.discountList;
-    this.store.availableWalletIds = (prepareConfigResult == null ? void 0 : prepareConfigResult.availableWalletIds) || [];
     if (discountList) {
       const currentDiscountList = ((_c = this.store.discount) == null ? void 0 : _c.getDiscountList()) || [];
       const currentEditDiscounts = currentDiscountList.filter((discount) => discount == null ? void 0 : discount.isEditMode);
@@ -484,8 +477,18 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     var _a;
     return ((_a = this.store.discount) == null ? void 0 : _a.getDiscountList()) || [];
   }
-  getAvailableWalletIds() {
-    return Array.isArray(this.store.availableWalletIds) ? [...this.store.availableWalletIds] : [];
+  async syncScannedDiscountsToOriginalDiscountList(discountList) {
+    var _a, _b, _c, _d;
+    const scanDiscounts = (discountList || []).filter((discount) => discount == null ? void 0 : discount.isScan);
+    if (!scanDiscounts.length)
+      return;
+    const scanDiscountIds = new Set(scanDiscounts.map((discount) => discount == null ? void 0 : discount.id));
+    const originalDiscounts = ((_b = (_a = this.store.discount) == null ? void 0 : _a.getOriginalDiscountList) == null ? void 0 : _b.call(_a)) || [];
+    const nextOriginalDiscounts = [
+      ...scanDiscounts,
+      ...originalDiscounts.filter((discount) => !scanDiscountIds.has(discount == null ? void 0 : discount.id))
+    ];
+    await ((_d = (_c = this.store.discount) == null ? void 0 : _c.setOriginalDiscountList) == null ? void 0 : _d.call(_c, nextOriginalDiscounts));
   }
   async ensureEditDiscountConfigForProductChange(tempOrder) {
     var _a, _b, _c, _d, _e, _f;
@@ -535,6 +538,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }));
     const currentSelected = this.getDiscountList().filter((n) => n.isSelected);
     if (currentSelected.length && currentSelected.some((n) => withScanList.some((m) => m.id === n.id))) {
+      await this.syncScannedDiscountsToOriginalDiscountList(this.getDiscountList());
       return {
         type: "clientCalc",
         isAvailable: true,
@@ -555,6 +559,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if (isAvailable && newDiscountList) {
       (_d = this.store.discount) == null ? void 0 : _d.setDiscountList(newDiscountList);
       this.applyDiscount();
+      await this.syncScannedDiscountsToOriginalDiscountList(this.getDiscountList());
     }
     return {
       type: "clientCalc",
@@ -897,6 +902,15 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return sum.plus(this.calculatePaymentEffectiveAmount(payment));
     }, new import_decimal.default(0));
   }
+  calculateOrderPaidPaymentTotal(payments) {
+    return (0, import_utils.mapPaymentItemsToOrderPayments)(payments, {
+      includeVoided: false
+    }).reduce((sum, payment) => {
+      if (!isPaidPaymentRecord(payment))
+        return sum;
+      return sum.plus(this.calculatePaymentGapAmount(payment));
+    }, new import_decimal.default(0));
+  }
   getDepositAmount(tempOrder, summary) {
     return new import_decimal.default(summary.deposit_amount || tempOrder.deposit_amount || "0.00");
   }
@@ -987,7 +1001,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const paymentList = payments || tempOrder.payments || [];
     const refundAmount = this.getSummaryRefundAmount(summary);
     const netPaidAmount = import_decimal.default.max(
-      this.calculatePaymentTotal(paymentList).minus(refundAmount),
+      this.calculateOrderPaidPaymentTotal(paymentList).minus(refundAmount),
       0
     );
     const depositAmount = this.getDepositAmount(tempOrder, summary);
@@ -1016,11 +1030,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       const isDepositPayment = paymentRecord.type === "deposit" || paymentRecord.order_payment_type === "deposit";
       if (!isDepositPayment)
         return sum;
-      if (paymentRecord.origin_amount !== void 0 && paymentRecord.origin_amount !== null && paymentRecord.origin_amount !== "") {
-        return sum.plus(this.calculatePaymentGapAmount(paymentRecord));
-      }
-      const rounding = new import_decimal.default(paymentRecord.rounding_amount || 0);
-      return sum.plus(new import_decimal.default(paymentRecord.amount || 0).minus(rounding));
+      return sum.plus(this.calculatePaymentGapAmount(paymentRecord));
     }, new import_decimal.default(0));
   }
   resolveNextOrderPaymentType(tempOrder) {
@@ -1053,8 +1063,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   updateTempOrderPaymentStatus(tempOrder, options) {
     const summary = (options == null ? void 0 : options.summary) || this.store.summary || (0, import_utils.createEmptySummary)();
     const paymentTotal = this.calculatePaymentTotal(tempOrder.payments || []);
+    const orderPaymentTotal = this.calculateOrderPaidPaymentTotal(tempOrder.payments || []);
     const refundAmount = this.getSummaryRefundAmount(summary);
-    const netPaymentTotal = import_decimal.default.max(paymentTotal.minus(refundAmount), 0);
+    const netPaymentTotal = import_decimal.default.max(orderPaymentTotal.minus(refundAmount), 0);
     const targetAmount = this.calculatePaymentTargetAmount(
       tempOrder,
       summary,
@@ -1123,7 +1134,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   }
   capVoucherPaymentsByRemainingAmount(params) {
     const targetAmount = this.getPaymentTargetAmount();
-    const nonVoucherTotal = this.calculatePaymentTotal(params.nonVoucherPayments);
+    const nonVoucherTotal = this.calculateOrderPaidPaymentTotal(params.nonVoucherPayments);
     if (targetAmount.lte(0))
       return [];
     let remainingAmount = import_decimal.default.max(
@@ -1166,7 +1177,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           return summary;
         return {
           customerPaidAmount: summary.customerPaidAmount.plus(paymentRecord.amount || 0),
-          orderPaidAmount: summary.orderPaidAmount.plus(paymentRecord.origin_amount || 0),
+          orderPaidAmount: summary.orderPaidAmount.plus(this.calculatePaymentOrderAmount(paymentRecord)),
           gapPaidAmount: summary.gapPaidAmount.plus(this.calculatePaymentGapAmount(paymentRecord)),
           payServiceChargeAmount: summary.payServiceChargeAmount.plus(this.calculatePaymentServiceFee(paymentRecord)),
           roundingAmount: summary.roundingAmount.plus(this.calculatePaymentRoundingAmount(paymentRecord))
@@ -1191,11 +1202,30 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     return new import_decimal.default(payment.amount || 0).times(percentage).plus(fixedAmount);
   }
   calculatePaymentGapAmount(payment) {
-    if (payment.origin_amount === void 0 || payment.origin_amount === null || payment.origin_amount === "") {
-      return new import_decimal.default(0);
+    if (payment.origin_amount !== void 0 && payment.origin_amount !== null && payment.origin_amount !== "") {
+      const rounding2 = new import_decimal.default(payment.rounding_amount || 0);
+      return new import_decimal.default(payment.origin_amount || 0).minus(rounding2);
     }
     const rounding = new import_decimal.default(payment.rounding_amount || 0);
-    return new import_decimal.default(payment.origin_amount || 0).minus(rounding);
+    const amount = new import_decimal.default(payment.amount || 0);
+    const serviceFee = this.calculatePaymentServiceFee(payment);
+    if (serviceFee.lte(0))
+      return amount.minus(rounding);
+    if (!hasSyncedOrderPaymentRecord(payment))
+      return new import_decimal.default(0);
+    return import_decimal.default.max(amount.minus(serviceFee), 0).minus(rounding);
+  }
+  calculatePaymentOrderAmount(payment) {
+    if (payment.origin_amount !== void 0 && payment.origin_amount !== null && payment.origin_amount !== "") {
+      return new import_decimal.default(payment.origin_amount || 0);
+    }
+    const amount = new import_decimal.default(payment.amount || 0);
+    const serviceFee = this.calculatePaymentServiceFee(payment);
+    if (serviceFee.lte(0))
+      return amount;
+    if (!hasSyncedOrderPaymentRecord(payment))
+      return new import_decimal.default(0);
+    return import_decimal.default.max(amount.minus(serviceFee), 0);
   }
   calculatePaymentRoundingAmount(payment) {
     if (payment.rounding_amount === void 0 || payment.rounding_amount === null || payment.rounding_amount === "") {
@@ -1543,7 +1573,12 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     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;
+    const previousSummary = this.store.summary;
     this.store.summary = summary;
+    this.updateTempOrderPaymentStatus(tempOrder, {
+      previousSummary,
+      summary
+    });
     return summary;
   }
   clearPersistedAmountFieldsForFullRecalc(products) {
@@ -2366,7 +2401,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
     const nextCustomerId = tempOrder.customer_id ?? null;
     if (String(previousCustomerId ?? "") !== String(nextCustomerId ?? "")) {
-      this.store.availableWalletIds = [];
       (0, import_utils.clearTempOrderHolderAssignments)(tempOrder);
       this.clearCustomerBoundDiscounts(tempOrder);
       this.applyDiscount();
@@ -2406,7 +2440,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     tempOrder.customer = null;
     if (tempOrder._extend)
       delete tempOrder._extend.customerSnapshot;
-    this.store.availableWalletIds = [];
     this.clearCustomerBoundDiscounts(tempOrder);
     this.persistTempOrder();
     this.saveDraftInBackground();
@@ -3656,8 +3689,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const shouldConfirmPendingVoucherPayments = params.confirmPendingVoucherPayments ?? params.submitWhenPaid === true;
     const effectivePayments = shouldConfirmPendingVoucherPayments ? this.confirmPendingVoucherPaymentsInList(mappedPayments) : params.confirmPendingVoucherPayments === false ? this.discardPendingVoucherPaymentsFromList(mappedPayments) : mappedPayments;
     const completion = this.getPaymentCompletion(effectivePayments);
-    const paidPaymentTotal = this.calculatePaymentTotal(effectivePayments);
-    const paymentStatus = completion.isOrderFullyPaid ? params.paymentStatus || "paid" : paidPaymentTotal.gt(0) ? "partially_paid" : "payment_processing";
+    const orderPaidPaymentTotal = this.calculateOrderPaidPaymentTotal(effectivePayments);
+    const paymentStatus = completion.isOrderFullyPaid ? params.paymentStatus || "paid" : orderPaidPaymentTotal.gt(0) ? "partially_paid" : "payment_processing";
     tempOrder.payments = effectivePayments;
     tempOrder.payment_status = paymentStatus;
     this.persistTempOrder();
@@ -3998,7 +4031,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   async hydrateTempOrderFromRecord(record, options) {
     var _a, _b, _c;
     const raw = record && typeof record === "object" && record.data && record.order_id == null ? record.data : record || {};
-    const nextTempOrder = this.normalizeTempOrderForRuntime(raw);
+    const nextTempOrder = this.normalizeTempOrderForRuntime(raw, { makeEditMark: true });
     const rawSummary = raw.summary && typeof raw.summary === "object" ? raw.summary : {};
     const summarySurcharges = Array.isArray(rawSummary.surcharges) ? rawSummary.surcharges.map((s) => ({ ...s || {} })) : (0, import_lodash_es.cloneDeep)(nextTempOrder.surcharges || []);
     this.store.tempOrder = nextTempOrder;
@@ -4021,14 +4054,25 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.store.lastOrderInfo = raw.lastOrderInfo || raw;
     const hydratedEditDiscounts = this.collectHydratedEditDiscounts(nextTempOrder.products);
     const currentDiscounts = typeof ((_a = this.store.discount) == null ? void 0 : _a.getDiscountList) === "function" ? this.store.discount.getDiscountList() || [] : [];
-    const shouldSkipEmptyDiscountSync = hydratedEditDiscounts.length === 0 && currentDiscounts.length === 0;
+    const currentScanDiscounts = currentDiscounts.filter((discount) => discount == null ? void 0 : discount.isScan);
+    const hydratedDiscountIds = new Set(
+      hydratedEditDiscounts.map((discount) => discount == null ? void 0 : discount.id)
+    );
+    const retainedScanDiscounts = currentScanDiscounts.filter(
+      (discount) => !hydratedDiscountIds.has(discount == null ? void 0 : discount.id)
+    );
+    const nextDiscounts = [
+      ...hydratedEditDiscounts,
+      ...retainedScanDiscounts
+    ];
+    const shouldSkipEmptyDiscountSync = nextDiscounts.length === 0 && currentDiscounts.length === 0;
     if (!shouldSkipEmptyDiscountSync) {
       OrderModule.populateSavedAmounts(
         nextTempOrder.products,
-        hydratedEditDiscounts
+        nextDiscounts
       );
-      await ((_b = this.store.discount) == null ? void 0 : _b.setOriginalDiscountList(hydratedEditDiscounts));
-      await ((_c = this.store.discount) == null ? void 0 : _c.setDiscountList(hydratedEditDiscounts));
+      await ((_b = this.store.discount) == null ? void 0 : _b.setOriginalDiscountList(nextDiscounts));
+      await ((_c = this.store.discount) == null ? void 0 : _c.setDiscountList(nextDiscounts));
     }
     if (options == null ? void 0 : options.recalcOnHydrate) {
       await this.recalculateSummary({ createIfMissing: false });
@@ -4085,7 +4129,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     nextTempOrder.metadata = raw.metadata && typeof raw.metadata === "object" ? { ...raw.metadata } : {};
     nextTempOrder.holder = raw.holder && typeof raw.holder === "object" ? { ...raw.holder } : null;
     const rawProducts = Array.isArray(raw.products) ? raw.products : [];
-    nextTempOrder.products = rawProducts.length > 0 ? rawProducts.map((p) => this.normalizeHydratedOrderProduct(p)) : [];
+    nextTempOrder.products = rawProducts.length > 0 ? rawProducts.map((p) => this.normalizeHydratedOrderProduct(p, { makeEditMark: options == null ? void 0 : options.makeEditMark })) : [];
     nextTempOrder.bookings = Array.isArray(raw.bookings) ? raw.bookings.map((b) => {
       const booking = this.normalizeHydratedBookingHolder(b || {});
       return {
@@ -4231,7 +4275,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       normalized.id = optionItem.id;
     return normalized;
   }
-  normalizeHydratedOrderProduct(product) {
+  normalizeHydratedOrderProduct(product, options) {
     let row = { ...product || {} };
     if (row.num === void 0 && row.product_quantity !== void 0) {
       row.num = row.product_quantity;
@@ -4258,7 +4302,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if (!existingIdentity) {
       row.metadata.unique_identification_number = (0, import_utils.createUuidV4)();
     }
-    row.metadata.is_edit_for_runtime = true;
+    if (options == null ? void 0 : options.makeEditMark) {
+      row.metadata.is_edit_for_runtime = true;
+    }
     const normalized = (0, import_utils3.normalizeOrderProduct)(row);
     normalized.discount_list = (0, import_utils.normalizeOrderProductDiscountList)(
       normalized.discount_list

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

@@ -309,7 +309,6 @@ export interface OrderState {
     lastOrderInfo?: Record<string, any>;
     syncState?: OrderSyncState;
     discountList: any[];
-    availableWalletIds?: number[];
     discount: DiscountModule | null;
     rules: RulesModule | null;
 }
@@ -776,7 +775,6 @@ export interface OrderModuleAPI {
         apply?: boolean;
     }) => Promise<Discount[]>;
     getDiscountList: () => Discount[];
-    getAvailableWalletIds: () => number[];
     applyDiscount: () => void;
     /**
      * 注入促销评估器。

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

@@ -9,26 +9,6 @@ export interface ProductCollection {
     /** 商品集合封面 */
     cover: string;
 }
-/**
- * 商品 Data Variant 记录，结构与后端 data_variant 表对齐。
- */
-export interface ProductDataVariant {
-    /** 变体记录 id */
-    id: number;
-    /** 店铺 id */
-    shop_id: number;
-    /** 所属模块，商品场景固定为 product */
-    module: string;
-    /** 模块数据 id，商品场景对应 product.id */
-    module_data_id: number;
-    /** 关联 data_variant_rule.id */
-    data_variant_rule_id: number;
-    /** 命中策略后覆盖到商品上的字段 */
-    data: Record<string, any>;
-    created_at: string | null;
-    updated_at: string | null;
-    deleted_at: string | null;
-}
 /**
  * 商品基本信息接口
  */
@@ -234,8 +214,6 @@ export interface ProductData {
     bundle_group_count: number;
     /** 选项组数量 */
     option_group_count: number;
-    /** 智能定价变体列表，/product/query with dataVariants 返回 */
-    data_variants?: ProductDataVariant[];
     /** 服务时长 */
     service_times?: any;
 }

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

@@ -26,7 +26,7 @@ export declare class ProductList extends BaseModule implements Module {
      * const products = await productList.getAddTimeProducts({ schedule_date: '2026-06-16' });
      */
     getAddTimeProducts(params?: ProductListLoadProductsParams): Promise<any>;
-    loadProducts({ category_ids, product_ids, collection, menu_list_ids, customer_id: paramsCustomerId, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, extension_type, status, strategy_context, }?: ProductListLoadProductsParams, options?: {
+    loadProducts({ category_ids, product_ids, collection, menu_list_ids, customer_id: paramsCustomerId, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, extension_type, status, }?: ProductListLoadProductsParams, options?: {
         callback?: (result: any) => void;
         subscriberId?: string;
     }): Promise<any>;

package/lib/modules/ProductList/index.js

@@ -95,8 +95,7 @@ var ProductList = class extends import_BaseModule.BaseModule {
     cacheId,
     with_schedule,
     extension_type,
-    status = "published",
-    strategy_context
+    status = "published"
   } = {}, options) {
     var _a, _b;
     let userPlugin = this.core.getPlugin("user");
@@ -136,8 +135,7 @@ var ProductList = class extends import_BaseModule.BaseModule {
         is_eject: 1,
         with_schedule,
         schedule_datetime,
-        extension_type,
-        strategy_context
+        extension_type
       },
       { osServer: true, callback: options == null ? void 0 : options.callback, subscriberId: options == null ? void 0 : options.subscriberId, customToast: () => {
       } }

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

@@ -12,8 +12,6 @@ export interface ProductListLoadProductsParams {
     with_schedule?: number;
     extension_type?: string[];
     status?: string;
-    /** 智能定价条件上下文，仅影响策略命中，不参与商品集合筛选 */
-    strategy_context?: Record<string, any>;
 }
 export interface ProductListData {
     list: ProductData[];

package/lib/server/index.d.ts

@@ -47,8 +47,6 @@ declare class Server {
     private prefixRouterGet;
     router: Router;
     private productQuerySubscribers;
-    /** subscriberId → 智能定价变价时间点定时器句柄（与 subscriber 分离存储，便于 clear） */
-    private productQueryScheduleTimers;
     private orderQuerySubscribers;
     private bookingQuerySubscribers;
     private bookingRemoteQuerySubscribers;
@@ -212,48 +210,6 @@ declare class Server {
      * 根据 subscriberId 移除商品查询订阅者
      */
     removeProductQuerySubscriber(subscriberId?: string): void;
-    /**
-     * 构建商品 query 响应 data 段，附带智能定价 schedule_time_points 元数据。
-     */
-    private buildProductQueryResultPayload;
-    /**
-     * 是否启用商品 query 订阅的 schedule 时间点定时重算。
-     * strategy_context.enable_schedule_reload === false 时关闭。
-     */
-    private shouldScheduleProductQueryReload;
-    /**
-     * 清除指定 subscriber 的全部 schedule 定时器，防止重复 query 或 unsubscribe 后泄漏。
-     */
-    private clearSubscriberScheduleTimers;
-    /**
-     * 从 productQueryScheduleTimers 移除已触发的 timer 引用。
-     */
-    private removeScheduleTimerRef;
-    /**
-     * 计算 schedule 变价时间点到当前时刻的延迟（ms）。已过期返回 -1。
-     */
-    private computeScheduleTimePointDelayMs;
-    /**
-     * 定时重算前刷新 subscriber schedule 上下文：使用执行瞬间时间，禁止沿用首次 query 的 schedule_datetime。
-     */
-    private refreshSubscriberScheduleAtExecution;
-    /**
-     * 为 subscriber 注册智能定价 scheduleTimePoints 定时重算。
-     * 必须先 clearSubscriberScheduleTimers，再调用本方法。
-     */
-    private scheduleSubscriberTimePointReloads;
-    /**
-     * schedule 变价时间点定时器触发：刷新 schedule_datetime 后重算并 callback。
-     */
-    private onScheduleTimePointTimerFire;
-    /**
-     * 对单个商品 query 订阅者重算并推送（定时路径；不新建 schedule timer）。
-     */
-    private recomputeAndNotifySubscriber;
-    /**
-     * query 完成后为 subscriber 同步 schedule 定时器（先 clear 再 schedule）。
-     */
-    private syncProductQueryScheduleTimers;
     /**
      * 处理商品查询请求
      * 存储订阅者信息，便于数据变更时推送最新结果
@@ -614,12 +570,6 @@ declare class Server {
      * @param options.changedIds 变更的商品 IDs，用于增量更新价格缓存
      */
     private computeProductQueryResult;
-    /**
-     * 构建商品格式化上下文。
-     *
-     * 智能定价条件使用全量 menuList/scheduleList；Product Query 顶层参数只保留筛选商品集合所需字段。
-     */
-    private buildProductFormatterContext;
     /**
      * 数据变更后，遍历所有订阅者重新计算查询结果并通过 callback 推送
      * 由 ProductsModule 的 onProductsSyncCompleted 事件触发