@pisell/pisellos 2.2.15 → 2.2.17

package/dist/solution/Checkout/index.js

@@ -396,23 +396,66 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
           return pre + (item.amount || 0);
         }, 0);
       };
-      var productList = ((_this$store$currentOr = this.store.currentOrder.order_info) === null || _this$store$currentOr === void 0 || (_this$store$currentOr = _this$store$currentOr.original_order_data.bookings) === null || _this$store$currentOr === void 0 ? void 0 : _this$store$currentOr.map(function (item) {
-        return {
-          product_id: item.product.product_id,
-          product_variant_id: item.product.product_variant_id,
-          quantity: item.product.num,
-          selling_price: item.product.calculated_selling_price,
+      var formatProduct = function formatProduct(items) {
+        return items.map(function (item) {
+          var _item$is_charge_tax;
+          return {
+            product_id: item.product_id,
+            product_variant_id: item.product_variant_id,
+            quantity: item.num,
+            // 商品是否含税：1；0
+            is_charge_tax: (_item$is_charge_tax = item.is_charge_tax) !== null && _item$is_charge_tax !== void 0 ? _item$is_charge_tax : 0,
+            // 若商品不含税，计算得到的税费，单位（元）
+            tax_fee: item.tax_fee,
+            // 整个商品折扣后的总金额
+            selling_price: item.calculated_selling_price,
+            // 使用者id
+            holder_id: item.holder_id,
+            // 整个商品折扣前的总金额
+            original_price: item.calculated_original_price,
+            // 主商品折扣前金额，不包含套餐子商品
+            main_product_original_price: item.price,
+            // 主商品折扣后金额，不包含套餐子商品
+            main_product_selling_price: item.main_product_selling_price,
+            metadata: {
+              // 主商品+非原价(加减价)子商品税费
+              "main_product_attached_bundle_tax_fee": item.metadata.main_product_attached_bundle_tax_fee,
+              // 主商品+非原价(加减价)子商品附加费
+              "main_product_attached_bundle_surcharge_fee": item.metadata.main_product_attached_bundle_surcharge_fee,
+              // 可选，附加费均摊舍入金额
+              "surcharge_rounding_remainder": item.metadata.surcharge_rounding_remainder
+            },
+            product_bundle: item.product_bundle.map(function (bundle) {
+              return {
+                bundle_id: bundle.bundle_id,
+                bundle_product_id: bundle.bundle_product_id,
+                bundle_variant_id: bundle.bundle_variant_id,
+                price_type: bundle.price_type,
+                price_type_ext: bundle.price_type_ext,
+                // 套餐子商品总价，不包含折扣金额
+                bundle_sum_price: bundle.bundle_sum_price,
+                // 套餐子商品折扣后金额
+                bundle_selling_price: bundle.bundle_selling_price,
+                num: bundle.num,
+                is_charge_tax: bundle.is_charge_tax,
+                tax_fee: bundle.tax_fee,
+                metadata: {
+                  // 子商品单数量附加费
+                  "surcharge_fee": bundle.metadata.surcharge_fee,
+                  // 可选，附加费均摊舍入金额
+                  "surcharge_rounding_remainder": bundle.metadata.surcharge_rounding_remainder
+                }
+              };
+            })
+          };
+        }) || [];
+      };
+      var productList = formatProduct(((_this$store$currentOr = this.store.currentOrder.order_info) === null || _this$store$currentOr === void 0 || (_this$store$currentOr = _this$store$currentOr.original_order_data) === null || _this$store$currentOr === void 0 || (_this$store$currentOr = _this$store$currentOr.bookings) === null || _this$store$currentOr === void 0 ? void 0 : _this$store$currentOr.map(function (item) {
+        return _objectSpread(_objectSpread({}, item.product), {}, {
           holder_id: _this3.getHolderIdFromBooking(item)
-        };
-      })) || [];
-      var relationProducts = ((_this$store$currentOr2 = this.store.currentOrder.order_info) === null || _this$store$currentOr2 === void 0 || (_this$store$currentOr2 = _this$store$currentOr2.original_order_data) === null || _this$store$currentOr2 === void 0 || (_this$store$currentOr2 = _this$store$currentOr2.relation_products) === null || _this$store$currentOr2 === void 0 ? void 0 : _this$store$currentOr2.map(function (item) {
-        return {
-          product_id: item.product_id,
-          product_variant_id: item.product_variant_id,
-          quantity: item.num,
-          selling_price: item.source_product_price
-        };
-      })) || [];
+        });
+      })) || []);
+      var relationProducts = formatProduct(((_this$store$currentOr2 = this.store.currentOrder.order_info) === null || _this$store$currentOr2 === void 0 || (_this$store$currentOr2 = _this$store$currentOr2.original_order_data) === null || _this$store$currentOr2 === void 0 ? void 0 : _this$store$currentOr2.relation_products) || []);
       return [].concat(_toConsumableArray(productList), _toConsumableArray(relationProducts));
     }
   }, {
@@ -447,7 +490,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   depositAmount: (_this$store$currentOr5 = this.store.currentOrder) === null || _this$store$currentOr5 === void 0 ? void 0 : _this$store$currentOr5.deposit_amount,
                   isDeposit: (_this$store$currentOr6 = this.store.currentOrder) === null || _this$store$currentOr6 === void 0 ? void 0 : _this$store$currentOr6.is_deposit
                 },
