@pisell/pisellos 2.3.5 → 2.3.7

package/lib/modules/BookingContext/utils/buildCacheItemFromOrderLine.js

@@ -142,6 +142,14 @@ function resolveMainProductPrice(product, fallback) {
   const parsed = Number(value);
   return Number.isFinite(parsed) ? parsed : fallback;
 }
+function mapOrderBundleToOtherBundle(bundle) {
+  return bundle.map((item) => {
+    return {
+      ...item,
+      original_price: item.original_price ?? item.bundle_selling_price ?? item.price
+    };
+  });
+}
 function synthesizeProductResourceFromBooking(booking) {
   const rows = booking == null ? void 0 : booking.resources;
   if (!Array.isArray(rows) || rows.length === 0)
@@ -191,7 +199,9 @@ function buildCacheItemFromOrderLine(input) {
   const other = {
     product_variant_id: product.product_variant_id ?? 0,
     option: (0, import_utils.getProductSkuOptions)(product),
-    bundle: Array.isArray(product.product_bundle) ? [...product.product_bundle] : []
+    bundle: mapOrderBundleToOtherBundle(
+      Array.isArray(product.product_bundle) ? product.product_bundle : []
+    )
   };
   const extend = {
     start_date: startDate ? (0, import_dayjs.default)(startDate) : void 0,

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

@@ -154,10 +154,21 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private calculatePaymentTotal;
     private getDepositAmount;
     private normalizeDepositAmount;
+    private getLastOrderDepositSnapshot;
+    private getLastOrderSubmitSnapshot;
     private applyDepositAmountToSummary;
+    private applyLastOrderDepositSnapshot;
     private isDepositOrder;
     private getOrderExpectedAmount;
     private isDepositCovered;
+    getPaymentCompletion(payments?: OrderPaymentSource[]): {
+        isFullyPaid: boolean;
+        isOrderFullyPaid: boolean;
+        isDepositFullyPaid: boolean;
+        paymentStage: 'deposit' | 'normal';
+        depositAmount: string;
+        orderExpectedAmount: string;
+    };
     private calculateDepositPaidAmount;
     private resolveNextOrderPaymentType;
     private normalizePaymentSource;
@@ -431,7 +442,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/lib/modules/Order/index.js

@@ -236,6 +236,21 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         product.metadata.main_product_selling_price = newMainSellingPrice;
         product.metadata.price_schema_version = 2;
       }
+      if (Array.isArray(product.product_bundle)) {
+        product.product_bundle = product.product_bundle.map((bundle) => {
+          const hasBundleDiscount = Array.isArray(bundle == null ? void 0 : bundle.discount_list) && bundle.discount_list.length > 0;
+          if (hasBundleDiscount)
+            return bundle;
+          const restoredPrice = (bundle == null ? void 0 : bundle.original_price) ?? (bundle == null ? void 0 : bundle.product_price) ?? (bundle == null ? void 0 : bundle.price);
+          if (restoredPrice === void 0 || restoredPrice === null || restoredPrice === "")
+            return bundle;
+          return {
+            ...bundle,
+            price: restoredPrice,
+            bundle_selling_price: restoredPrice
+          };
+        });
+      }
       product.selling_price = (0, import_utils.composeLinePrice)({
         mainPrice: newMainSellingPrice,
         bundle: product.product_bundle
@@ -434,7 +449,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     });
   }
   async scanCode(code, customerId) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d;
     const resultDiscountWithReason = await ((_a = this.store.discount) == null ? void 0 : _a.batchSearch(code, { customerId })) || { discountList: [], unavailableReasonKey: null };
     const { discountList: resultDiscountList, unavailableReasonKey } = resultDiscountWithReason;
     const rulesModule = this.store.rules;
@@ -470,17 +485,17 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       };
     }
     const tempOrder = this.store.tempOrder;
