@pisell/pisellos 2.2.258 → 2.2.260

package/lib/solution/BaseSales/index.js

@@ -156,9 +156,6 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     this.hasManualDiscountSelection = false;
     this.reusedSharedSubModuleNames = /* @__PURE__ */ new Set();
     this.paymentMethodsCache = [];
-    this.queuedAutoPaymentSync = false;
-    this.autoPaymentSyncFlushing = false;
-    this.autoPaymentSyncTimer = null;
   }
   /**
    * 子类可覆盖此方法以追加/收敛要注册的子模块。
@@ -168,10 +165,10 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     return ["products", "order", "salesSummary", "schedule", "payment", "quotation"];
   }
   getReusableSharedSubModule(moduleName) {
-    var _a, _b;
+    var _a;
     if (moduleName !== "schedule" && moduleName !== "quotation")
       return null;
-    return ((_b = (_a = this.core) == null ? void 0 : _a.getModule) == null ? void 0 : _b.call(_a, moduleName)) || null;
+    return ((_a = this.core) == null ? void 0 : _a.getModule(moduleName)) || null;
   }
   isScheduleListLoaded(scheduleModule) {
     if (!scheduleModule)
@@ -1022,7 +1019,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     });
   }
   async loadDiscountConfig(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t;
     if (!this.store.order)
       throw new Error("order 模块未初始化");
     const tempOrder = this.store.order.ensureTempOrder();
@@ -1093,15 +1090,13 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       };
     }
     if (rulesModule) {
-      const holders = ((_l = tempOrder.holder) == null ? void 0 : _l.form_record) || [];
-      const orderTotalAmount = Number(((_m = orderStore.summary) == null ? void 0 : _m.total_amount) || 0);
-      console.log("[BaseSales.applyDiscountConfig.calcDiscount]");
+      const holders = ((_l = tempOrder.holder) == null ? void 0 : _l.form_record_id) ? [{ form_record_id: tempOrder.holder.form_record_id }] : [];
       const result = rulesModule.calcDiscount({
         productList: tempOrder.products,
         discountList: nextDiscountList,
         holders,
-        isFormSubject: (product) => (0, import_utils.resolveIsFormSubject)(tempOrder, product),
-        orderTotalAmount
+        isFormSubject: !!((_m = tempOrder.holder) == null ? void 0 : _m.type) && tempOrder.holder.type === "form",
+        orderTotalAmount: Number(((_n = orderStore.summary) == null ? void 0 : _n.total_amount) || 0)
       }) || { productList: tempOrder.products, discountList: nextDiscountList };
       if (result.productList) {
         tempOrder.products = preserveManualProductDiscountProducts(
@@ -1110,8 +1105,8 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         );
       }
       for (const product of tempOrder.products || []) {
-        const productUid = (_n = product.metadata) == null ? void 0 : _n.unique_identification_number;
-        const runtimeOrigin = productUid ? (_q = (_p = (_o = tempOrder._extend) == null ? void 0 : _o.productsByUid) == null ? void 0 : _p[productUid]) == null ? void 0 : _q.origin : void 0;
+        const productUid = (_o = product.metadata) == null ? void 0 : _o.unique_identification_number;
+        const runtimeOrigin = productUid ? (_r = (_q = (_p = tempOrder._extend) == null ? void 0 : _p.productsByUid) == null ? void 0 : _q[productUid]) == null ? void 0 : _r.origin : void 0;
         if ((runtimeOrigin == null ? void 0 : runtimeOrigin.isManualDiscount) || isBaseSalesManualProductDiscountProduct(product))
           continue;
         const totalPerUnitDiscount = (product.discount_list || []).reduce(
@@ -1119,7 +1114,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
           0
         );
         const optionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(product));
-        const sourcePrice = ((_r = product.metadata) == null ? void 0 : _r.source_product_price) ?? (((_s = product.metadata) == null ? void 0 : _s.main_product_original_price) != null ? new import_decimal.default(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : product.original_price ?? "0");
+        const sourcePrice = ((_s = product.metadata) == null ? void 0 : _s.source_product_price) ?? (((_t = product.metadata) == null ? void 0 : _t.main_product_original_price) != null ? new import_decimal.default(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : product.original_price ?? "0");
         const newSourceSellingPrice = new import_decimal.default(Number(sourcePrice) || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
         const newMainSellingPrice = new import_decimal.default(Number(newSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
         if (product.metadata) {
@@ -1155,7 +1150,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     };
   }
   async bestDiscount(cb) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     if (!this.store.order)
       throw new Error("order 模块未初始化");
     const tempOrder = this.store.order.ensureTempOrder();
@@ -1174,15 +1169,13 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     };
     await (discountModule == null ? void 0 : discountModule.setDiscountList(nextDiscountList));
     if (rulesModule) {
-      const holders = ((_c = tempOrder.holder) == null ? void 0 : _c.form_record) || [];
-      const orderTotalAmount = Number(((_d = orderStore.summary) == null ? void 0 : _d.total_amount) || 0);
-      console.log("[BaseSales.bestDiscount.calcDiscount]");
+      const holders = ((_c = tempOrder.holder) == null ? void 0 : _c.form_record_id) ? [{ form_record_id: tempOrder.holder.form_record_id }] : [];
       result = rulesModule.calcDiscount({
         productList: tempOrder.products,
         discountList: nextDiscountList,
         holders,
-        isFormSubject: (product) => (0, import_utils.resolveIsFormSubject)(tempOrder, product),
-        orderTotalAmount
+        isFormSubject: !!((_d = tempOrder.holder) == null ? void 0 : _d.type) && tempOrder.holder.type === "form",
+        orderTotalAmount: Number(((_e = orderStore.summary) == null ? void 0 : _e.total_amount) || 0)
       }) || result;
       if (result.productList) {
         tempOrder.products = preserveManualProductDiscountProducts(
@@ -1251,19 +1244,16 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       const orderStore = this.store.order.store || {};
       const discountModule = orderStore.discount;
       const rulesModule = orderStore.rules;
-      const holders = ((_a = tempOrder.holder) == null ? void 0 : _a.form_record) || [];
+      const holders = ((_a = tempOrder.holder) == null ? void 0 : _a.form_record_id) ? [{ form_record_id: tempOrder.holder.form_record_id }] : [];
       let nextDiscountList = updated;
       await (discountModule == null ? void 0 : discountModule.setDiscountList(updated));
       if (rulesModule) {
-        const orderTotalAmount = Number(((_b = orderStore.summary) == null ? void 0 : _b.total_amount) || 0);
-        console.log("[BaseSales.setDiscountSelected.calcDiscount]");
         const result = rulesModule.calcDiscount(
           {
             productList: tempOrder.products,
             discountList: updated,
             holders,
-            isFormSubject: (product) => (0, import_utils.resolveIsFormSubject)(tempOrder, product),
-            orderTotalAmount
+            isFormSubject: !!((_b = tempOrder.holder) == null ? void 0 : _b.type) && tempOrder.holder.type === "form"
           },
           {
             discountId: params.discountId,
@@ -1286,7 +1276,6 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
               if (d.isSelected && !beforeSelectedIds.has(d.id)) {
                 d.isSelected = false;
                 d.isManualSelect = true;
-                d.appliedProductDetails = [];
               }
             }
           }
@@ -1295,32 +1284,16 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       const selectedResourceIds = new Set(
         nextDiscountList.filter((d) => d.isSelected).map((d) => d.id)
       );
-      const filterSelectedDiscountDetails = (discountList) => (discountList || []).filter((pd) => {
-        var _a2;
-        const rid = ((_a2 = pd.discount) == null ? void 0 : _a2.resource_id) ?? pd.id;
-        return rid != null && selectedResourceIds.has(rid);
-      });
       for (const product of tempOrder.products) {
         const productUid = (_c = product.metadata) == null ? void 0 : _c.unique_identification_number;
         const runtimeOrigin = productUid ? (_f = (_e = (_d = tempOrder._extend) == null ? void 0 : _d.productsByUid) == null ? void 0 : _e[productUid]) == null ? void 0 : _f.origin : void 0;
         if ((runtimeOrigin == null ? void 0 : runtimeOrigin.isManualDiscount) || isBaseSalesManualProductDiscountProduct(product))
           continue;
-        product.discount_list = filterSelectedDiscountDetails(product.discount_list);
-        if (Array.isArray(product.product_bundle)) {
-          product.product_bundle = product.product_bundle.map((bundle) => {
-            const nextBundleDiscountList = filterSelectedDiscountDetails(bundle == null ? void 0 : bundle.discount_list);
-            const shouldRestoreBundlePrice = nextBundleDiscountList.length === 0;
-            const restoredBundlePrice = (bundle == null ? void 0 : bundle.original_price) ?? (bundle == null ? void 0 : bundle.product_price) ?? (bundle == null ? void 0 : bundle.price);
-            return {
-              ...bundle,
-              ...shouldRestoreBundlePrice ? {
-                price: restoredBundlePrice,
-                bundle_selling_price: restoredBundlePrice
-              } : {},
-              discount_list: nextBundleDiscountList
-            };
-          });
-        }
+        product.discount_list = (product.discount_list || []).filter((pd) => {
+          var _a2;
+          const rid = ((_a2 = pd.discount) == null ? void 0 : _a2.resource_id) ?? pd.id;
+          return rid != null && selectedResourceIds.has(rid);
+        });
         const totalPerUnitDiscount = (product.discount_list || []).reduce(
           (sum, pd) => sum + (pd.amount || 0),
           0
@@ -1409,7 +1382,6 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       ...(params == null ? void 0 : params.payments) !== void 0 ? { payments: params.payments } : {},
       ...inferredPaymentStatus !== void 0 ? { paymentStatus: inferredPaymentStatus } : {},
       ...(params == null ? void 0 : params.smallTicketDataFlag) !== void 0 ? { smallTicketDataFlag: params.smallTicketDataFlag } : {},
-      ...(params == null ? void 0 : params.confirmPendingVoucherPayments) !== void 0 ? { confirmPendingVoucherPayments: params.confirmPendingVoucherPayments } : {},
       ...(params == null ? void 0 : params.enhancePayload) !== void 0 ? { enhancePayload: params.enhancePayload } : {}
     };
     return this.store.order.submitTempOrder(submitParams);
@@ -1429,7 +1401,6 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       ...(params == null ? void 0 : params.payments) !== void 0 ? { payments: params.payments } : {},
       ...inferredPaymentStatus !== void 0 ? { paymentStatus: inferredPaymentStatus } : {},
       ...(params == null ? void 0 : params.smallTicketDataFlag) !== void 0 ? { smallTicketDataFlag: params.smallTicketDataFlag } : {},
-      ...(params == null ? void 0 : params.confirmPendingVoucherPayments) !== void 0 ? { confirmPendingVoucherPayments: params.confirmPendingVoucherPayments } : {},
       ...(params == null ? void 0 : params.enhancePayload) !== void 0 ? { enhancePayload: params.enhancePayload } : {}
     };
     return this.store.order.submitTempOrderAsync(submitParams);
@@ -1498,7 +1469,6 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     };
     const syncState = this.store.order.getOrderSyncState();
     if (params.submitWhenPaid && syncState === "submitting") {
-      this.queueLatestAutoPaymentSync();
       return this.store.order.syncPaymentsToOrder(syncParams);
     }
     const payments = params.payments || [];
@@ -1510,28 +1480,14 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     });
     try {
       const syncResult = await this.store.order.syncPaymentsToOrder(syncParams);
-      const latestPayments = this.store.order.getOrderPayments();
-      const amountSnapshot = this.store.order.getOrderAmountSnapshot();
-      const orderSnapshot = this.store.order.getOrderSnapshot();
-      const syncPayload = {
+      await this.effectsEmit(import_types.BaseSalesHookNames.onPaymentSyncEnd, {
         ok: true,
         syncResult,
-        payments: latestPayments,
+        payments: this.store.order.getOrderPayments(),
         params: syncParams,
-        amountSnapshot,
-        orderSnapshot,
-        isFullyPaid: syncResult.isFullyPaid,
-        isOrderFullyPaid: syncResult.isOrderFullyPaid,
-        isDepositFullyPaid: syncResult.isDepositFullyPaid,
-        paymentStage: syncResult.paymentStage,
-        depositAmount: syncResult.depositAmount,
-        orderExpectedAmount: syncResult.orderExpectedAmount
-      };
-      await this.effectsEmit(import_types.BaseSalesHookNames.onPaymentSyncEnd, syncPayload);
-      if (syncResult.isDepositFullyPaid && !syncResult.isOrderFullyPaid) {
-        await this.effectsEmit(import_types.BaseSalesHookNames.onDepositPaymentSyncEnd, syncPayload);
-      }
-      this.scheduleQueuedAutoPaymentSyncFlush(0);
+        amountSnapshot: this.store.order.getOrderAmountSnapshot(),
+        orderSnapshot: this.store.order.getOrderSnapshot()
+      });
       return syncResult;
     } catch (error) {
       await this.effectsEmit(import_types.BaseSalesHookNames.onPaymentSyncEnd, {
@@ -1542,7 +1498,6 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         amountSnapshot: this.store.order.getOrderAmountSnapshot(),
         orderSnapshot: this.store.order.getOrderSnapshot()
       });
-      this.scheduleQueuedAutoPaymentSyncFlush(0);
       throw error;
     }
   }
@@ -1559,61 +1514,6 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       throw new Error("order 模块未初始化");
     return this.store.order.setOrderPayments(payments);
   }
-  getPaymentStatusForSync(payments) {
-    const order = this.store.order;
-    if (!order)
-      throw new Error("order 模块未初始化");
-    const completion = order.getPaymentCompletion(payments);
-    return completion.isOrderFullyPaid ? "paid" : "partially_paid";
-  }
-  queueLatestAutoPaymentSync() {
-    this.queuedAutoPaymentSync = true;
-    this.scheduleQueuedAutoPaymentSyncFlush();
-  }
-  scheduleQueuedAutoPaymentSyncFlush(delay = 100) {
-    if (!this.queuedAutoPaymentSync)
-      return;
-    if (this.autoPaymentSyncTimer)
-      return;
-    this.autoPaymentSyncTimer = setTimeout(() => {
-      this.autoPaymentSyncTimer = null;
-      void this.flushQueuedAutoPaymentSync();
-    }, delay);
-  }
-  async flushQueuedAutoPaymentSync() {
-    if (!this.store.order)
-      return;
-    if (!this.queuedAutoPaymentSync || this.autoPaymentSyncFlushing)
-      return;
-    if (this.store.order.getOrderSyncState() === "submitting") {
-      this.scheduleQueuedAutoPaymentSyncFlush();
-      return;
-    }
-    this.autoPaymentSyncFlushing = true;
-    try {
-      while (this.queuedAutoPaymentSync) {
-        this.queuedAutoPaymentSync = false;
-        const payments = this.store.order.getOrderPayments();
-        if (!payments.length)
-          continue;
-        await this.syncPaymentsToOrder({
-          payments,
-          paymentStatus: this.getPaymentStatusForSync(payments),
-          submitWhenPaid: true,
-          smallTicketDataFlag: 1
-        });
-      }
-    } catch (error) {
-      this.logError("queued auto sync payments failed", {
-        error: error instanceof Error ? error.message : String(error)
-      });
-    } finally {
-      this.autoPaymentSyncFlushing = false;
-      if (this.queuedAutoPaymentSync) {
-        this.scheduleQueuedAutoPaymentSyncFlush(0);
-      }
-    }
-  }
   /** 追加单个支付项到当前订单。 */
   addOrderPayment(payment) {
     var _a;
@@ -1649,14 +1549,11 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     });
     const amountSnapshot = this.store.order.getOrderAmountSnapshot();
     const syncState = this.store.order.getOrderSyncState();