-                products: this.getProductListByOrder()
+                products: this.getProductListByOrder(),
+                is_price_include_tax: this.otherParams.is_price_include_tax
               }, params); // 判断订单是否已经同步，如果是则追加payment_order_id参数
               if (this.store.isOrderSynced) {
                 walletBusinessData.payment_order_id = (_this$store$currentOr7 = this.store.currentOrder) === null || _this$store$currentOr7 === void 0 ? void 0 : _this$store$currentOr7.order_id;

package/dist/solution/ShopDiscount/index.d.ts

@@ -24,6 +24,10 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     setHolders(holders: {
         form_record_id: number;
     }[]): void;
+    setBookingSubject(bookingSubject: {
+        type?: 'form' | 'customer';
+        [key: string]: any;
+    }): void;
     calcDiscount(productList: Record<string, any>[], options?: SetDiscountSelectedParams): {
         productList: Record<string, any>[];
         discountList: Discount[];

package/dist/solution/ShopDiscount/index.js

@@ -51,10 +51,11 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       productList: [],
       discount: null,
       rules: null,
+      holders: [],
       originalDiscountList: [],
       currentBookingTime: "",
       filteredDiscountList: [],
-      holders: []
+      bookingSubject: undefined
     };
     return _this;
   }
@@ -292,11 +293,17 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     value: function setHolders(holders) {
       this.store.holders = holders;
     }
