@pisell/pisellos 2.2.13 → 2.2.14

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

@@ -123,7 +123,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/dist/solution/Checkout/index.js

@@ -396,66 +396,23 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
           return pre + (item.amount || 0);
         }, 0);
       };
-      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), {}, {
+      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,
           holder_id: _this3.getHolderIdFromBooking(item)
-        });
-      })) || []);
-      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) || []);
+        };
+      })) || [];
+      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
+        };
+      })) || [];
       return [].concat(_toConsumableArray(productList), _toConsumableArray(relationProducts));
     }
   }, {
@@ -490,8 +447,7 @@ 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(),
-                is_price_include_tax: this.otherParams.is_price_include_tax
+                products: this.getProductListByOrder()
               }, 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;
@@ -1487,7 +1443,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "addPaymentItemAsync",
     value: (function () {
       var _addPaymentItemAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(paymentItem) {
-        var orderPaymentType, processedPaymentItem, metadata, paymentItemWithType, remainingAmount, _paymentItem$type, _paymentItem$code, isEftposPayment, _isCashPayment, isCustomePayment, syncResult;
+        var orderPaymentType, processedPaymentItem, metadata, paymentItemWithType, remainingAmount, _paymentItem$type, _paymentItem$code, isEftposPayment, isCash, isCustomePayment, syncResult;
         return _regeneratorRuntime().wrap(function _callee16$(_context16) {
           while (1) switch (_context16.prev = _context16.next) {
             case 0:
@@ -1537,7 +1493,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               this.logInfo('订单金额还有待付的，同步 EFTPOS 支付');
               // 检查是否是 EFTPOS 支付，如果是则立即同步订单
               isEftposPayment = ((_paymentItem$type = paymentItem.type) === null || _paymentItem$type === void 0 ? void 0 : _paymentItem$type.toLowerCase()) === 'eftpos' || ((_paymentItem$code = paymentItem.code) === null || _paymentItem$code === void 0 ? void 0 : _paymentItem$code.toUpperCase().includes('EFTPOS'));
-              _isCashPayment = paymentItem.code === 'CASHMANUAL';
+              isCash = isCashPayment(paymentItem);
               isCustomePayment = paymentItem.type === 'custom';
               this.logInfo('EFTPOS 支付检查:', {
                 paymentCode: paymentItem.code,
@@ -1545,7 +1501,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 isEftposPayment: isEftposPayment,
                 currentOrderSynced: this.store.isOrderSynced
               });
-              if (!(isEftposPayment || _isCashPayment || isCustomePayment)) {
+              if (!(isEftposPayment || isCash || isCustomePayment)) {
                 _context16.next = 39;
                 break;
               }
@@ -2658,7 +2614,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context28.prev = _context28.next) {
             case 0:
               // 检查是否是现金支付
-              cashPayment = isCashPayment(paymentItem.code, paymentItem.type);
+              cashPayment = isCashPayment(paymentItem);
               if (cashPayment) {
                 _context28.next = 3;
                 break;

package/dist/solution/Checkout/utils/index.d.ts

@@ -1,5 +1,6 @@
 import { CheckoutInitParams, CheckoutError, CheckoutErrorType, LocalOrderData, CartSummaryItem, ExtractedAmountInfo } from '../types';
 import { CartItem } from '../../../modules/Cart/types';
+import { PaymentItemInput } from '../../../modules/Payment/types';
 /**
  * 验证结账数据
  */
@@ -118,4 +119,4 @@ export declare function shouldSyncOrderForPayment(paymentCode: string, paymentTy
  * @param paymentType 支付方式类型
  * @returns 是否为现金支付
  */
-export declare function isCashPayment(paymentCode?: string, paymentType?: string): boolean;
+export declare function isCashPayment(paymentItem: PaymentItemInput): boolean;

package/dist/solution/Checkout/utils/index.js

@@ -499,13 +499,15 @@ export function shouldSyncOrderForPayment(paymentCode, paymentType) {
  * @param paymentType 支付方式类型
  * @returns 是否为现金支付
  */
-export function isCashPayment(paymentCode, paymentType) {
-  var codeUpper = (paymentCode === null || paymentCode === void 0 ? void 0 : paymentCode.toUpperCase()) || '';
-  var typeUpper = (paymentType === null || paymentType === void 0 ? void 0 : paymentType.toUpperCase()) || '';
+export function isCashPayment(paymentItem) {
+  var _paymentItem$code, _paymentItem$type, _paymentItem$name;
+  var codeUpper = ((_paymentItem$code = paymentItem.code) === null || _paymentItem$code === void 0 ? void 0 : _paymentItem$code.toUpperCase()) || '';
+  var typeUpper = ((_paymentItem$type = paymentItem.type) === null || _paymentItem$type === void 0 ? void 0 : _paymentItem$type.toUpperCase()) || '';
+  var isNameCash = (_paymentItem$name = paymentItem.name) === null || _paymentItem$name === void 0 ? void 0 : _paymentItem$name.toLowerCase().includes('cash');
 
   // 现金支付识别规则
   var cashIdentifiers = ['CASH', 'CASHMANUAL', 'MANUAL'];
   return cashIdentifiers.some(function (identifier) {
     return codeUpper.includes(identifier) || typeUpper.includes(identifier);
-  });
+  }) || isNameCash;
 }

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", "contactsInfo"],
+      with: ["latestWalletDetail.wallet"],
       search_wallet_flag: 1,
       search_wallet_pass_flag: 1,
       ...search && { search },

package/lib/modules/Payment/index.js

@@ -192,7 +192,8 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         this.refreshPaymentMethodsInBackground(cachedMethods);
         return cachedMethods;
       }
-      const response = await this.request.get("/pay/custom-payment/available", { channel: "pos" });
+      const response = await this.request.get("/pay/custom-payment/all");
+      response.data = response.data.filter((method) => method.status === 1 && method.disable === 0);
       const payMethods = response.data || [];
       try {
         for (const method of payMethods) {
@@ -225,7 +226,8 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
     });
     try {
       console.log("[PaymentModule] 后台刷新支付方式列表...");
-      const response = await this.request.get("/pay/custom-payment/available", { channel: "pos" });
+      const response = await this.request.get("/pay/custom-payment/all");
+      response.data = response.data.filter((method) => method.status === 1 && method.disable === 0);
       const newPayMethods = response.data || [];
       const hasChanges = this.hasPaymentMethodsChanged(
         cachedMethods,
@@ -623,7 +625,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       this.logInfo("更新订单支付项完成", {
         orderUuid
       });
-      this.core.effects.emit(`${this.name}:onPaymentAdded`, {
+      this.core.effects.emit(import_types.PaymentHooks.OnPaymentAdded, {
         orderUuid,
         payment: newPaymentItem
       });

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

@@ -671,7 +671,6 @@ 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,19 +51,10 @@ var WalletPassPaymentImpl = class {
    */
   generateWalletParams(businessData) {
     var _a, _b;
-    const {
-      customer_id,
-      holder,
-      amountInfo,
-      products,
-      order_wait_pay_amount,
-      payment_order_id,
-      is_price_include_tax
-    } = businessData;
+    const { customer_id, holder, amountInfo, products, order_wait_pay_amount, payment_order_id } = 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,6 +103,13 @@ 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.js

@@ -36,7 +36,6 @@ var import_BaseModule = require("../BaseModule");
 var import_utils = require("../../solution/ShopDiscount/utils");
 var import_utils2 = require("../Cart/utils");
 var import_decimal = __toESM(require("decimal.js"));
-var import_lodash_es = require("lodash-es");
 var import_dayjs = __toESM(require("dayjs"));
 var RulesModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
@@ -297,7 +296,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         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 isBundleAvailable = this.checkPackageSubItemUsageRules(discount, flatItem);
-        if (isAvailableProduct && isLimitedProduct && timeLimit && isBundleAvailable) {
+        if (isAvailableProduct && isLimitedProduct && isBundleAvailable && timeLimit) {
           (_g = discountApplicability.get(discount.id)) == null ? void 0 : _g.push(product.id);
           const applicableProducts = discountApplicableProducts.get(discount.id) || [];
           const discountType = discount.tag || discount.type;
@@ -327,7 +326,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;
+      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;
       let product, originProduct;
       if (flatItem.type === "main") {
         product = flatItem.product;
@@ -365,7 +364,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           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")
@@ -465,7 +464,16 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           }
         }
       }
-      if (applicableDiscounts.length === 0 || isManualDiscount || (0, import_lodash_es.isBoolean)(product.vouchersApplicable) && !product.vouchersApplicable) {
+      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 (flatItem.type === "main") {
           if (product.isClient) {
             processedProductsMap.set(
@@ -497,10 +505,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             processedProductsMap.set(
               product._id,
               [this.hooks.setProduct(originProduct, {
-                ...isManualDiscount ? {
-                  price: product.price,
-                  main_product_selling_price: product.price
-                } : {
+                ...isManualDiscount ? {} : {
                   _id: product._id.split("___")[0] + "___" + index,
                   total: product.origin_total || product.total,
                   price: product.price,
@@ -514,7 +519,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           processedFlatItemsMap.set(flatItem._id, [{
             ...flatItem,
             discount_list: [],
-            price: isManualDiscount ? flatItem.bundleItem.price : flatItem.bundleItem.original_price,
+            price: flatItem.bundleItem.original_price,
             processed: true
           }]);
         }
@@ -541,10 +546,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 (((_t = product.discount_list) == null ? void 0 : _t.length) && product.origin_total) {
+          if (((_u = product.discount_list) == null ? void 0 : _u.length) && product.origin_total) {
             productOriginTotal = product.origin_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) {
+          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) {
             productOriginTotal = product.total;
           }
           const targetProductTotal = (0, import_utils.getDiscountAmount)(selectedDiscount2, product.price, product.price);
@@ -555,7 +560,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             amount,
             type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : discountType,
             discount: {
-              discount_card_type: (_v = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _v.discount_card_type,
+              discount_card_type: (_w = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _w.discount_card_type,
               fixed_amount: amount,
               resource_id: selectedDiscount2.id,
               title: selectedDiscount2.format_title,
@@ -677,7 +682,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: (_w = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _w.discount_card_type,
+              discount_card_type: (_x = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _x.discount_card_type,
               fixed_amount: new import_decimal.default(productOriginTotal).minus(targetProductTotal).toNumber(),
               resource_id: selectedDiscount2.id,
               title: selectedDiscount2.format_title,
@@ -690,7 +695,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               custom_product_bundle_map_id: uniqueId,
               num: product.num || 1
             },
-            _num: (product.num || 1) * (((_x = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _x.num) || 1)
+            _num: (product.num || 1) * (((_y = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _y.num) || 1)
           };
           const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
           appliedProducts.push(discountDetail);
@@ -854,16 +859,14 @@ 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) => {
-                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 (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 (product == null ? void 0 : product.options) {
               newTotalWithDiscount = product.options.reduce((accumulator, currentValue) => {
@@ -915,12 +918,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) => {
@@ -994,11 +997,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                   newOriginTotal = mainProductData.origin_total ?? newOriginTotal;
                 }
                 if (newBundle.length > 0) {
-                  newBundle.forEach((item) => {
-                    newTotal += Number(item.price) * Number(item.num);
-                  });
                   newBundle.forEach((item) => {
                     var _a2, _b2, _c2;
+                    newTotal += Number(item.price) * Number(item.num);
                     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);
                   });
@@ -1139,18 +1140,7 @@ 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;
-        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 priceType === "markup" && priceTypeExt === "product_price";
       }
       return false;
     }

package/lib/solution/BookingByStep/index.js

@@ -185,19 +185,13 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     collection = [],
     schedule_date
   }) {
-    const res = await this.store.products.loadProducts({
+    return 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 类商品
@@ -234,12 +228,11 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const allProductIds = [...newProductIds, ...otherProductsIds].filter(
       (n, index, self) => self.indexOf(n) === index
     );
-    const res = await this.loadProducts({
+    return await this.loadProducts({
       product_ids: allProductIds,
       category_ids,
       schedule_date: date
     });
-    return res;
   }
   /**
    * 更新完商品数据、切换日期、或者在较后的流程里登录了，检测当前购物车里是否有商品，如果有，则需要更新购物车里的商品价格
@@ -606,12 +599,6 @@ 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,

package/lib/solution/BookingByStep/utils/products.d.ts

@@ -9,9 +9,3 @@ export declare const getAvailableProductResources: (products: ProductData[]) =>
     rules: any[];
     resourcesMap: Record<number, ProductResourceItem>;
 };
-/**
- * 判断商品是否是 session 商品
- * @param product 商品数据
- * @returns 是否是 session 商品
- */
-export declare const isSessionProduct: (product: ProductData) => boolean;

package/lib/solution/BookingByStep/utils/products.js

@@ -19,8 +19,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/solution/BookingByStep/utils/products.ts
 var products_exports = {};
 __export(products_exports, {
-  getAvailableProductResources: () => getAvailableProductResources,
-  isSessionProduct: () => isSessionProduct
+  getAvailableProductResources: () => getAvailableProductResources
 });
 module.exports = __toCommonJS(products_exports);
 var getAvailableProductResources = (products) => {
@@ -58,12 +57,7 @@ var getAvailableProductResources = (products) => {
   });
   return { resourceIds: [...new Set(resourceIds)], rules, resourcesMap };
 };
-var isSessionProduct = (product) => {
-  var _a;
-  return (((_a = product == null ? void 0 : product["schedule.ids"]) == null ? void 0 : _a.length) ?? 0) > 0;
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getAvailableProductResources,
-  isSessionProduct
+  getAvailableProductResources
 });

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

@@ -123,7 +123,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态