@pisell/pisellos 2.2.13 → 2.2.14

package/dist/modules/Customer/index.js

@@ -154,7 +154,7 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
                 skip: skip,
                 num: num,
                 sort_by: SORT_BY,
-                with: ['latestWalletDetail.wallet', 'contactsInfo'],
+                with: ['latestWalletDetail.wallet'],
                 search_wallet_flag: 1,
                 search_wallet_pass_flag: 1
               }, search && {

package/dist/modules/Payment/index.js

@@ -21,7 +21,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { BaseModule } from "../BaseModule";
-import { PaymentStatus, PaymentMethodType, RoundingRule } from "./types";
+import { PaymentStatus, PaymentHooks, PaymentMethodType, RoundingRule } from "./types";
 import { getUniqueId } from "../Cart/utils";
 import { CashPaymentImpl } from "./cash";
 import { EftposPaymentImpl } from "./eftpos";
@@ -312,66 +312,67 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               return _context3.abrupt("return", cachedMethods);
             case 16:
               _context3.next = 18;
-              return this.request.get('/pay/custom-payment/available', {
-                channel: 'pos'
-              });
+              return this.request.get('/pay/custom-payment/all');
             case 18:
               response = _context3.sent;
+              response.data = response.data.filter(function (method) {
+                return method.status === 1 && method.disable === 0;
+              });
               payMethods = response.data || []; // 尝试缓存到 IndexDB
-              _context3.prev = 20;
+              _context3.prev = 21;
               _iterator = _createForOfIteratorHelper(payMethods);
-              _context3.prev = 22;
+              _context3.prev = 23;
               _iterator.s();
-            case 24:
+            case 25:
               if ((_step = _iterator.n()).done) {
-                _context3.next = 30;
+                _context3.next = 31;
                 break;
               }
               method = _step.value;
-              _context3.next = 28;
+              _context3.next = 29;
               return this.dbManager.update('pay_method', method);
-            case 28:
-              _context3.next = 24;
+            case 29:
+              _context3.next = 25;
               break;
-            case 30:
-              _context3.next = 35;
+            case 31:
+              _context3.next = 36;
               break;
-            case 32:
-              _context3.prev = 32;
-              _context3.t1 = _context3["catch"](22);
+            case 33:
+              _context3.prev = 33;
+              _context3.t1 = _context3["catch"](23);
               _iterator.e(_context3.t1);
-            case 35:
-              _context3.prev = 35;
+            case 36:
+              _context3.prev = 36;
               _iterator.f();
-              return _context3.finish(35);
-            case 38:
-              _context3.next = 43;
+              return _context3.finish(36);
+            case 39:
+              _context3.next = 44;
               break;
-            case 40:
-              _context3.prev = 40;
-              _context3.t2 = _context3["catch"](20);
+            case 41:
+              _context3.prev = 41;
+              _context3.t2 = _context3["catch"](21);
               console.warn('[PaymentModule] 无法缓存支付方式，pay_method 表不存在');
-            case 43:
-              _context3.next = 45;
+            case 44:
+              _context3.next = 46;
               return this.core.effects.emit("".concat(this.name, ":onPaymentMethodsLoaded"), payMethods);
-            case 45:
+            case 46:
               this.logInfo('getPayMethodListAsync completed successfully', {
                 methodCount: payMethods.length,
                 hasCache: cachedMethods.length > 0
               });
               return _context3.abrupt("return", payMethods);
-            case 49:
-              _context3.prev = 49;
+            case 50:
+              _context3.prev = 50;
               _context3.t3 = _context3["catch"](1);
               console.error('[PaymentModule] 获取支付方式列表失败', _context3.t3);
               this.logError('getPayMethodListAsync failed', _context3.t3);
               // 如果所有操作都失败，返回空数组
               return _context3.abrupt("return", []);
-            case 54:
+            case 55:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[1, 49], [3, 9], [20, 40], [22, 32, 35, 38]]);
+        }, _callee3, this, [[1, 50], [3, 9], [21, 41], [23, 33, 36, 39]]);
       }));
       function getPayMethodListAsync() {
         return _getPayMethodListAsync.apply(this, arguments);
@@ -398,15 +399,16 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
 
               // 从服务器获取最新数据
               _context4.next = 5;
-              return this.request.get('/pay/custom-payment/available', {
-                channel: 'pos'
-              });
+              return this.request.get('/pay/custom-payment/all');
             case 5:
               response = _context4.sent;
+              response.data = response.data.filter(function (method) {
+                return method.status === 1 && method.disable === 0;
+              });
               newPayMethods = response.data || []; // 检查是否有变化
               hasChanges = this.hasPaymentMethodsChanged(cachedMethods, newPayMethods);
               if (!hasChanges) {
-                _context4.next = 56;
+                _context4.next = 57;
                 break;
               }
               console.log('[PaymentModule] 支付方式列表已更新');
@@ -416,92 +418,92 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               });
 
               // 更新缓存
