@pisell/pisellos 2.2.15 → 2.2.16

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'],
+                with: ['latestWalletDetail.wallet', 'contactsInfo'],
                 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, PaymentHooks, PaymentMethodType, RoundingRule } from "./types";
+import { PaymentStatus, PaymentMethodType, RoundingRule } from "./types";
 import { getUniqueId } from "../Cart/utils";
 import { CashPaymentImpl } from "./cash";
 import { EftposPaymentImpl } from "./eftpos";
@@ -1237,7 +1237,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               this.logInfo('更新订单支付项完成', {
                 orderUuid: orderUuid
               });
-              this.core.effects.emit(PaymentHooks.OnPaymentAdded, {
+              this.core.effects.emit("".concat(this.name, ":onPaymentAdded"), {
                 orderUuid: orderUuid,
                 payment: newPaymentItem
               });

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

@@ -64,12 +64,14 @@ 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;
+        payment_order_id = businessData.payment_order_id,
+        is_price_include_tax = businessData.is_price_include_tax;
 
       // 转换金额为数字类型
       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,17 +140,16 @@ 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(function (n) {
-                  if (n.is_eject !== 1 && n['schedule.ids'] && n['schedule.ids'].length) {
-                    n.is_eject = 1;
-                  }
-                });
-              }
+              }); // if (sortedList.length) {
+              //   sortedList.forEach((n: any) => {
+              //     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 11:
+            case 10:
             case "end":
               return _context3.stop();
           }

package/dist/modules/Rules/index.js

@@ -24,10 +24,12 @@ 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, getDiscountListAmountTotal, getDiscountListAmount, filterDiscountListByBookingTime } from "../../solution/ShopDiscount/utils";
+import { uniqueById, getDiscountAmount, filterDiscountListByBookingTime, getDiscountListAmountTotal, getDiscountListAmount } 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) {
@@ -447,7 +449,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var isBundleAvailable = _this3.checkPackageSubItemUsageRules(discount, flatItem);
 
           // 判断优惠券是否适用于该商品
-          if (isAvailableProduct && isLimitedProduct && isBundleAvailable && timeLimit) {
+          if (isAvailableProduct && isLimitedProduct && timeLimit && isBundleAvailable) {
             var _discountApplicabilit, _discount$metadata;
             // 记录此优惠券适用的商品
             (_discountApplicabilit = discountApplicability.get(discount.id)) === null || _discountApplicabilit === void 0 || _discountApplicabilit.push(product.id);
@@ -537,7 +539,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;
@@ -675,7 +677,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         }
 
         // 如果没有适用的优惠券，或者手动折扣，则不适用优惠券
-        if (applicableDiscounts.length === 0 || isManualDiscount) {
+        if (applicableDiscounts.length === 0 || isManualDiscount || isBoolean(product.vouchersApplicable) && !product.vouchersApplicable) {
           if (flatItem.type === 'main') {
             // 主商品：保持原有逻辑
             if (product.isClient) {
@@ -701,7 +703,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 discount_list: []
               }))]);
             } else {
-              processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {} : {
+              processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, 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,
@@ -714,7 +719,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             // bundle子商品：保存到扁平化Map
             processedFlatItemsMap.set(flatItem._id, [_objectSpread(_objectSpread({}, flatItem), {}, {
               discount_list: [],
-              price: flatItem.bundleItem.original_price,
+              price: isManualDiscount ? flatItem.bundleItem.price : flatItem.bundleItem.original_price,
               processed: true
             })]);
           }
@@ -1114,14 +1119,18 @@ 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;
-                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);
-                  });
-                }
+              }
+
+              // 累加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);
+                });
               }
 
               // 累加options的价格（options不参与折扣，在最终设置total时处理）
@@ -1184,12 +1193,14 @@ 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;
-                  if (newBundleOriginal.length > 0) {
-                    newBundleOriginal.forEach(function (item) {
-                      newTotalOriginal += Number(item.price) * Number(item.num);
-                      newOriginTotalOriginal += Number(item.price) * Number(item.num);
-                    });
-                  }
+                }
+
+                // 累加bundle的价格（只累加一次）
+                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时处理）
@@ -1284,8 +1295,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                   // 累加bundle的价格（只累加一次）
                   if (newBundle.length > 0) {
                     newBundle.forEach(function (item) {
-                      var _item$discount_list3;
                       newTotal += Number(item.price) * Number(item.num);
+                    });
+
+                    // 计算原始总价（不考虑折扣）
+                    newBundle.forEach(function (item) {
+                      var _item$discount_list3;
                       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);
                     });