-    const holders = ((_b = tempOrder == null ? void 0 : tempOrder.holder) == null ? void 0 : _b.form_record_id) ? [{ form_record_id: tempOrder.holder.form_record_id }] : [];
+    const holders = ((_b = tempOrder == null ? void 0 : tempOrder.holder) == null ? void 0 : _b.form_record) || [];
     const { isAvailable, discountList: newDiscountList, unavailableReason } = rulesModule.isDiscountListAvailable({
       productList: (tempOrder == null ? void 0 : tempOrder.products) || [],
       oldDiscountList: this.getDiscountList(),
       newDiscountList: withScanList,
       orderTotalAmount: Number(((_c = this.store.summary) == null ? void 0 : _c.total_amount) || 0),
       holders,
-      isFormSubject: !!((_d = tempOrder == null ? void 0 : tempOrder.holder) == null ? void 0 : _d.type) && tempOrder.holder.type === "form"
+      isFormSubject: (product) => (0, import_utils.resolveIsFormSubject)(tempOrder, product)
     }) || { isAvailable: false, discountList: this.getDiscountList() };
     if (isAvailable && newDiscountList) {
-      (_e = this.store.discount) == null ? void 0 : _e.setDiscountList(newDiscountList);
+      (_d = this.store.discount) == null ? void 0 : _d.setDiscountList(newDiscountList);
       this.applyDiscount();
     }
     return {
@@ -492,24 +507,25 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     };
   }
   applyDiscount() {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d;
     const tempOrder = this.store.tempOrder;
     if (!tempOrder)
       return;
     delete tempOrder.discount_list;
-    if (this.shouldSkipDiscountCalculation(tempOrder))
+    const discountList = ((_a = this.store.discount) == null ? void 0 : _a.getDiscountList()) || [];
+    const shouldSkipDiscountCalculation = this.shouldSkipDiscountCalculation(tempOrder);
+    if (shouldSkipDiscountCalculation)
       return;
     const rulesModule = this.store.rules;
     if (!rulesModule)
       return;
-    const discountList = ((_a = this.store.discount) == null ? void 0 : _a.getDiscountList()) || [];
-    const holders = ((_b = tempOrder.holder) == null ? void 0 : _b.form_record_id) ? [{ form_record_id: tempOrder.holder.form_record_id }] : [];
+    const holders = ((_b = tempOrder.holder) == null ? void 0 : _b.form_record) || [];
     const result = rulesModule.calcDiscount({
       productList: tempOrder.products,
       discountList,
       holders,
-      isFormSubject: !!((_c = tempOrder.holder) == null ? void 0 : _c.type) && tempOrder.holder.type === "form",
-      orderTotalAmount: Number(((_d = this.store.summary) == null ? void 0 : _d.total_amount) || 0)
+      isFormSubject: (product) => (0, import_utils.resolveIsFormSubject)(tempOrder, product),
+      orderTotalAmount: Number(((_c = this.store.summary) == null ? void 0 : _c.total_amount) || 0)
     });
     if (result == null ? void 0 : result.productList) {
       const previousProductsByUid = (0, import_utils.indexOrderProductsByUid)(tempOrder.products);
@@ -538,7 +554,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         result.productList || tempOrder.products,
         result.discountList
       );
-      (_e = this.store.discount) == null ? void 0 : _e.setDiscountList(result.discountList);
+      (_d = this.store.discount) == null ? void 0 : _d.setDiscountList(result.discountList);
     }
     this.hasActiveCustomerBoundDiscount = (tempOrder.products || []).some(
       (product) => this.productHasCustomerBoundDiscount(product)
@@ -825,6 +841,33 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   normalizeDepositAmount(amount) {
     return import_decimal.default.max(new import_decimal.default(Number(amount) || 0), 0).toDecimalPlaces(2).toFixed(2);
   }
+  getLastOrderDepositSnapshot() {
+    var _a;
+    const lastOrderInfo = this.store.lastOrderInfo;
+    if (!lastOrderInfo || typeof lastOrderInfo !== "object")
+      return null;
+    const rawDepositAmount = lastOrderInfo.deposit_amount ?? ((_a = lastOrderInfo.summary) == null ? void 0 : _a.deposit_amount);
+    const depositAmount = this.normalizeDepositAmount(rawDepositAmount ?? 0);
+    const hasDepositAmount = new import_decimal.default(depositAmount).gt(0);
+    const isDeposit = Number(lastOrderInfo.is_deposit) === 1 || hasDepositAmount;
+    if (!isDeposit || !hasDepositAmount)
+      return null;
+    return {
+      isDeposit: 1,
+      depositAmount
+    };
+  }
+  getLastOrderSubmitSnapshot() {
+    const lastOrderInfo = this.store.lastOrderInfo;
+    if (!lastOrderInfo || typeof lastOrderInfo !== "object")
+      return {};
+    const businessCode = lastOrderInfo.business_code;
+    const type = lastOrderInfo.type;
+    return {
+      ...typeof businessCode === "string" && businessCode ? { businessCode } : {},
+      ...typeof type === "string" && type ? { type } : {}
+    };
+  }
   applyDepositAmountToSummary(tempOrder, summary, amount) {
     const depositAmount = this.normalizeDepositAmount(amount);
     const hasDepositAmount = new import_decimal.default(depositAmount).gt(0);
@@ -843,8 +886,27 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     tempOrder.is_deposit = hasDepositAmount ? 1 : 0;
     return nextSummary;
   }
+  applyLastOrderDepositSnapshot(tempOrder, summary) {
+    const snapshot = this.getLastOrderDepositSnapshot();
+    if (!snapshot)
+      return summary;
+    const existedDeposit = summary.deposit && typeof summary.deposit === "object" ? summary.deposit : void 0;
+    const nextSummary = {
+      ...summary,
+      deposit_amount: snapshot.depositAmount,
+      deposit: {
+        ...existedDeposit || {},
+        total: snapshot.depositAmount,
+        deposit_policy_ids: (existedDeposit == null ? void 0 : existedDeposit.deposit_policy_ids) || [],
+        hasDeposit: true
+      }
+    };
+    tempOrder.deposit_amount = snapshot.depositAmount;
+    tempOrder.is_deposit = tempOrder.is_deposit === 0 && new import_decimal.default(tempOrder.deposit_amount || 0).gt(0) ? 0 : snapshot.isDeposit;
+    return nextSummary;
+  }
   isDepositOrder(tempOrder, depositAmount) {
-    return tempOrder.is_deposit === 1 || depositAmount.gt(0);
+    return tempOrder.is_deposit === 1 && depositAmount.gt(0);
   }
   getOrderExpectedAmount(summary) {
     return new import_decimal.default(summary.expect_amount || summary.total_amount || 0);
@@ -857,6 +919,33 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return false;
     return params.paidAmount.gte(depositAmount);
   }
+  getPaymentCompletion(payments) {
+    const tempOrder = this.ensureTempOrder();
+    const summary = this.store.summary || (0, import_utils.createEmptySummary)();
+    const paymentList = payments || tempOrder.payments || [];
+    const refundAmount = this.getSummaryRefundAmount(summary);
+    const netPaidAmount = import_decimal.default.max(
+      this.calculatePaymentTotal(paymentList).minus(refundAmount),
+      0
+    );
+    const depositAmount = this.getDepositAmount(tempOrder, summary);
+    const orderExpectedAmount = this.getOrderExpectedAmount(summary);
+    const isDepositFullyPaid = this.isDepositCovered({
+      tempOrder,
+      summary,
+      paidAmount: netPaidAmount
+    });
+    const isOrderFullyPaid = orderExpectedAmount.lte(0) ? true : netPaidAmount.gte(orderExpectedAmount);
+    const paymentStage = this.isDepositOrder(tempOrder, depositAmount) && !isDepositFullyPaid ? "deposit" : "normal";
+    return {
+      isFullyPaid: isOrderFullyPaid,
+      isOrderFullyPaid,
+      isDepositFullyPaid,
+      paymentStage,
+      depositAmount: depositAmount.toFixed(2),
+      orderExpectedAmount: orderExpectedAmount.toFixed(2)
+    };
+  }
   calculateDepositPaidAmount(payments) {
     return (payments || []).reduce((sum, payment) => {
       const paymentRecord = payment;
@@ -1515,7 +1604,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       orderPaidAmount: paidPaymentSummary.gapPaidAmount
     });
     return {
-      isDeposit: tempOrder.is_deposit === 1 || depositAmount !== "0.00",
+      isDeposit: tempOrder.is_deposit === 1,
       depositAmount,
       expectAmount: summary.expect_amount || "0.00",
       totalAmount: summary.total_amount || "0.00",
@@ -1800,9 +1889,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         hasDeposit: true
       } : void 0
     };
+    const isExistingDepositDisabled = tempOrder.is_deposit === 0 && new import_decimal.default(tempOrder.deposit_amount || 0).gt(0);
     tempOrder.deposit_amount = depositAmount;
-    tempOrder.is_deposit = hasDepositAmount ? 1 : 0;
-    return nextSummary;
+    tempOrder.is_deposit = hasDepositAmount && !isExistingDepositDisabled ? 1 : 0;
+    return this.applyLastOrderDepositSnapshot(tempOrder, nextSummary);
   }
   async recalculateSummary(options) {
     const tempOrder = (options == null ? void 0 : options.createIfMissing) ? this.ensureTempOrder() : this.store.tempOrder;
@@ -2146,6 +2236,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     if (String(previousCustomerId ?? "") !== String(nextCustomerId ?? "")) {
       (0, import_utils.clearTempOrderHolderAssignments)(tempOrder);
       this.clearCustomerBoundDiscounts(tempOrder);
+      this.applyDiscount();
     }
     this.persistTempOrder();
     this.saveDraftInBackground();
@@ -2317,9 +2408,27 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const hasSyncedOrderPayment = (payment) => {
       return payment.order_payment_id !== void 0 && payment.order_payment_id !== null;
     };
+    const isOrderPaymentType = (value) => {
+      return value === "normal" || value === "deposit";
+    };
+    const voucherOrderPaymentType = this.resolveNextOrderPaymentType(tempOrder);
+    const withVoucherPaymentType = (payment) => {
+      const paymentRecord = payment;
+      if (!isVoucherPayment(paymentRecord))
+        return payment;
+      const explicitPaymentType = isOrderPaymentType(paymentRecord.order_payment_type) ? paymentRecord.order_payment_type : isOrderPaymentType(paymentRecord.type) ? paymentRecord.type : void 0;
+      const nextPaymentType = explicitPaymentType || voucherOrderPaymentType;
+      const shouldPreserveCustomPaymentType = paymentRecord.custom_payment_type === void 0 && paymentRecord.type !== void 0 && !isOrderPaymentType(paymentRecord.type);
+      return {
+        ...paymentRecord,
+        ...shouldPreserveCustomPaymentType ? { custom_payment_type: paymentRecord.type } : {},
+        type: nextPaymentType,
+        order_payment_type: nextPaymentType
+      };
+    };
     const mappedVouchers = (0, import_utils.mapPaymentItemsToOrderPayments)(
       payments.map(
-        (payment) => this.normalizePaymentSource(payment, { defaultPaid: true })
+        (payment) => this.normalizePaymentSource(withVoucherPaymentType(payment), { defaultPaid: true })
       )
     ).filter((payment) => {
       return isVoucherPayment(payment);
@@ -2561,7 +2670,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    */
   async addProductToOrder(product, booking) {
     const tempOrder = this.ensureTempOrder();
-    debugger;
     if (booking) {
       const productRecord = product;
       const splitCount = (0, import_utils3.getSafeProductNum)(
@@ -3128,13 +3236,14 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       const enhancedPayload = (params == null ? void 0 : params.enhancePayload) ? params.enhancePayload(nextPayload, ctx) : nextPayload;
       return enhancedPayload;
     } : void 0;
+    const submitSnapshot = this.getLastOrderSubmitSnapshot();
     const payload = (0, import_utils.buildSubmitPayload)({
       tempOrder,
       cacheId: effectiveCacheId,
       platform: (params == null ? void 0 : params.platform) || ((_a = this.otherParams) == null ? void 0 : _a.platform),
-      businessCode: (params == null ? void 0 : params.businessCode) ?? ((_b = this.otherParams) == null ? void 0 : _b.businessCode) ?? ((_c = this.otherParams) == null ? void 0 : _c.business_code),
+      businessCode: submitSnapshot.businessCode ?? (params == null ? void 0 : params.businessCode) ?? ((_b = this.otherParams) == null ? void 0 : _b.businessCode) ?? ((_c = this.otherParams) == null ? void 0 : _c.business_code),
       channel: params == null ? void 0 : params.channel,
-      type: params == null ? void 0 : params.type,
+      type: submitSnapshot.type ?? (params == null ? void 0 : params.type),
       summary: latestSummary,
       request_unique_idempotency_token: params == null ? void 0 : params.request_unique_idempotency_token,
       enhance: enhancePayload
@@ -3272,19 +3381,17 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const mappedPayments = (0, import_utils.mapPaymentItemsToOrderPayments)(
       params.payments || []
     );
-    const paymentTotal = this.calculatePaymentTotal(mappedPayments);
-    const targetAmount = this.getPaymentTargetAmount();
-    const isFullyPaid = targetAmount.lte(0) ? true : paymentTotal.gte(targetAmount);
-    const paymentStatus = isFullyPaid ? params.paymentStatus || "paid" : "partially_paid";
+    const completion = this.getPaymentCompletion(mappedPayments);
+    const paymentStatus = completion.isOrderFullyPaid ? params.paymentStatus || "paid" : "partially_paid";
     tempOrder.payments = mappedPayments;
     tempOrder.payment_status = paymentStatus;
     this.persistTempOrder();
     await this.saveDraft();
     if (!params.submitWhenPaid) {
-      return { isFullyPaid };
+      return completion;
     }
     if (this.store.syncState === "submitting") {
-      return { isFullyPaid };
+      return completion;
     }
     this.store.syncState = "submitting";
     const paymentSyncIdempotencyToken = this.buildPaymentSyncIdempotencyToken(
@@ -3305,7 +3412,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         return nextPayload;
       }
     });
-    return { isFullyPaid, submitResult };
+    return { ...completion, submitResult };
   }
   createOrder(params) {
     var _a;
@@ -3892,6 +3999,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   async getOrderInfo(order_id) {
     const res = await this.request.get(`/order/sales/${order_id}`, {
       with: ["products", "bookings"]
+    }, {
+      osServer: true
     });
     return res;
   }

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

@@ -540,6 +540,11 @@ export interface SyncPaymentsToOrderParams {
 }
 export interface SyncPaymentsToOrderResult<T = any> {
     isFullyPaid: boolean;
+    isOrderFullyPaid: boolean;
+    isDepositFullyPaid: boolean;
+    paymentStage: 'deposit' | 'normal';
+    depositAmount: string;
+    orderExpectedAmount: string;
     submitResult?: T;
 }
 export interface OrderIdentitySnapshot {

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

@@ -254,6 +254,10 @@ export declare function clearTempOrderHolderAssignments(tempOrder: OrderTempOrde
  * getOrderProductLineUid({ metadata: { unique_identification_number: 'line-1' } }); // 'line-1'
  */
 export declare function getOrderProductLineUid(product: Record<string, any> | null | undefined): string | null;
+export declare function getRuntimeProductOrigin(tempOrder: OrderTempOrder | null | undefined, product: any): Record<string, any> | null;
+export declare function isHolderConfigRequired(holderConfig: any): boolean;
+export declare function productRequiresFormSubject(tempOrder: OrderTempOrder | null | undefined, product: any): boolean;
+export declare function resolveIsFormSubject(tempOrder: OrderTempOrder | null | undefined, product?: any): boolean;
 /**
  * 判断展示字段是否为空（含 i18n 对象全空）。
  *

package/lib/modules/Order/utils.js

@@ -49,9 +49,11 @@ __export(utils_exports, {
   getBundleSignedUnit: () => getBundleSignedUnit,
   getOrderProductLineUid: () => getOrderProductLineUid,
   getProductSkuOptions: () => getProductSkuOptions,
+  getRuntimeProductOrigin: () => getRuntimeProductOrigin,
   hasAssignedHolderId: () => hasAssignedHolderId,
   indexOrderProductsByUid: () => indexOrderProductsByUid,
   isEmptyOrderProductDisplayValue: () => isEmptyOrderProductDisplayValue,
+  isHolderConfigRequired: () => isHolderConfigRequired,
   isMarkdownBundle: () => isMarkdownBundle,
   isTempOrder: () => isTempOrder,
   mapPaymentItemToOrderPayment: () => mapPaymentItemToOrderPayment,
@@ -65,7 +67,9 @@ __export(utils_exports, {
   normalizeProductSkuOptions: () => normalizeProductSkuOptions,
   normalizeSubmitBooking: () => normalizeSubmitBooking,
   normalizeSubmitCollectPaxValue: () => normalizeSubmitCollectPaxValue,
+  productRequiresFormSubject: () => productRequiresFormSubject,
   resolveEffectivePerUnitDiscount: () => resolveEffectivePerUnitDiscount,
+  resolveIsFormSubject: () => resolveIsFormSubject,
   resolveManualDiscountMessage: () => import_manualProductDiscount.resolveManualDiscountMessage,
   resolveManualDiscountOriginTotal: () => import_manualProductDiscount.resolveManualDiscountOriginTotal,
   resolveManualDiscountReasonFromSources: () => import_manualProductDiscount.resolveManualDiscountReasonFromSources,
@@ -1094,6 +1098,37 @@ function getOrderProductLineUid(product) {
     return null;
   return String(uid);
 }
+function getRuntimeProductOrigin(tempOrder, product) {
+  var _a, _b, _c, _d, _e, _f;
+  const uid = getOrderProductLineUid(product);
+  if (uid && ((_c = (_b = (_a = tempOrder == null ? void 0 : tempOrder._extend) == null ? void 0 : _a.productsByUid) == null ? void 0 : _b[uid]) == null ? void 0 : _c.origin)) {
+    return tempOrder._extend.productsByUid[uid].origin;
+  }
+  const matchedProduct = ((tempOrder == null ? void 0 : tempOrder.products) || []).find((item) => item === product || getOrderProductLineUid(item) === uid || String((item == null ? void 0 : item.product_id) ?? (item == null ? void 0 : item.id) ?? "") === String((product == null ? void 0 : product.product_id) ?? (product == null ? void 0 : product.id) ?? ""));
+  const matchedUid = matchedProduct ? getOrderProductLineUid(matchedProduct) : "";
+  return matchedUid ? ((_f = (_e = (_d = tempOrder == null ? void 0 : tempOrder._extend) == null ? void 0 : _d.productsByUid) == null ? void 0 : _e[matchedUid]) == null ? void 0 : _f.origin) || null : null;
+}
+function isHolderConfigRequired(holderConfig) {
+  if (!holderConfig || typeof holderConfig !== "object")
+    return false;
+  if (holderConfig.status === "disable")
+    return false;
+  return Number(holderConfig.required) === 1;
+}
+function productRequiresFormSubject(tempOrder, product) {
+  const runtimeOrigin = getRuntimeProductOrigin(tempOrder, product);
+  return isHolderConfigRequired(product == null ? void 0 : product.holder_config) || isHolderConfigRequired(runtimeOrigin == null ? void 0 : runtimeOrigin.holder_config);
+}
+function resolveIsFormSubject(tempOrder, product) {
+  var _a;
+  if (((_a = tempOrder == null ? void 0 : tempOrder.holder) == null ? void 0 : _a.type) === "form")
+    return true;
+  if (product)
+    return productRequiresFormSubject(tempOrder, product);
+  return ((tempOrder == null ? void 0 : tempOrder.products) || []).some(
+    (item) => productRequiresFormSubject(tempOrder, item)
+  );
+}
 function isEmptyOrderProductDisplayValue(value) {
   if (value === void 0 || value === null)
     return true;
@@ -1174,9 +1209,11 @@ function indexOrderProductsByUid(products) {
   getBundleSignedUnit,
   getOrderProductLineUid,
   getProductSkuOptions,
+  getRuntimeProductOrigin,
   hasAssignedHolderId,
   indexOrderProductsByUid,
   isEmptyOrderProductDisplayValue,
+  isHolderConfigRequired,
   isMarkdownBundle,
   isTempOrder,
   mapPaymentItemToOrderPayment,
@@ -1190,7 +1227,9 @@ function indexOrderProductsByUid(products) {
   normalizeProductSkuOptions,
   normalizeSubmitBooking,
   normalizeSubmitCollectPaxValue,
+  productRequiresFormSubject,
   resolveEffectivePerUnitDiscount,
+  resolveIsFormSubject,
   resolveManualDiscountMessage,
   resolveManualDiscountOriginTotal,
   resolveManualDiscountReasonFromSources,

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

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

@@ -1,6 +1,6 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
-import { Rules, RulesModuleAPI, DiscountResult, UnavailableReason } from './types';
+import { Rules, RulesModuleAPI, DiscountResult, RulesFormSubject, UnavailableReason } from './types';
 import { Discount } from '../Discount/types';
 import { SetDiscountSelectedParams } from '../../solution/ShopDiscount/types';
 import { WindowPlugin } from '../../plugins';
@@ -24,7 +24,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         holders: {
             form_record_id: number;
         }[];
-        isFormSubject: boolean;
+        isFormSubject: RulesFormSubject;
     }): {
         isAvailable: boolean;
         discountList: Discount[];
@@ -43,7 +43,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         holders: {
             form_record_id: number;
         }[];
-        isFormSubject: boolean;
+        isFormSubject: RulesFormSubject;
         orderTotalAmount: number;
     }, options?: {
         isSelected?: boolean;

package/lib/modules/Rules/index.js

@@ -70,7 +70,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     var _a;
     if (((_a = discount.holder) == null ? void 0 : _a.holder_type) !== "form")
       return true;
-    const orderHolderId = Array.isArray(holders) && holders.length > 0 ? holders[0].form_record_id : void 0;
+    const orderHolderId = Array.isArray(holders) && holders.length > 0 ? holders[0].form_record_id || holders[0] : void 0;
     const productHolderId = Array.isArray(product.holder_id) ? product.holder_id[0] : product.holder_id;
     if (!product.isNeedHolder)
       return true;
@@ -207,6 +207,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     orderTotalAmount
   }, options) {
     var _a;
+    const resolveIsFormSubject = (product) => typeof isFormSubject === "function" ? Boolean(isFormSubject(product)) : Boolean(isFormSubject);
     const isEditModeAddNewProduct = productList.find((n) => n.booking_id) && productList.find((n) => !n.booking_id);
     const editModeDiscount = [];
     const addModeDiscount = [];
@@ -596,7 +597,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         const isHolderMatch = this.checkHolderMatch(
           discount,
           {
-            isNeedHolder: isFormSubject && !(_tempVar == null ? void 0 : _tempVar.isNormalProduct),
+            isNeedHolder: resolveIsFormSubject(_tempVar) && !(_tempVar == null ? void 0 : _tempVar.isNormalProduct),
             holder_id: (_tempVar == null ? void 0 : _tempVar.holder_id) || product.holder_id
           },
           holders
@@ -767,7 +768,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         const isHolderMatch = this.checkHolderMatch(
           discount,
           {
-            isNeedHolder: isFormSubject && !(_tempVar == null ? void 0 : _tempVar.isNormalProduct),
+            isNeedHolder: resolveIsFormSubject(_tempVar) && !(_tempVar == null ? void 0 : _tempVar.isNormalProduct),
             holder_id: (_tempVar == null ? void 0 : _tempVar.holder_id) || product.holder_id
           },
           holders

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

@@ -22,6 +22,7 @@ export interface DiscountResult {
     productList: any[];
     discountList: any[];
 }
+export type RulesFormSubject = boolean | ((product: any) => boolean);
 export interface RulesModuleAPI {
     setRulesList: (rulesList: Rules[]) => Promise<void>;
     clear: () => Promise<void>;
@@ -31,7 +32,7 @@ export interface RulesModuleAPI {
         holders: {
             form_record_id: number;
         }[];
-        isFormSubject: boolean;
+        isFormSubject: RulesFormSubject;
         orderTotalAmount: number;
     }) => DiscountResult;
 }

package/lib/server/index.js

@@ -737,7 +737,7 @@ var Server = class {
         };
       } catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
-        this.logError("handleOrderSalesDetail: 请求失败", {
+        this.logInfo("handleOrderSalesDetail: 请求失败", {
           lookup,
           backendPath,
           error: errorMessage
@@ -2925,11 +2925,8 @@ var Server = class {
     );
   }
   shouldBuildSmallTicketData(order) {
-    var _a;
     if (!order || typeof order !== "object")
       return false;
-    if ((0, import_small_ticket.hasSmallTicketData)((_a = order.payment_info) == null ? void 0 : _a.small_ticket_data))
-      return false;
     return Number(order.small_ticket_data_flag ?? order.smallTicketDataFlag ?? 0) === 1;
   }
   shouldPrintSyncedOrder(params) {

package/lib/server/modules/order/index.d.ts

@@ -31,10 +31,10 @@ export declare class OrderModule extends BaseModule implements Module {
     private emitOrdersChanged;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     /**
-   * 记录信息日志
-   * @param title 日志标题
-   * @param metadata 日志元数据
-   */
+     * 记录信息日志
+     * @param title 日志标题
+     * @param metadata 日志元数据
+     */
     private logInfo;
     /**
      * 记录错误日志

package/lib/server/modules/order/index.js

@@ -109,10 +109,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     });
   }
   /**
-  * 记录信息日志
-  * @param title 日志标题
-  * @param metadata 日志元数据
-  */
+   * 记录信息日志
+   * @param title 日志标题
+   * @param metadata 日志元数据
+   */
   logInfo(title, metadata) {
     try {
       if (this.logger) {