-              _context4.prev = 11;
+              _context4.prev = 12;
               // 先清除旧数据
               _iterator2 = _createForOfIteratorHelper(cachedMethods);
-              _context4.prev = 13;
+              _context4.prev = 14;
               _iterator2.s();
-            case 15:
+            case 16:
               if ((_step2 = _iterator2.n()).done) {
-                _context4.next = 21;
+                _context4.next = 22;
                 break;
               }
               method = _step2.value;
-              _context4.next = 19;
+              _context4.next = 20;
               return this.dbManager.delete('pay_method', method.id);
-            case 19:
-              _context4.next = 15;
+            case 20:
+              _context4.next = 16;
               break;
-            case 21:
-              _context4.next = 26;
+            case 22:
+              _context4.next = 27;
               break;
-            case 23:
-              _context4.prev = 23;
-              _context4.t0 = _context4["catch"](13);
+            case 24:
+              _context4.prev = 24;
+              _context4.t0 = _context4["catch"](14);
               _iterator2.e(_context4.t0);
-            case 26:
-              _context4.prev = 26;
+            case 27:
+              _context4.prev = 27;
               _iterator2.f();
-              return _context4.finish(26);
-            case 29:
+              return _context4.finish(27);
+            case 30:
               // 添加新数据
               _iterator3 = _createForOfIteratorHelper(newPayMethods);
-              _context4.prev = 30;
+              _context4.prev = 31;
               _iterator3.s();
-            case 32:
+            case 33:
               if ((_step3 = _iterator3.n()).done) {
-                _context4.next = 38;
+                _context4.next = 39;
                 break;
               }
               _method = _step3.value;
-              _context4.next = 36;
+              _context4.next = 37;
               return this.dbManager.update('pay_method', _method);
-            case 36:
-              _context4.next = 32;
+            case 37:
+              _context4.next = 33;
               break;
-            case 38:
-              _context4.next = 43;
+            case 39:
+              _context4.next = 44;
               break;
-            case 40:
-              _context4.prev = 40;
-              _context4.t1 = _context4["catch"](30);
+            case 41:
+              _context4.prev = 41;
+              _context4.t1 = _context4["catch"](31);
               _iterator3.e(_context4.t1);
-            case 43:
-              _context4.prev = 43;
+            case 44:
+              _context4.prev = 44;
               _iterator3.f();
-              return _context4.finish(43);
-            case 46:
-              _context4.next = 51;
+              return _context4.finish(44);
+            case 47:
+              _context4.next = 52;
               break;
-            case 48:
-              _context4.prev = 48;
-              _context4.t2 = _context4["catch"](11);
+            case 49:
+              _context4.prev = 49;
+              _context4.t2 = _context4["catch"](12);
               console.warn('[PaymentModule] 无法更新支付方式缓存', _context4.t2);
-            case 51:
+            case 52:
               // 通知外部支付方式已变化
               eventData = {
                 oldMethods: cachedMethods,
                 newMethods: newPayMethods
               };