+  }, {
+    key: "setBookingSubject",
+    value: function setBookingSubject(bookingSubject) {
+      this.store.bookingSubject = bookingSubject;
+    }
 
     // 计算优惠券
   }, {
     key: "calcDiscount",
     value: function calcDiscount(productList, options) {
+      var _this$store$bookingSu;
       this.store.productList = productList;
       var rulesModule = this.core.getModule("".concat(this.name, "_rules"));
       if (!rulesModule) {
@@ -308,7 +315,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       var _ref = rulesModule.calcDiscount({
           productList: productList,
           discountList: this.getDiscountList(),
-          holders: this.store.holders || []
+          holders: this.store.holders || [],
+          isFormSubject: ((_this$store$bookingSu = this.store.bookingSubject) === null || _this$store$bookingSu === void 0 ? void 0 : _this$store$bookingSu.type) === 'form'
         }, options) || {
           productList: productList,
           discountList: this.getDiscountList()
@@ -381,7 +389,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "scanCode",
     value: function () {
       var _scanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(code, customerId) {
-        var _this$store$discount3, resultDiscountList, rulesModule, withScanList, currentSelectedDiscountList, _ref2, newProductList, newDiscountList, isAvailable, _this$options$otherPa6;
+        var _this$store$discount3, _this$store$bookingSu2, resultDiscountList, rulesModule, withScanList, currentSelectedDiscountList, _ref2, newProductList, newDiscountList, isAvailable, _this$options$otherPa6;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -447,7 +455,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 productList: this.store.productList || [],
                 oldDiscountList: this.getDiscountList(),
                 newDiscountList: withScanList,
-                holders: this.store.holders || []
+                holders: this.store.holders || [],
+                isFormSubject: ((_this$store$bookingSu2 = this.store.bookingSubject) === null || _this$store$bookingSu2 === void 0 ? void 0 : _this$store$bookingSu2.type) === 'form'
               }) || {
                 isAvailable: false,
                 productList: this.store.productList || [],

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

@@ -23,14 +23,18 @@ export interface ShopDiscountState {
     discount: DiscountModule | null;
     rules: RulesModule | null;
     productList: Record<string, any>[];
-    originalDiscountList: Discount[];
     holders?: {
         form_record_id: number;
         form_id?: number;
         main_field?: string;
     }[];
+    originalDiscountList: Discount[];
     currentBookingTime: string | null;
     filteredDiscountList: Discount[];
+    bookingSubject?: {
+        type?: 'form' | 'customer';
+        [key: string]: any;
+    };
 }
 export interface SetDiscountSelectedParams {
     discountId: number;

package/lib/modules/Customer/index.js

@@ -102,7 +102,7 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
       skip,
       num,
       sort_by: import_constants.SORT_BY,
-      with: ["latestWalletDetail.wallet"],
+      with: ["latestWalletDetail.wallet", "contactsInfo"],
       search_wallet_flag: 1,
       search_wallet_pass_flag: 1,
       ...search && { search },

package/lib/modules/Payment/index.js

@@ -639,7 +639,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       this.logInfo("更新订单支付项完成", {
         orderUuid
       });
-      this.core.effects.emit(import_types.PaymentHooks.OnPaymentAdded, {
+      this.core.effects.emit(`${this.name}:onPaymentAdded`, {
         orderUuid,
         payment: newPaymentItem
       });

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

@@ -671,6 +671,7 @@ export interface WalletInitBusinessData {
     order_wait_pay_amount?: number;
     /** 订单ID */
     payment_order_id?: string;
+    is_price_include_tax: number;
 }
 /**
  * 查询用户识别码列表请求参数

package/lib/modules/Payment/walletpass.js

@@ -51,10 +51,19 @@ var WalletPassPaymentImpl = class {
    */
   generateWalletParams(businessData) {
     var _a, _b;
-    const { customer_id, holder, amountInfo, products, order_wait_pay_amount, payment_order_id } = businessData;
+    const {
+      customer_id,
+      holder,
+      amountInfo,
+      products,
+      order_wait_pay_amount,
+      payment_order_id,
+      is_price_include_tax
+    } = businessData;
     const totalAmount = Number(amountInfo.totalAmount);
     const subTotal = Number(amountInfo.subTotal);
     const walletParams = {
+      is_price_include_tax,
       sale_channel: "pos",
       customer_id: customer_id || 0,
       // 提供默认值，确保类型为 number

package/lib/modules/ProductList/index.js

@@ -103,13 +103,6 @@ var ProductList = class extends import_BaseModule.BaseModule {
       { osServer: true }
     );
     const sortedList = (productsData.data.list || []).slice().sort((a, b) => Number(b.sort) - Number(a.sort));
-    if (sortedList.length) {
-      sortedList.forEach((n) => {
-        if (n.is_eject !== 1 && n["schedule.ids"] && n["schedule.ids"].length) {
-          n.is_eject = 1;
-        }
-      });
-    }
     this.addProduct(sortedList);
     return sortedList;
   }

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

@@ -13,24 +13,26 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
     setRulesList(rulesList: Rules[]): Promise<void>;
     getRulesList(): Rules[];
     private checkHolderMatch;
-    isDiscountListAvailable({ oldDiscountList, newDiscountList, productList, holders, }: {
+    isDiscountListAvailable({ oldDiscountList, newDiscountList, productList, holders, isFormSubject, }: {
         oldDiscountList: Discount[];
         newDiscountList: Discount[];
         productList: any[];
         holders: {
             form_record_id: number;
         }[];
+        isFormSubject: boolean;
     }): {
         isAvailable: boolean;
         discountList: Discount[];
         productList: any[];
     };
-    calcDiscount({ discountList, productList, holders, }: {
+    calcDiscount({ discountList, productList, holders, isFormSubject, }: {
         discountList: Discount[];
         productList: any[];
         holders: {
             form_record_id: number;
         }[];
+        isFormSubject: boolean;
     }, options?: {
         isSelected?: boolean;
         discountId?: number;

package/lib/modules/Rules/index.js

@@ -37,6 +37,7 @@ var import_utils = require("../../solution/ShopDiscount/utils");
 var import_utils2 = require("../Cart/utils");
 var import_decimal = __toESM(require("decimal.js"));
 var import_dayjs = __toESM(require("dayjs"));
+var import_lodash_es = require("lodash-es");
 var RulesModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -56,15 +57,17 @@ var RulesModule = class extends import_BaseModule.BaseModule {
   getRulesList() {
     return this.store.rulesList;
   }
-  // 检查 holder 是否匹配
+  // 商品不需要holder,则不需要判断，直接返回true，商品需要holder但是还没填写，那么暂时不使用带有holder的券，直到填写才去匹配
   checkHolderMatch(discount, product, holders) {
     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 productHolderId = Array.isArray(product.holder_id) ? product.holder_id[0] : product.holder_id;
-    if (!orderHolderId && !productHolderId)
+    if (!product.isNeedHolder)
       return true;
+    if (!orderHolderId && !productHolderId)
+      return false;
     return (productHolderId || orderHolderId) === discount.holder.holder_id;
   }
   // 判断discountList 是否可以对当前productList生效
@@ -72,7 +75,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     oldDiscountList,
     newDiscountList,
     productList,
-    holders
+    holders,
+    isFormSubject
   }) {
     if (!newDiscountList || newDiscountList.length === 0) {
       return {
@@ -100,7 +104,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     const result = this.calcDiscount({
       discountList: mergedDiscountList,
       productList: [...productList],
-      holders
+      holders,
+      isFormSubject
     }, {
       scan: true
     });
@@ -133,7 +138,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
   calcDiscount({
     discountList,
     productList,
-    holders
+    holders,
+    isFormSubject
   }, options) {
     const isEditModeAddNewProduct = productList.find((n) => n.booking_id) && productList.find((n) => !n.booking_id);
     const editModeDiscount = [];
@@ -282,22 +288,24 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         originProduct = flatItem.originProduct;
       }
       addModeDiscount.forEach((discount) => {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f;
         const limitedData = discount == null ? void 0 : discount.limited_relation_product_data;
+        const _tempVar = (flatItem == null ? void 0 : flatItem.type) === "bundle" ? flatItem == null ? void 0 : flatItem.parentProduct : flatItem == null ? void 0 : flatItem.product;
         const isHolderMatch = this.checkHolderMatch(
           discount,
           {
-            holder_id: ((flatItem == null ? void 0 : flatItem.type) === "bundle" ? (_a = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _a.holder_id : (_b = flatItem == null ? void 0 : flatItem.product) == null ? void 0 : _b.holder_id) || product.holder_id
+            isNeedHolder: isFormSubject && !(_tempVar == null ? void 0 : _tempVar.isNormalProduct),
+            holder_id: (_tempVar == null ? void 0 : _tempVar.holder_id) || product.holder_id
           },
           holders
         );
         let timeLimit = true;
         timeLimit = !!(0, import_utils.filterDiscountListByBookingTime)([discount], ((product == null ? void 0 : product.startDate) || (0, import_dayjs.default)()).format("YYYY-MM-DD HH:mm:ss")).length;
         const isLimitedProduct = (limitedData.type === "product_all" || limitedData.product_ids && limitedData.product_ids.includes(product.id)) && isHolderMatch;
-        const isAvailableProduct = flatItem.type === "main" ? !((product == null ? void 0 : product.booking_id) && ((_c = product == null ? void 0 : product.discount_list) == null ? void 0 : _c.length) && ((_d = product == null ? void 0 : product.discount_list) == null ? void 0 : _d.every((discount2) => discount2.id && ["good_pass", "discount_card", "product_discount_card"].includes(discount2.tag || discount2.type)))) : !((flatItem == null ? void 0 : flatItem.booking_id) && ((_f = (_e = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _e.metadata) == null ? void 0 : _f.custom_product_bundle_map_id));
+        const isAvailableProduct = flatItem.type === "main" ? !((product == null ? void 0 : product.booking_id) && ((_a = product == null ? void 0 : product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount2) => discount2.id && ["good_pass", "discount_card", "product_discount_card"].includes(discount2.tag || discount2.type)))) : !((flatItem == null ? void 0 : flatItem.booking_id) && ((_d = (_c = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _c.metadata) == null ? void 0 : _d.custom_product_bundle_map_id));
         const isBundleAvailable = this.checkPackageSubItemUsageRules(discount, flatItem);
         if (isAvailableProduct && isLimitedProduct && isBundleAvailable && timeLimit) {
-          (_g = discountApplicability.get(discount.id)) == null ? void 0 : _g.push(product.id);
+          (_e = discountApplicability.get(discount.id)) == null ? void 0 : _e.push(product.id);
           const applicableProducts = discountApplicableProducts.get(discount.id) || [];
           const discountType = discount.tag || discount.type;
           const isGoodPass = discountType === "good_pass";
@@ -307,7 +315,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             type: discountType,
             tag: discountType,
             discount: {
-              discount_card_type: (_h = discount == null ? void 0 : discount.metadata) == null ? void 0 : _h.discount_card_type,
+              discount_card_type: (_f = discount == null ? void 0 : discount.metadata) == null ? void 0 : _f.discount_card_type,
               fixed_amount: product.price,
               resource_id: discount.id,
               title: discount.format_title,
@@ -326,7 +334,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     });
     const processedFlatItemsMap = /* @__PURE__ */ new Map();
     sortedFlattenedList.forEach((flatItem, index) => {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
       let product, originProduct;
       if (flatItem.type === "main") {
         product = flatItem.product;
@@ -358,13 +366,13 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         return;
       }
       const applicableDiscounts = sortedDiscountList.filter((discount) => {
-        var _a2, _b2, _c2, _d2;
+        var _a2, _b2;
         if ((Number(product.price) <= 0 || !product.price) && !((_a2 = product.discount_list) == null ? void 0 : _a2.find((n) => {
           var _a3;
           return ((_a3 = n.discount) == null ? void 0 : _a3.resource_id) === discount.id;
         })) && (discount.tag || discount.type) === "good_pass")
           return false;
-        if ((Number(product.price) === 0 || !product.price) && !((_b2 = product.discount_list) == null ? void 0 : _b2.find((n) => {
+        if ((Number(product.price) <= 0 || !product.price) && !((_b2 = product.discount_list) == null ? void 0 : _b2.find((n) => {
           var _a3;
           return ((_a3 = n.discount) == null ? void 0 : _a3.resource_id) === discount.id;
         })) && (discount.tag || discount.type) !== "good_pass")
@@ -373,20 +381,22 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         if (targetUsedDiscounts && (discount.tag || discount.type) === "good_pass")
           return false;
         const limitedData = discount.limited_relation_product_data;
-        let timeLimit = true;
-        timeLimit = !!(0, import_utils.filterDiscountListByBookingTime)([discount], (product.startDate || (0, import_dayjs.default)()).format("YYYY-MM-DD HH:mm:ss")).length;
-        if (!timeLimit) {
-          return false;
-        }
+        const _tempVar = (flatItem == null ? void 0 : flatItem.type) === "bundle" ? flatItem == null ? void 0 : flatItem.parentProduct : flatItem == null ? void 0 : flatItem.product;
         const isHolderMatch = this.checkHolderMatch(
           discount,
           {
-            holder_id: ((flatItem == null ? void 0 : flatItem.type) === "bundle" ? (_c2 = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _c2.holder_id : (_d2 = flatItem == null ? void 0 : flatItem.product) == null ? void 0 : _d2.holder_id) || product.holder_id
+            isNeedHolder: isFormSubject && !(_tempVar == null ? void 0 : _tempVar.isNormalProduct),
+            holder_id: (_tempVar == null ? void 0 : _tempVar.holder_id) || product.holder_id
           },
           holders
         );
         if (!isHolderMatch)
           return false;
+        let timeLimit = true;
+        timeLimit = !!(0, import_utils.filterDiscountListByBookingTime)([discount], (product.startDate || (0, import_dayjs.default)()).format("YYYY-MM-DD HH:mm:ss")).length;
+        if (!timeLimit) {
+          return false;
+        }
         if (limitedData.type === "product_all") {
           if (!this.checkPackageSubItemUsageRules(discount, flatItem)) {
             return false;
@@ -464,16 +474,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           }
         }
       }
-      if ((options == null ? void 0 : options.selectedList) && ((_t = product.discount_list) == null ? void 0 : _t.some((item) => {
-        var _a2;
-        return (_a2 = options == null ? void 0 : options.selectedList) == null ? void 0 : _a2.some((n) => {
-          var _a3;
-          return n.discountId === ((_a3 = item.discount) == null ? void 0 : _a3.resource_id);
-        });
-      }))) {
-        isManualDiscount = false;
-      }
-      if (applicableDiscounts.length === 0 || isManualDiscount) {
+      if (applicableDiscounts.length === 0 || isManualDiscount || (0, import_lodash_es.isBoolean)(product.vouchersApplicable) && !product.vouchersApplicable) {
         if (flatItem.type === "main") {
           if (product.isClient) {
             processedProductsMap.set(
@@ -505,7 +506,10 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             processedProductsMap.set(
               product._id,
               [this.hooks.setProduct(originProduct, {
-                ...isManualDiscount ? {} : {
+                ...isManualDiscount ? {
+                  price: product.price,
+                  main_product_selling_price: product.price
+                } : {
                   _id: product._id.split("___")[0] + "___" + index,
                   total: product.origin_total || product.total,
                   price: product.price,
@@ -519,7 +523,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           processedFlatItemsMap.set(flatItem._id, [{
             ...flatItem,
             discount_list: [],
-            price: flatItem.bundleItem.original_price,
+            price: isManualDiscount ? flatItem.bundleItem.price : flatItem.bundleItem.original_price,
             processed: true
           }]);
         }
@@ -546,10 +550,10 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           usedDiscounts.set(selectedDiscount2.id, true);
           const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
           let productOriginTotal = product.origin_total || product.total || 0;
-          if (((_u = product.discount_list) == null ? void 0 : _u.length) && product.origin_total) {
+          if (((_t = product.discount_list) == null ? void 0 : _t.length) && product.origin_total) {
             productOriginTotal = product.origin_total;
           }
-          if (Number(((_v = originProduct == null ? void 0 : originProduct._productInit) == null ? void 0 : _v.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
+          if (Number(((_u = originProduct == null ? void 0 : originProduct._productInit) == null ? void 0 : _u.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
             productOriginTotal = product.total;
           }
           const targetProductTotal = (0, import_utils.getDiscountAmount)(selectedDiscount2, product.price, product.price);
@@ -560,7 +564,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             amount,
             type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : discountType,
             discount: {
-              discount_card_type: (_w = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _w.discount_card_type,
+              discount_card_type: (_v = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _v.discount_card_type,
               fixed_amount: amount,
               resource_id: selectedDiscount2.id,
               title: selectedDiscount2.format_title,
@@ -682,7 +686,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             amount: new import_decimal.default(productOriginTotal).minus(targetProductTotal).toNumber() * (product.num || 1),
             type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : selectedDiscount2.tag,
             discount: {
-              discount_card_type: (_x = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _x.discount_card_type,
+              discount_card_type: (_w = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _w.discount_card_type,
               fixed_amount: new import_decimal.default(productOriginTotal).minus(targetProductTotal).toNumber(),
               resource_id: selectedDiscount2.id,
               title: selectedDiscount2.format_title,
@@ -695,7 +699,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               custom_product_bundle_map_id: uniqueId,
               num: product.num || 1
             },
-            _num: (product.num || 1) * (((_y = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _y.num) || 1)
+            _num: (product.num || 1) * (((_x = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _x.num) || 1)
           };
           const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
           appliedProducts.push(discountDetail);
@@ -859,14 +863,16 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               const allDiscountAmount = (0, import_utils.getDiscountListAmountTotal)(mainDiscountList);
               newTotalWithDiscount = new import_decimal.default(mainProductData.price || 0).minus(allDiscountAmount).toNumber() ?? newTotalWithDiscount;
               newOriginTotalWithDiscount = mainProductData.origin_total ?? newOriginTotalWithDiscount;
-              if (newBundleWithDiscount.length > 0) {
-                newBundleWithDiscount.forEach((item) => {
-                  var _a, _b, _c;
-                  newTotalWithDiscount += Number(item.price) * Number(item.num);
-                  const originalPrice = ((_c = (_b = (_a = item.discount_list) == null ? void 0 : _a[0]) == null ? void 0 : _b.discount) == null ? void 0 : _c.original_amount) || item.price;
-                  newOriginTotalWithDiscount += Number(originalPrice) * Number(item.num);
-                });
-              }
+            }
+            if (newBundleWithDiscount.length > 0) {
+              newBundleWithDiscount.forEach((item) => {
+                newTotalWithDiscount += Number(item.price) * Number(item.num);
+              });
+              newBundleWithDiscount.forEach((item) => {
+                var _a, _b, _c;
+                const originalPrice = ((_c = (_b = (_a = item.discount_list) == null ? void 0 : _a[0]) == null ? void 0 : _b.discount) == null ? void 0 : _c.original_amount) || item.price;
+                newOriginTotalWithDiscount += Number(originalPrice) * Number(item.num);
+              });
             }
             if (product == null ? void 0 : product.options) {
               newTotalWithDiscount = product.options.reduce((accumulator, currentValue) => {
@@ -918,12 +924,12 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                 const allDiscountAmount = (0, import_utils.getDiscountListAmount)(mainDiscountListOriginal);
                 newTotalOriginal = new import_decimal.default(mainProductData.price || 0).minus(allDiscountAmount).toNumber() ?? newTotalOriginal;
                 newOriginTotalOriginal = mainProductData.origin_total ?? newOriginTotalOriginal;
-                if (newBundleOriginal.length > 0) {
-                  newBundleOriginal.forEach((item) => {
-                    newTotalOriginal += Number(item.price) * Number(item.num);
-                    newOriginTotalOriginal += Number(item.price) * Number(item.num);
-                  });
-                }
+              }
+              if (newBundleOriginal.length > 0) {
+                newBundleOriginal.forEach((item) => {
+                  newTotalOriginal += Number(item.price) * Number(item.num);
+                  newOriginTotalOriginal += Number(item.price) * Number(item.num);
+                });
               }
               if (product == null ? void 0 : product.options) {
                 newTotalOriginal = product.options.reduce((accumulator, currentValue) => {
@@ -998,8 +1004,10 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                 }
                 if (newBundle.length > 0) {
                   newBundle.forEach((item) => {
-                    var _a2, _b2, _c2;
                     newTotal += Number(item.price) * Number(item.num);
+                  });
+                  newBundle.forEach((item) => {
+                    var _a2, _b2, _c2;
                     const originalPrice = ((_c2 = (_b2 = (_a2 = item.discount_list) == null ? void 0 : _a2[0]) == null ? void 0 : _b2.discount) == null ? void 0 : _c2.original_amount) || item.price;
                     newOriginTotal += Number(originalPrice) * Number(item.num);
                   });
@@ -1140,7 +1148,18 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       if (isBundleItem) {
         const priceType = (_c = flatItem.bundleItem) == null ? void 0 : _c.price_type;
         const priceTypeExt = (_d = flatItem.bundleItem) == null ? void 0 : _d.price_type_ext;
-        return priceType === "markup" && priceTypeExt === "product_price";
+        const isOriginalPrice = priceType === "markup" && priceTypeExt === "product_price";
+        const isMarkupPrice = priceType === "markup" && (priceTypeExt === "" || !priceTypeExt);
+        if (rules.length > 0) {
+          if (isOriginalPrice && rules.includes("original_price")) {
+            return true;
+          }
+          if (isMarkupPrice && rules.includes("markup_price")) {
+            return true;
+          }
+          return false;
+        }
+        return isOriginalPrice;
       }
       return false;
     }

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

@@ -25,6 +25,7 @@ export interface RulesModuleAPI {
         holders: {
             form_record_id: number;
         }[];
+        isFormSubject: boolean;
     }) => DiscountResult;
 }
 type ProductDetail = {

package/lib/solution/BookingByStep/index.js

@@ -185,13 +185,19 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     collection = [],
     schedule_date
   }) {
-    return this.store.products.loadProducts({
+    const res = await this.store.products.loadProducts({
       category_ids,
       product_ids,
       collection,
       schedule_date,
       cacheId: this.cacheId
     });
+    this.getAvailableDate({
+      startDate: schedule_date || (0, import_dayjs.default)().format("YYYY-MM-DD"),
+      endDate: schedule_date || (0, import_dayjs.default)().format("YYYY-MM-DD"),
+      products: [...res]
+    });
+    return res;
   }
   /**
    * 通过 schedule 来读取商品，适用于 session 类商品
@@ -228,11 +234,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const allProductIds = [...newProductIds, ...otherProductsIds].filter(
       (n, index, self) => self.indexOf(n) === index
     );
-    return await this.loadProducts({
+    const res = await this.loadProducts({
       product_ids: allProductIds,
       category_ids,
       schedule_date: date
     });
+    return res;
   }
   /**
    * 更新完商品数据、切换日期、或者在较后的流程里登录了，检测当前购物车里是否有商品，如果有，则需要更新购物车里的商品价格
@@ -599,6 +606,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       quantity = 1
     } = product || {};
     const productData = { ...origin, product_variant_id };
+    debugger;
+    if ((0, import_products.isSessionProduct)(productData)) {
+      if (!date || !date.startTime || !date.endTime) {
+        return { success: false, errorCode: "date_or_time_required" };
+      }
+    }
     const currentCartItems = this.store.cart.getItems();
     const stockCheckResult = (0, import_stock.checkProductStock)({
       productData,