-    if (amountSnapshot) {
-      if (syncState === "submitting") {
-        this.queueLatestAutoPaymentSync();
-        return payments;
-      }
+    if (amountSnapshot && syncState !== "submitting") {
+      const paymentStatus = Number(amountSnapshot.amountGap || 0) <= 0 ? "paid" : "partially_paid";
       void this.syncPaymentsToOrder({
         payments,
-        paymentStatus: this.getPaymentStatusForSync(payments),
+        paymentStatus,
         submitWhenPaid: true,
         smallTicketDataFlag: 1
       }).catch((error) => {
@@ -1664,6 +1561,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
           error: error instanceof Error ? error.message : String(error)
         });
       });
+    } else {
     }
     return payments;
   }
@@ -1680,20 +1578,10 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     return this.store.order.deleteOrderPayment(paymentIdentity);
   }
   /** 覆盖 wallet pass 支付项，同时保留普通支付项。 */
-  updateVoucherOrderPayments(payments, options) {
-    if (!this.store.order)
-      throw new Error("order 模块未初始化");
-    return this.store.order.updateVoucherOrderPayments(payments, options);
-  }
-  confirmPendingVoucherPayments() {
-    if (!this.store.order)
-      throw new Error("order 模块未初始化");
-    return this.store.order.confirmPendingVoucherPayments();
-  }
-  discardPendingVoucherPayments() {
+  updateVoucherOrderPayments(payments) {
     if (!this.store.order)
       throw new Error("order 模块未初始化");
-    return this.store.order.discardPendingVoucherPayments();
+    return this.store.order.updateVoucherOrderPayments(payments);
   }
   getWalletProductList() {
     var _a, _b, _c;

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

@@ -14,7 +14,6 @@ export declare const BaseSalesHookNames: {
     readonly onCartValidationChanged: "onCartValidationChanged";
     readonly onPaymentSyncStart: "onPaymentSyncStart";
     readonly onPaymentSyncEnd: "onPaymentSyncEnd";
-    readonly onDepositPaymentSyncEnd: "onDepositPaymentSyncEnd";
 };
 export type BaseSalesHookName = typeof BaseSalesHookNames[keyof typeof BaseSalesHookNames];
 export declare function createBaseSalesHook(moduleName: string, hookName: BaseSalesHookName): string;

package/lib/solution/BaseSales/types.js

@@ -30,8 +30,7 @@ var BaseSalesHookNames = {
   onRefresh: "onRefresh",
   onCartValidationChanged: "onCartValidationChanged",
   onPaymentSyncStart: "onPaymentSyncStart",
-  onPaymentSyncEnd: "onPaymentSyncEnd",
-  onDepositPaymentSyncEnd: "onDepositPaymentSyncEnd"
+  onPaymentSyncEnd: "onPaymentSyncEnd"
 };
 function createBaseSalesHook(moduleName, hookName) {
   return `${moduleName}:${hookName}`;

package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -129,9 +129,10 @@ function transformBaseProductToOrderProduct(params) {
     payload.price ?? payload.selling_price ?? (matchedVariant == null ? void 0 : matchedVariant.price) ?? (matchedVariant == null ? void 0 : matchedVariant.base_price) ?? (origin == null ? void 0 : origin.price) ?? (origin == null ? void 0 : origin.base_price) ?? (sourceProduct == null ? void 0 : sourceProduct.price) ?? (sourceProduct == null ? void 0 : sourceProduct.selling_price) ?? (sourceProduct == null ? void 0 : sourceProduct.base_price),
     "0.00"
   );
-  const explicitLineTotal = payload.line_total ?? payload.total ?? ((_c = payload._extend) == null ? void 0 : _c.total);
-  const hasExplicitLineTotal = Number.isFinite(Number(explicitLineTotal));
-  const lineCompositeTotal = toPriceString(explicitLineTotal, sourceProductPrice);
+  const lineCompositeTotal = toPriceString(
+    payload.line_total ?? payload.total ?? ((_c = payload._extend) == null ? void 0 : _c.total),
+    sourceProductPrice
+  );
   const hasPriceOverride = payload.price_override !== void 0 && payload.price_override !== null && payload.price_override !== "";
   const productOptionItem = (0, import_utils.normalizeProductSkuOptions)(
     normalizeOptionItems(
@@ -179,7 +180,7 @@ function transformBaseProductToOrderProduct(params) {
   const optionSum = (0, import_utils.sumOptionUnitPrice)(productOptionItem).toNumber();
   const mainProductOriginalPrice = toPriceString(Number(sourceProductPrice) + optionSum);
   const bundleOnlyComposite = (0, import_utils.composeLinePrice)({ mainPrice: 0, bundle: productBundle });
-  const derivedMainSelling = hasExplicitLineTotal ? Number(lineCompositeTotal) - Number(bundleOnlyComposite) : Number(mainProductOriginalPrice);
+  const derivedMainSelling = Number(lineCompositeTotal) - Number(bundleOnlyComposite);
   const mainProductSellingPrice = toPriceString(
     Number.isFinite(derivedMainSelling) && derivedMainSelling >= 0 ? derivedMainSelling : Number(mainProductOriginalPrice)
   );

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 | 5 | 1 | 2 | 3 | 6 | 4;
+        weekNum: 0 | 1 | 2 | 5 | 4 | 3 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -322,7 +322,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态
@@ -551,14 +551,6 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     setOtherParams(params: Record<string, any>, { cover }?: {
         cover?: boolean;
     }): Promise<void>;
-    private getDeviceTaskPlugin;
-    handlePrintWristband(params: {
-        voucher_ids: number[];
-    }): Promise<void>;
-    handleCheckIn(params: {
-        voucher_ids: number[];
-        is_checkin: boolean;
-    }): Promise<any>;
     /**
      * 销毁模块：先调用父类（销毁所有 store 内子模块 + emit destroy + super.destroy()），
      * 再清理 BookingTicket 自有资源（scan 监听 + scan 内存缓存）。

package/lib/solution/BookingTicket/index.js

@@ -52,7 +52,6 @@ var import_buildNormalProductCacheItemFromOrderLine = require("../../modules/Boo
 var import_orderLineDisplay = require("../../modules/BookingContext/utils/orderLineDisplay");
 var import_bookingStatus = require("./utils/bookingStatus");
 var import_resolveBestAddTimePlan = require("./utils/resolveBestAddTimePlan");
-var import_utils = require("../../modules/Order/utils");
 __reExport(BookingTicket_exports, require("./types"), module.exports);
 var OPEN_DATA_SECTION_CODES = ["sale", "reservation", "fulfillment", "menu", "workflow"];
 var OPEN_DATA_CACHE_TTL = 5 * 60 * 1e3;
@@ -1506,117 +1505,6 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
       await this.configureIdGeneratorFromOpenData();
     }
   }
-  getDeviceTaskPlugin() {
-    var _a;
-    const app = this.core.getPlugin("app");
-    return ((_a = app == null ? void 0 : app.getApp()) == null ? void 0 : _a.getPlugin("deviceTask")) || null;
-  }
-  // 打印手环，单个或批量都可以
-  async handlePrintWristband(params) {
-    var _a;
-    const deviceTask = this.getDeviceTaskPlugin();
-    if (!(deviceTask == null ? void 0 : deviceTask.dispatch)) {
-      this.logger.addLog({
-        type: "info",
-        title: "[BookingTicket] handlePrintWristband: deviceTask.dispatch 不可用",
-        metadata: {
-          voucher_ids: Array.isArray(params.voucher_ids) ? params.voucher_ids : [params.voucher_ids]
-        }
-      });
-      return;
-    }
-    this.logger.addLog({
-      type: "info",
-      title: "[BookingTicket] handlePrintWristband",
-      metadata: {
-        voucher_ids: Array.isArray(params.voucher_ids) ? params.voucher_ids : [params.voucher_ids]
-      }
-    });
-    const deviceId = await this.getShortNumberOrDeviceId();
-    const idempotencyKey = (0, import_utils.createUuidV4)();
-    deviceTask.dispatch({
-      action: "print_all",
-      device_id: deviceId,
-      payload: {
-        type: "WRISTBAND",
-        data: {
-          order_id: (_a = this.getOrderIdentity()) == null ? void 0 : _a.orderId,
-          voucher_ids: Array.isArray(params.voucher_ids) ? params.voucher_ids : [params.voucher_ids]
-        }
-      },
-      idempotency_key: idempotencyKey,
-      name: "PRINT_WRISTBAND",
-      source: "bookingTicket",
-      source_type: "handlePrintWristband",
-      source_id: idempotencyKey
-    });
-  }
-  // 触发 checkIn
-  async handleCheckIn(params) {
-    var _a, _b, _c;
-    this.logger.addLog({
-      type: "info",
-      title: "[BookingTicket] handleCheckIn",
-      metadata: {
-        voucher_ids: Array.isArray(params.voucher_ids) ? params.voucher_ids : [params.voucher_ids],
-        is_checkin: params.is_checkin
-      }
-    });
-    const voucherIds = Array.isArray(params.voucher_ids) ? params.voucher_ids : [];
-    const voucherIdSet = new Set(voucherIds);
-    const tempOrder = (_b = (_a = this.store.order) == null ? void 0 : _a.getTempOrder) == null ? void 0 : _b.call(_a);
-    const vouchers = (tempOrder == null ? void 0 : tempOrder.vouchers) || ((_c = this.store.order) == null ? void 0 : _c.getVouchers()) || [];
-    const batchMetadata = [];
-    let hasUpdatedVoucher = false;
-    const nextVouchers = vouchers.map((voucher) => {
-      var _a2;
-      if (!voucherIdSet.has(voucher.voucher_id))
-        return voucher;
-      hasUpdatedVoucher = true;
-      const metadata = {
-        ...voucher.metadata || {},
-        ticket: {
-          ...((_a2 = voucher.metadata) == null ? void 0 : _a2.ticket) || {},
-          is_checkin: params.is_checkin
-        }
-      };
-      batchMetadata.push({
-        voucher_id: voucher.voucher_id,
-        metadata
-      });
-      return {
-        ...voucher,
-        metadata
-      };
-    });
-    if (tempOrder && hasUpdatedVoucher) {
-      await this.replaceTempOrder({
-        ...tempOrder,
-        vouchers: nextVouchers
-      });
-    }
-    this.core.effects.emit(`${this.name}:onVouchersChange`, {});
-    if (batchMetadata.length === 0) {
-      return {
-        code: 200,
-        status: true,
-        message: "",
-        data: []
-      };
-    }
-    const identity = this.getOrderIdentity();
-    const externalSaleNumber = (tempOrder == null ? void 0 : tempOrder.external_sale_number) || (identity == null ? void 0 : identity.externalSaleNumber) || void 0;
-    const orderId = (tempOrder == null ? void 0 : tempOrder.order_id) ?? (identity == null ? void 0 : identity.orderId) ?? void 0;
-    const orderLookup = externalSaleNumber || orderId || (identity == null ? void 0 : identity.orderNumber) || (identity == null ? void 0 : identity.shopOrderNumber) || (identity == null ? void 0 : identity.shopFullOrderNumber) || void 0;
-    return this.request.post("/machinecode/batch-metadata", {
-      data: batchMetadata,
-      order_lookup: orderLookup,
-      order_id: orderId,
-      external_sale_number: externalSaleNumber
-    }, {
-      osServer: true
-    });
-  }
   /**
    * 销毁模块：先调用父类（销毁所有 store 内子模块 + emit destroy + super.destroy()），
    * 再清理 BookingTicket 自有资源（scan 监听 + scan 内存缓存）。

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

@@ -83,6 +83,8 @@ export interface ILoadProductsParams {
     extension_type?: string[];
     /** 商品发布状态 */
     status?: string;
+    /** 智能定价条件上下文，仅影响策略命中，不参与商品集合筛选 */
+    strategy_context?: Record<string, any>;
 }
 /**
  * 加载商品详情的参数

package/package.json

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

package/dist/modules/Order/utils/bundleDiscountHydration.d.ts

@@ -1,5 +0,0 @@
-import type { OrderProductDiscountItem } from '../types';
-type NormalizeDiscountList = (discountList?: unknown[] | null) => OrderProductDiscountItem[];
-export declare function restoreHydratedBundleDiscounts<T extends Record<string, any>>(product: T, normalizeDiscountList: NormalizeDiscountList): T;
-export declare function expandHydratedProductsForDiscountCollection(products: any[] | undefined | null): any[];
-export {};