-              _context4.next = 54;
+              _context4.next = 55;
               return this.core.effects.emit("".concat(this.name, ":onPaymentMethodsChanged"), eventData);
-            case 54:
-              _context4.next = 57;
+            case 55:
+              _context4.next = 58;
               break;
-            case 56:
-              console.log('[PaymentModule] 支付方式列表无变化');
             case 57:
-              _context4.next = 62;
+              console.log('[PaymentModule] 支付方式列表无变化');
+            case 58:
+              _context4.next = 63;
               break;
-            case 59:
-              _context4.prev = 59;
+            case 60:
+              _context4.prev = 60;
               _context4.t3 = _context4["catch"](1);
               console.error('[PaymentModule] 后台刷新支付方式失败', _context4.t3);
-            case 62:
+            case 63:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this, [[1, 59], [11, 48], [13, 23, 26, 29], [30, 40, 43, 46]]);
+        }, _callee4, this, [[1, 60], [12, 49], [14, 24, 27, 30], [31, 41, 44, 47]]);
       }));
       function refreshPaymentMethodsInBackground(_x4) {
         return _refreshPaymentMethodsInBackground.apply(this, arguments);
@@ -1200,7 +1202,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               this.logInfo('更新订单支付项完成', {
                 orderUuid: orderUuid
               });
-              this.core.effects.emit("".concat(this.name, ":onPaymentAdded"), {
+              this.core.effects.emit(PaymentHooks.OnPaymentAdded, {
                 orderUuid: orderUuid,
                 payment: newPaymentItem
               });

package/dist/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/dist/modules/Payment/walletpass.js

@@ -64,14 +64,12 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
         amountInfo = businessData.amountInfo,
         products = businessData.products,
         order_wait_pay_amount = businessData.order_wait_pay_amount,
-        payment_order_id = businessData.payment_order_id,
-        is_price_include_tax = businessData.is_price_include_tax;
+        payment_order_id = businessData.payment_order_id;
 
       // 转换金额为数字类型
       var totalAmount = Number(amountInfo.totalAmount);
       var subTotal = Number(amountInfo.subTotal);
       var walletParams = {
-        is_price_include_tax: is_price_include_tax,
         sale_channel: 'pos',
         customer_id: customer_id || 0,
         // 提供默认值，确保类型为 number

package/dist/modules/ProductList/index.js

@@ -140,16 +140,17 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               productsData = _context3.sent;
               sortedList = (productsData.data.list || []).slice().sort(function (a, b) {
                 return Number(b.sort) - Number(a.sort);
-              }); // if (sortedList.length) {
-              //   sortedList.forEach((n: any) => {
-              //     if (n.is_eject !== 1 && n['schedule.ids'] && n['schedule.ids'].length) {
-              //       n.is_eject = 1
-              //     }
-              //   })
-              // }
+              });
+              if (sortedList.length) {
+                sortedList.forEach(function (n) {
+                  if (n.is_eject !== 1 && n['schedule.ids'] && n['schedule.ids'].length) {
+                    n.is_eject = 1;
+                  }
+                });
+              }
               this.addProduct(sortedList);
               return _context3.abrupt("return", sortedList);
-            case 10:
+            case 11:
             case "end":
               return _context3.stop();
           }

package/dist/modules/Rules/index.js

@@ -24,12 +24,10 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { BaseModule } from "../BaseModule";
-import { uniqueById, getDiscountAmount, filterDiscountListByBookingTime, getDiscountListAmountTotal, getDiscountListAmount } from "../../solution/ShopDiscount/utils";
+import { uniqueById, getDiscountAmount, getDiscountListAmountTotal, getDiscountListAmount, filterDiscountListByBookingTime } from "../../solution/ShopDiscount/utils";
 import { getProductOriginTotalPrice, getProductTotalPrice } from "../Cart/utils";
 import Decimal from 'decimal.js';
-import { isBoolean } from 'lodash-es';
 import dayjs from 'dayjs';
-
 // 临时变量
 var flatItem;
 export var RulesModule = /*#__PURE__*/function (_BaseModule) {
@@ -449,7 +447,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var isBundleAvailable = _this3.checkPackageSubItemUsageRules(discount, flatItem);
 
           // 判断优惠券是否适用于该商品
-          if (isAvailableProduct && isLimitedProduct && timeLimit && isBundleAvailable) {
+          if (isAvailableProduct && isLimitedProduct && isBundleAvailable && timeLimit) {
             var _discountApplicabilit, _discount$metadata;
             // 记录此优惠券适用的商品
             (_discountApplicabilit = discountApplicability.get(discount.id)) === null || _discountApplicabilit === void 0 || _discountApplicabilit.push(product.id);
@@ -490,7 +488,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       // 然后再处理应用哪些优惠券，此时只考虑filteredDiscountList中的优惠券
       // 🔥 使用扁平化后的列表进行处理
       sortedFlattenedList.forEach(function (flatItem, index) {
-        var _product5, _product$discount_lis2, _product6;
+        var _product5, _product$discount_lis2, _product6, _product$discount_lis10;
         // 获取商品数据
         var product, originProduct;
         if (flatItem.type === 'main') {
@@ -539,7 +537,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           })) && (discount.tag || discount.type) === 'good_pass') return false;
 
           // 折扣卡商品价格为0时不可用
-          if ((Number(product.price) <= 0 || !product.price) && !((_product$discount_lis4 = product.discount_list) !== null && _product$discount_lis4 !== void 0 && _product$discount_lis4.find(function (n) {
+          if ((Number(product.price) === 0 || !product.price) && !((_product$discount_lis4 = product.discount_list) !== null && _product$discount_lis4 !== void 0 && _product$discount_lis4.find(function (n) {
             var _n$discount2;
             return ((_n$discount2 = n.discount) === null || _n$discount2 === void 0 ? void 0 : _n$discount2.resource_id) === discount.id;
           })) && (discount.tag || discount.type) !== 'good_pass') return false;
@@ -666,9 +664,18 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             }
           }
         }
+        if (options !== null && options !== void 0 && options.selectedList && (_product$discount_lis10 = product.discount_list) !== null && _product$discount_lis10 !== void 0 && _product$discount_lis10.some(function (item) {
+          var _options$selectedList4;
+          return options === null || options === void 0 || (_options$selectedList4 = options.selectedList) === null || _options$selectedList4 === void 0 ? void 0 : _options$selectedList4.some(function (n) {
+            var _item$discount7;
+            return n.discountId === ((_item$discount7 = item.discount) === null || _item$discount7 === void 0 ? void 0 : _item$discount7.resource_id);
+          });
+        })) {
+          isManualDiscount = false;
+        }
 
         // 如果没有适用的优惠券，或者手动折扣，则不适用优惠券
-        if (applicableDiscounts.length === 0 || isManualDiscount || isBoolean(product.vouchersApplicable) && !product.vouchersApplicable) {
+        if (applicableDiscounts.length === 0 || isManualDiscount) {
           if (flatItem.type === 'main') {
             // 主商品：保持原有逻辑
             if (product.isClient) {
@@ -694,10 +701,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 discount_list: []
               }))]);
             } else {
-              processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {
-                price: product.price,
-                main_product_selling_price: product.price
-              } : {
+              processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {} : {
                 _id: product._id.split('___')[0] + '___' + index,
                 total: product.origin_total || product.total,
                 price: product.price,
@@ -710,7 +714,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             // bundle子商品：保存到扁平化Map
             processedFlatItemsMap.set(flatItem._id, [_objectSpread(_objectSpread({}, flatItem), {}, {
               discount_list: [],
-              price: isManualDiscount ? flatItem.bundleItem.price : flatItem.bundleItem.original_price,
+              price: flatItem.bundleItem.original_price,
               processed: true
             })]);
           }
@@ -742,7 +746,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             }));
           }
           for (var i = 0; i < splitCount; i++) {
-            var _product$discount_lis10, _originProduct, _selectedDiscount$met;
+            var _product$discount_lis11, _originProduct, _selectedDiscount$met;
             // 如果用过折扣卡，也就不存在拆分的情况了，这里直接使用上面计算出来的折扣卡
             var _selectedDiscount = selectedDiscountCard || applicableDiscounts[i];
             // 标记优惠券为已使用
@@ -754,7 +758,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             // 优先从 origin_total拿，可能会拿不到（比如用户端预约在没有配置 original_price 的情况下）
             var productOriginTotal = product.origin_total || product.total || 0;
             // 如果当前 product 有 discount_list，则先从 origin_total 拿
-            if ((_product$discount_lis10 = product.discount_list) !== null && _product$discount_lis10 !== void 0 && _product$discount_lis10.length && product.origin_total) {
+            if ((_product$discount_lis11 = product.discount_list) !== null && _product$discount_lis11 !== void 0 && _product$discount_lis11.length && product.origin_total) {
               productOriginTotal = product.origin_total;
             }
             // 如果originProduct?._productInit?.original_price为 0，product.origin_total可能为空，此时取 product.total
@@ -1110,18 +1114,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 var allDiscountAmount = getDiscountListAmountTotal(mainDiscountList);
                 newTotalWithDiscount = (_Decimal$minus$toNumb = new Decimal(mainProductData.price || 0).minus(allDiscountAmount).toNumber()) !== null && _Decimal$minus$toNumb !== void 0 ? _Decimal$minus$toNumb : newTotalWithDiscount;
                 newOriginTotalWithDiscount = (_mainProductData$orig = mainProductData.origin_total) !== null && _mainProductData$orig !== void 0 ? _mainProductData$orig : newOriginTotalWithDiscount;
-              }
-
-              // 累加bundle的价格（只累加一次）
-              if (newBundleWithDiscount.length > 0) {
-                newBundleWithDiscount.forEach(function (item) {
-                  newTotalWithDiscount += Number(item.price) * Number(item.num);
-                });
-                newBundleWithDiscount.forEach(function (item) {
-                  var _item$discount_list2;
-                  var originalPrice = ((_item$discount_list2 = item.discount_list) === null || _item$discount_list2 === void 0 || (_item$discount_list2 = _item$discount_list2[0]) === null || _item$discount_list2 === void 0 || (_item$discount_list2 = _item$discount_list2.discount) === null || _item$discount_list2 === void 0 ? void 0 : _item$discount_list2.original_amount) || item.price;
-                  newOriginTotalWithDiscount += Number(originalPrice) * Number(item.num);
-                });
+                if (newBundleWithDiscount.length > 0) {
+                  newBundleWithDiscount.forEach(function (item) {
+                    var _item$discount_list2;
+                    newTotalWithDiscount += Number(item.price) * Number(item.num);
+                    var originalPrice = ((_item$discount_list2 = item.discount_list) === null || _item$discount_list2 === void 0 || (_item$discount_list2 = _item$discount_list2[0]) === null || _item$discount_list2 === void 0 || (_item$discount_list2 = _item$discount_list2.discount) === null || _item$discount_list2 === void 0 ? void 0 : _item$discount_list2.original_amount) || item.price;
+                    newOriginTotalWithDiscount += Number(originalPrice) * Number(item.num);
+                  });
+                }
               }
 
               // 累加options的价格（options不参与折扣，在最终设置total时处理）
@@ -1184,14 +1184,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                   var _allDiscountAmount = getDiscountListAmount(mainDiscountListOriginal);
                   newTotalOriginal = (_Decimal$minus$toNumb2 = new Decimal(mainProductData.price || 0).minus(_allDiscountAmount).toNumber()) !== null && _Decimal$minus$toNumb2 !== void 0 ? _Decimal$minus$toNumb2 : newTotalOriginal;
                   newOriginTotalOriginal = (_mainProductData$orig2 = mainProductData.origin_total) !== null && _mainProductData$orig2 !== void 0 ? _mainProductData$orig2 : newOriginTotalOriginal;
-                }
-
-                // 累加bundle的价格（只累加一次）
-                if (newBundleOriginal.length > 0) {
-                  newBundleOriginal.forEach(function (item) {
-                    newTotalOriginal += Number(item.price) * Number(item.num);
-                    newOriginTotalOriginal += Number(item.price) * Number(item.num);
-                  });
+                  if (newBundleOriginal.length > 0) {
+                    newBundleOriginal.forEach(function (item) {
+                      newTotalOriginal += Number(item.price) * Number(item.num);
+                      newOriginTotalOriginal += Number(item.price) * Number(item.num);
+                    });
+                  }
                 }
 
                 // 累加options的价格（options不参与折扣，在最终设置total时处理）