@@ -1464,8 +1479,34 @@ 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 _priceType === 'markup' && _priceTypeExt === 'product_price';
+          return _isOriginalPrice;
         }
         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 } from "./utils/products";
+import { getAvailableProductResources, isSessionProduct } 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,19 +238,29 @@ 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;
+        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, schedule_date, res;
         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;
-              return _context2.abrupt("return", this.store.products.loadProducts({
+              _context2.next = 3;
+              return this.store.products.loadProducts({
                 category_ids: category_ids,
                 product_ids: product_ids,
                 collection: collection,
                 schedule_date: schedule_date,
                 cacheId: this.cacheId
-              }));
-            case 2:
+              });
+            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 "end":
               return _context2.stop();
           }
@@ -282,7 +292,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;
+        var date, _ref2$product_ids, product_ids, _ref2$category_ids, category_ids, scheduleList, newProductIds, schedule, otherProductsIds, allProductIds, res;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -329,8 +339,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 schedule_date: date
               });
             case 10:
-              return _context3.abrupt("return", _context3.sent);
-            case 11:
+              res = _context3.sent;
+              return _context3.abrupt("return", res);
+            case 12:
             case "end":
               return _context3.stop();
           }
@@ -1150,6 +1161,16 @@ 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,3 +9,9 @@ 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,4 +47,14 @@ 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;
 };

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, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

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/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.js

@@ -36,6 +36,7 @@ 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) {
@@ -296,7 +297,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 && isBundleAvailable && timeLimit) {
+        if (isAvailableProduct && isLimitedProduct && timeLimit && isBundleAvailable) {
           (_g = discountApplicability.get(discount.id)) == null ? void 0 : _g.push(product.id);
           const applicableProducts = discountApplicableProducts.get(discount.id) || [];
           const discountType = discount.tag || discount.type;
@@ -364,7 +365,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")
@@ -473,7 +474,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       }))) {
         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
           }]);
         }
@@ -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/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,

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

@@ -9,3 +9,9 @@ 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,7 +19,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/solution/BookingByStep/utils/products.ts
 var products_exports = {};
 __export(products_exports, {
-  getAvailableProductResources: () => getAvailableProductResources
+  getAvailableProductResources: () => getAvailableProductResources,
+  isSessionProduct: () => isSessionProduct
 });
 module.exports = __toCommonJS(products_exports);
 var getAvailableProductResources = (products) => {
@@ -57,7 +58,12 @@ 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
+  getAvailableProductResources,
+  isSessionProduct
 });

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, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/lib/solution/Checkout/index.js

@@ -216,23 +216,70 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         return pre + (item.amount || 0);
       }, 0);
     };
-    const productList = ((_b = (_a = this.store.currentOrder.order_info) == null ? void 0 : _a.original_order_data.bookings) == null ? void 0 : _b.map(
-      (item) => ({
-        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: this.getHolderIdFromBooking(item)
-      })
-    )) || [];
-    const relationProducts = ((_e = (_d = (_c = this.store.currentOrder.order_info) == null ? void 0 : _c.original_order_data) == null ? void 0 : _d.relation_products) == null ? void 0 : _e.map(
-      (item) => ({
-        product_id: item.product_id,
-        product_variant_id: item.product_variant_id,
-        quantity: item.num,
-        selling_price: item.source_product_price
-      })
-    )) || [];
+    const formatProduct = (items) => {
+      return items.map(
+        (item) => ({
+          product_id: item.product_id,
+          product_variant_id: item.product_variant_id,
+          quantity: item.num,
+          // 商品是否含税：1；0
+          is_charge_tax: 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((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
+              }
+            };
+          })
+        })
+      ) || [];
+    };
+    const productList = formatProduct(
+      ((_c = (_b = (_a = this.store.currentOrder.order_info) == null ? void 0 : _a.original_order_data) == null ? void 0 : _b.bookings) == null ? void 0 : _c.map(
+        (item) => {
+          return {
+            ...item.product,
+            holder_id: this.getHolderIdFromBooking(item)
+          };
+        }
+      )) || []
+    );
+    const relationProducts = formatProduct(((_e = (_d = this.store.currentOrder.order_info) == null ? void 0 : _d.original_order_data) == null ? void 0 : _e.relation_products) || []);
     return [...productList, ...relationProducts];
   }
   async initWalletData(params) {
@@ -257,6 +304,8 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         isDeposit: (_h = this.store.currentOrder) == null ? void 0 : _h.is_deposit
       },
       products: this.getProductListByOrder(),
+      is_price_include_tax: this.otherParams.is_price_include_tax,
+      // core 有
       ...params
     };
     if (this.store.isOrderSynced) {

package/package.json

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