@pisell/pisellos 2.3.6 → 2.3.7

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)
@@ -886,11 +902,11 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       }
     };
     tempOrder.deposit_amount = snapshot.depositAmount;
-    tempOrder.is_deposit = snapshot.isDeposit;
+    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);
@@ -1588,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",
@@ -1873,8 +1889,9 @@ 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;
+    tempOrder.is_deposit = hasDepositAmount && !isExistingDepositDisabled ? 1 : 0;
     return this.applyLastOrderDepositSnapshot(tempOrder, nextSummary);
   }
   async recalculateSummary(options) {
@@ -2219,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();
@@ -2390,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);
@@ -2634,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)(
@@ -3964,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/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/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) {

package/lib/solution/BaseSales/index.js

@@ -1019,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, _t;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s;
     if (!this.store.order)
       throw new Error("order 模块未初始化");
     const tempOrder = this.store.order.ensureTempOrder();
@@ -1090,13 +1090,15 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       };
     }
     if (rulesModule) {
-      const holders = ((_l = tempOrder.holder) == null ? void 0 : _l.form_record_id) ? [{ form_record_id: tempOrder.holder.form_record_id }] : [];
+      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 result = rulesModule.calcDiscount({
         productList: tempOrder.products,
         discountList: nextDiscountList,
         holders,
-        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)
+        isFormSubject: (product) => (0, import_utils.resolveIsFormSubject)(tempOrder, product),
+        orderTotalAmount
       }) || { productList: tempOrder.products, discountList: nextDiscountList };
       if (result.productList) {
         tempOrder.products = preserveManualProductDiscountProducts(
@@ -1105,8 +1107,8 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         );
       }
       for (const product of tempOrder.products || []) {
-        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;
+        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;
         if ((runtimeOrigin == null ? void 0 : runtimeOrigin.isManualDiscount) || isBaseSalesManualProductDiscountProduct(product))
           continue;
         const totalPerUnitDiscount = (product.discount_list || []).reduce(
@@ -1114,7 +1116,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
           0
         );
         const optionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(product));
-        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 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 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) {
@@ -1150,7 +1152,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     };
   }
   async bestDiscount(cb) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d;
     if (!this.store.order)
       throw new Error("order 模块未初始化");
     const tempOrder = this.store.order.ensureTempOrder();
@@ -1169,13 +1171,15 @@ 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_id) ? [{ form_record_id: tempOrder.holder.form_record_id }] : [];
+      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]");
       result = rulesModule.calcDiscount({
         productList: tempOrder.products,
         discountList: nextDiscountList,
         holders,
-        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)
+        isFormSubject: (product) => (0, import_utils.resolveIsFormSubject)(tempOrder, product),
+        orderTotalAmount
       }) || result;
       if (result.productList) {
         tempOrder.products = preserveManualProductDiscountProducts(
@@ -1244,16 +1248,19 @@ 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_id) ? [{ form_record_id: tempOrder.holder.form_record_id }] : [];
+      const holders = ((_a = tempOrder.holder) == null ? void 0 : _a.form_record) || [];
       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: !!((_b = tempOrder.holder) == null ? void 0 : _b.type) && tempOrder.holder.type === "form"
+            isFormSubject: (product) => (0, import_utils.resolveIsFormSubject)(tempOrder, product),
+            orderTotalAmount
           },
           {
             discountId: params.discountId,

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

@@ -129,10 +129,9 @@ 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 lineCompositeTotal = toPriceString(
-    payload.line_total ?? payload.total ?? ((_c = payload._extend) == null ? void 0 : _c.total),
-    sourceProductPrice
-  );
+  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 hasPriceOverride = payload.price_override !== void 0 && payload.price_override !== null && payload.price_override !== "";
   const productOptionItem = (0, import_utils.normalizeProductSkuOptions)(
     normalizeOptionItems(
@@ -180,7 +179,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 = Number(lineCompositeTotal) - Number(bundleOnlyComposite);
+  const derivedMainSelling = hasExplicitLineTotal ? Number(lineCompositeTotal) - Number(bundleOnlyComposite) : Number(mainProductOriginalPrice);
   const mainProductSellingPrice = toPriceString(
     Number.isFinite(derivedMainSelling) && derivedMainSelling >= 0 ? derivedMainSelling : Number(mainProductOriginalPrice)
   );

package/package.json

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