@@ -1285,13 +1283,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
                   // 累加bundle的价格（只累加一次）
                   if (newBundle.length > 0) {
-                    newBundle.forEach(function (item) {
-                      newTotal += Number(item.price) * Number(item.num);
-                    });
-
-                    // 计算原始总价（不考虑折扣）
                     newBundle.forEach(function (item) {
                       var _item$discount_list3;
+                      newTotal += Number(item.price) * Number(item.num);
                       var originalPrice = ((_item$discount_list3 = item.discount_list) === null || _item$discount_list3 === void 0 || (_item$discount_list3 = _item$discount_list3[0]) === null || _item$discount_list3 === void 0 || (_item$discount_list3 = _item$discount_list3.discount) === null || _item$discount_list3 === void 0 ? void 0 : _item$discount_list3.original_amount) || item.price;
                       newOriginTotal += Number(originalPrice) * Number(item.num);
                     });
@@ -1470,34 +1464,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // 套餐中购买时，判断是否为原价
           var _priceType = (_flatItem$bundleItem7 = flatItem.bundleItem) === null || _flatItem$bundleItem7 === void 0 ? void 0 : _flatItem$bundleItem7.price_type;
           var _priceTypeExt = (_flatItem$bundleItem8 = flatItem.bundleItem) === null || _flatItem$bundleItem8 === void 0 ? void 0 : _flatItem$bundleItem8.price_type_ext;
-
-          // original_price 对应：
-          // 1. price_type: "markup" && price_type_ext: "product_price"
-          // markup_price 对应：
-          // price_type: "markup" && price_type_ext: ""
-          /** 原价 */
-          var _isOriginalPrice = _priceType === 'markup' && _priceTypeExt === 'product_price';
-          /** 加价 */
-          var _isMarkupPrice = _priceType === 'markup' && (_priceTypeExt === '' || !_priceTypeExt);
-
-          // 检查 rules
-          if (rules.length > 0) {
-            // 检查原价
-            if (_isOriginalPrice && rules.includes('original_price')) {
-              return true;
-            }
-
-            // 检查加价
-            if (_isMarkupPrice && rules.includes('markup_price')) {
-              return true;
-            }
-
-            // 如果都不匹配，则不可用
-            return false;
-          }
-
           // 原价包括：price_type: "markup" && price_type_ext: "product_price"
-          return _isOriginalPrice;
+          return _priceType === 'markup' && _priceTypeExt === 'product_price';
         }
         return false;
       }

package/dist/solution/BookingByStep/index.js

@@ -31,7 +31,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { BaseModule } from "../../modules/BaseModule";
 import { createModule } from "./types";
 import { formatProductToCartItem, createCartItemOrigin, getUniqueId, handleVariantProduct, formatDateToCartItem, formatAccountToCartItem } from "../../modules/Cart/utils";
-import { getAvailableProductResources, isSessionProduct } from "./utils/products";
+import { getAvailableProductResources } from "./utils/products";
 import { getResourcesByProduct, getTimeSlicesByResource, getTimeSlicesByResources, getIsUsableByTimeItem, getOthersSelectedResources, getOthersCartSelectedResources, filterScheduleByDateRange, checkSessionProductLeadTime, sortCombinedResources, filterResourcesByFormItem, checkTwoResourcesIntersection, isConflict } from "./utils/resources";
 import dayjs from 'dayjs';
 import isSameOrBefore from 'dayjs/plugin/isSameOrBefore';
@@ -238,29 +238,19 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadProducts",
     value: (function () {
       var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref) {
-        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, schedule_date, res;
+        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, schedule_date;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _ref$category_ids = _ref.category_ids, category_ids = _ref$category_ids === void 0 ? [] : _ref$category_ids, _ref$product_ids = _ref.product_ids, product_ids = _ref$product_ids === void 0 ? [] : _ref$product_ids, _ref$collection = _ref.collection, collection = _ref$collection === void 0 ? [] : _ref$collection, schedule_date = _ref.schedule_date;
-              _context2.next = 3;
-              return this.store.products.loadProducts({
+              return _context2.abrupt("return", this.store.products.loadProducts({
                 category_ids: category_ids,
                 product_ids: product_ids,
                 collection: collection,
                 schedule_date: schedule_date,
                 cacheId: this.cacheId
-              });
-            case 3:
-              res = _context2.sent;
-              // 预拉取当天的资源数据
-              this.getAvailableDate({
-                startDate: schedule_date || dayjs().format('YYYY-MM-DD'),
-                endDate: schedule_date || dayjs().format('YYYY-MM-DD'),
-                products: _toConsumableArray(res)
-              });
-              return _context2.abrupt("return", res);
-            case 6:
+              }));
+            case 2:
             case "end":
               return _context2.stop();
           }
@@ -292,7 +282,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _loadProductByScheduleDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref2) {
         var _schedule$product_ids;
-        var date, _ref2$product_ids, product_ids, _ref2$category_ids, category_ids, scheduleList, newProductIds, schedule, otherProductsIds, allProductIds, res;
+        var date, _ref2$product_ids, product_ids, _ref2$category_ids, category_ids, scheduleList, newProductIds, schedule, otherProductsIds, allProductIds;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -339,9 +329,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 schedule_date: date
               });
             case 10:
-              res = _context3.sent;
-              return _context3.abrupt("return", res);
-            case 12:
+              return _context3.abrupt("return", _context3.sent);
+            case 11:
             case "end":
               return _context3.stop();
           }
@@ -1161,16 +1150,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var productData = _objectSpread(_objectSpread({}, origin), {}, {
         product_variant_id: product_variant_id
       });
-      debugger;
-      // 保护，如果进来的是 session 商品，则必须要有 date 和时间片，否则不允许添加
-      if (isSessionProduct(productData)) {
-        if (!date || !date.startTime || !date.endTime) {
-          return {
-            success: false,
-            errorCode: 'date_or_time_required'
-          };
-        }
-      }
 
       // 库存检测
       var currentCartItems = this.store.cart.getItems();

package/dist/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/dist/solution/BookingByStep/utils/products.js

@@ -47,14 +47,4 @@ export var getAvailableProductResources = function getAvailableProductResources(
     rules: rules,
     resourcesMap: resourcesMap
   };
-};
-
-/**
- * 判断商品是否是 session 商品
- * @param product 商品数据
- * @returns 是否是 session 商品
- */
-export var isSessionProduct = function isSessionProduct(product) {
-  var _product$scheduleIds, _product$scheduleIds2;
-  return ((_product$scheduleIds = product === null || product === void 0 || (_product$scheduleIds2 = product['schedule.ids']) === null || _product$scheduleIds2 === void 0 ? void 0 : _product$scheduleIds2.length) !== null && _product$scheduleIds !== void 0 ? _product$scheduleIds : 0) > 0;
 };