@pisell/pisellos 2.1.17 → 2.1.19

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

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,18 +16,30 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/solution/BookingByStep/utils/capacity.ts
 var capacity_exports = {};
 __export(capacity_exports, {
+  calculateCartItemsCapacityUsageByResourceType: () => calculateCartItemsCapacityUsageByResourceType,
   checkResourceCanUseByCapacity: () => checkResourceCanUseByCapacity,
   checkSubResourcesCapacity: () => checkSubResourcesCapacity,
+  checkTimeSlotCapacity: () => checkTimeSlotCapacity,
   formatDefaultCapacitys: () => formatDefaultCapacitys,
   getCapacityInfoByCartItem: () => getCapacityInfoByCartItem,
+  getResourcesIdsByProduct: () => getResourcesIdsByProduct,
   getSumCapacity: () => getSumCapacity
 });
 module.exports = __toCommonJS(capacity_exports);
+var import_dayjs = __toESM(require("dayjs"));
 var formatDefaultCapacitys = ({
   capacity,
   product_bundle
@@ -96,11 +110,154 @@ var checkResourceCanUseByCapacity = (currentCapacity, requiredCapacity, maxCapac
   }
   return currentCapacity + requiredCapacity <= maxCapacity;
 };
+function calculateCartItemsCapacityUsageByResourceType({
+  cartItems,
+  timeSlotStart,
+  timeSlotEnd,
+  allProductResources
+}) {
+  const resourceTypeMap = {};
+  allProductResources.forEach((resource) => {
+    var _a;
+    const formId = ((_a = resource.form_id) == null ? void 0 : _a.toString()) || "default";
+    if (!resourceTypeMap[formId]) {
+      resourceTypeMap[formId] = [];
+    }
+    resourceTypeMap[formId].push(resource);
+  });
+  const capacityUsageByType = {};
+  Object.keys(resourceTypeMap).forEach((formId) => {
+    let totalUsage = 0;
+    const resourcesInThisType = resourceTypeMap[formId];
+    const resourceIdsInThisType = resourcesInThisType.map((r) => r.id);
+    cartItems.forEach((cartItem) => {
+      if (!cartItem.start_time || !cartItem.end_time)
+        return;
+      const itemStart = `${cartItem.start_date} ${cartItem.start_time}`;
+      const itemEnd = `${cartItem.end_date || cartItem.start_date} ${cartItem.end_time}`;
+      const hasTimeOverlap = !((0, import_dayjs.default)(itemEnd).isBefore((0, import_dayjs.default)(timeSlotStart)) || (0, import_dayjs.default)(itemStart).isAfter((0, import_dayjs.default)(timeSlotEnd)));
+      if (!hasTimeOverlap)
+        return;
+      const productResourceIds = getResourcesIdsByProduct(cartItem._productOrigin);
+      const hasResourceTypeOverlap = productResourceIds.some(
+        (id) => resourceIdsInThisType.includes(id)
+      );
+      if (!hasResourceTypeOverlap)
+        return;
+      const { currentCapacity } = getCapacityInfoByCartItem(cartItem);
+      totalUsage += currentCapacity;
+    });
+    capacityUsageByType[formId] = totalUsage;
+  });
+  return capacityUsageByType;
+}
+function getResourcesIdsByProduct(product) {
+  var _a, _b, _c;
+  const tempResourceIds = [];
+  (_c = (_b = (_a = product == null ? void 0 : product.product_resource) == null ? void 0 : _a.resources) == null ? void 0 : _b.forEach) == null ? void 0 : _c.call(_b, (resource) => {
+    var _a2, _b2;
+    if ((resource == null ? void 0 : resource.status) == 1) {
+      if ((_a2 = resource == null ? void 0 : resource.default_resource) == null ? void 0 : _a2.length) {
+        tempResourceIds.push(...resource == null ? void 0 : resource.default_resource);
+      } else if ((_b2 = resource == null ? void 0 : resource.optional_resource) == null ? void 0 : _b2.length) {
+        tempResourceIds.push(...resource == null ? void 0 : resource.optional_resource);
+      }
+    }
+  });
+  return tempResourceIds;
+}
+function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, allResources) {
+  var _a, _b;
+  const resourceTypeMap = {};
+  allResources.forEach((resource) => {
+    var _a2;
+    const formId = ((_a2 = resource.form_id) == null ? void 0 : _a2.toString()) || "default";
+    if (!resourceTypeMap[formId]) {
+      resourceTypeMap[formId] = [];
+    }
+    resourceTypeMap[formId].push(resource);
+  });
+  const requiredCapacityByType = {};
+  cartItems.forEach((cartItem) => {
+    const productResourceIds = getResourcesIdsByProduct(cartItem._productOrigin);
+    const { currentCapacity } = getCapacityInfoByCartItem(cartItem);
+    Object.keys(resourceTypeMap).forEach((formId) => {
+      const resourcesInType = resourceTypeMap[formId];
+      const resourceIdsInType = resourcesInType.map((r) => r.id);
+      const needsThisResourceType = productResourceIds.some(
+        (id) => resourceIdsInType.includes(id)
+      );
+      if (needsThisResourceType) {
+        requiredCapacityByType[formId] = (requiredCapacityByType[formId] || 0) + currentCapacity;
+      }
+    });
+  });
+  for (const [formId, requiredCapacity] of Object.entries(requiredCapacityByType)) {
+    const resourcesInType = resourceTypeMap[formId];
+    if (resourcesInType.length === 0)
+      continue;
+    let resourceTypeConfig = null;
+    for (const cartItem of cartItems) {
+      if ((_b = (_a = cartItem._productOrigin) == null ? void 0 : _a.product_resource) == null ? void 0 : _b.resources) {
+        resourceTypeConfig = cartItem._productOrigin.product_resource.resources.find(
+          (r) => {
+            var _a2;
+            return ((_a2 = r.id) == null ? void 0 : _a2.toString()) === formId && r.status === 1;
+          }
+        );
+        if (resourceTypeConfig)
+          break;
+      }
+    }
+    const isMultipleBooking = (resourceTypeConfig == null ? void 0 : resourceTypeConfig.type) === "multiple";
+    console.log(`capacity.ts - 资源类型 ${formId} 配置:`, {
+      resourceTypeConfig,
+      type: resourceTypeConfig == null ? void 0 : resourceTypeConfig.type,
+      isMultipleBooking,
+      requiredCapacity
+    });
+    if (isMultipleBooking) {
+      let totalAvailableCapacity = 0;
+      resourcesInType.forEach((resource) => {
+        const availableTimes = resource.times.filter((time) => {
+          return !(0, import_dayjs.default)(time.start_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute") && !(0, import_dayjs.default)(time.end_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") || (0, import_dayjs.default)(time.start_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") && (0, import_dayjs.default)(time.end_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute");
+        });
+        if (availableTimes.length > 0) {
+          totalAvailableCapacity += resource.capacity || 0;
+        }
+      });
+      console.log(`capacity.ts - 资源类型 ${formId} 多个预约检查: 总容量 ${totalAvailableCapacity}, 需求 ${requiredCapacity}`);
+      if (totalAvailableCapacity < requiredCapacity) {
+        console.log(`资源类型 ${formId} 容量不足: 需要 ${requiredCapacity}, 可用 ${totalAvailableCapacity}`);
+        return false;
+      }
+    } else {
+      let availableResourceCount = 0;
+      resourcesInType.forEach((resource) => {
+        const availableTimes = resource.times.filter((time) => {
+          return !(0, import_dayjs.default)(time.start_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute") && !(0, import_dayjs.default)(time.end_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") || (0, import_dayjs.default)(time.start_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") && (0, import_dayjs.default)(time.end_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute");
+        });
+        if (availableTimes.length > 0) {
+          availableResourceCount++;
+        }
+      });
+      console.log(`capacity.ts - 资源类型 ${formId} 单个预约检查: 可用资源数 ${availableResourceCount}, 需求 ${requiredCapacity}`);
+      if (availableResourceCount < requiredCapacity) {
+        console.log(`资源类型 ${formId} 数量不足: 需要 ${requiredCapacity}, 可用 ${availableResourceCount}`);
+        return false;
+      }
+    }
+  }
+  return true;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  calculateCartItemsCapacityUsageByResourceType,
   checkResourceCanUseByCapacity,
   checkSubResourcesCapacity,
+  checkTimeSlotCapacity,
   formatDefaultCapacitys,
   getCapacityInfoByCartItem,
+  getResourcesIdsByProduct,
   getSumCapacity
 });

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

@@ -0,0 +1,29 @@
+import { CartItem } from '../../../modules';
+/**
+ * 检测商品库存是否足够
+ *
+ * 只有同时满足以下条件时才会进行库存检测：
+ * - is_track 开启（值为 1 或 true）
+ * - over_sold 为 0（不允许超卖）
+ *
+ * 对于多规格商品：
+ * - 如果有 product_variant_id，则从 productData.variant 数组中查找对应规格
+ * - 使用规格的 is_track, over_sold, stock_quantity 而不是主商品的
+ *
+ * @param productData 商品数据（需包含 is_track, over_sold, stock_quantity 字段，多规格商品需包含 variant 数组）
+ * @param product_variant_id 商品变体ID，如果存在则为多规格商品
+ * @param quantity 需要添加的数量
+ * @param bundle 套餐配置（子商品需包含 is_track, over_sold, stock_quantity 字段）
+ * @param currentCartItems 当前购物车商品列表
+ * @returns 库存检测结果
+ */
+export declare function checkProductStock({ productData, product_variant_id, quantity, bundle, currentCartItems }: {
+    productData: any;
+    product_variant_id?: any;
+    quantity: number;
+    bundle?: any[];
+    currentCartItems: CartItem[];
+}): {
+    success: boolean;
+    errorCode?: string;
+};

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

@@ -0,0 +1,89 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/solution/BookingByStep/utils/stock.ts
+var stock_exports = {};
+__export(stock_exports, {
+  checkProductStock: () => checkProductStock
+});
+module.exports = __toCommonJS(stock_exports);
+function checkProductStock({
+  productData,
+  product_variant_id,
+  quantity,
+  bundle,
+  currentCartItems
+}) {
+  let mainProductConfig = productData;
+  if (product_variant_id && productData.variant && Array.isArray(productData.variant)) {
+    const variant = productData.variant.find((v) => v.id === product_variant_id);
+    if (variant) {
+      mainProductConfig = variant;
+    }
+  }
+  const isMainProductTrackingEnabled = mainProductConfig.is_track === 1 || mainProductConfig.is_track === true;
+  const isMainProductOverSoldDisabled = mainProductConfig.over_sold === 0;
+  if (isMainProductTrackingEnabled && isMainProductOverSoldDisabled) {
+    const existingQuantity = currentCartItems.reduce((total, cartItem) => {
+      var _a, _b, _c;
+      const isSameProduct = ((_a = cartItem._productOrigin) == null ? void 0 : _a.id) === productData.id;
+      const isSameVariant = !product_variant_id && !((_b = cartItem._productOrigin) == null ? void 0 : _b.product_variant_id) || ((_c = cartItem._productOrigin) == null ? void 0 : _c.product_variant_id) === product_variant_id;
+      if (isSameProduct && isSameVariant) {
+        return total + (cartItem.num || 0);
+      }
+      return total;
+    }, 0);
+    const totalQuantity = existingQuantity + quantity;
+    const stockQuantity = mainProductConfig.stock_quantity;
+    if (stockQuantity !== void 0 && stockQuantity !== null && totalQuantity > stockQuantity) {
+      return { success: false, errorCode: "not_enough_stock" };
+    }
+  }
+  if (bundle && Array.isArray(bundle)) {
+    for (const bundleItem of bundle) {
+      const bundleProductId = bundleItem.bundle_product_id;
+      const bundleStockQuantity = bundleItem.stock_quantity;
+      const bundleRequiredQuantity = (bundleItem.num || 1) * quantity;
+      const isBundleTrackingEnabled = bundleItem.is_track === 1 || bundleItem.is_track === true;
+      const isBundleOverSoldDisabled = bundleItem.over_sold === 0;
+      if (!isBundleTrackingEnabled || !isBundleOverSoldDisabled)
+        continue;
+      if (bundleStockQuantity === void 0 || bundleStockQuantity === null)
+        continue;
+      const existingBundleQuantity = currentCartItems.reduce((total, cartItem) => {
+        if (!cartItem._bundleOrigin || !Array.isArray(cartItem._bundleOrigin))
+          return total;
+        cartItem._bundleOrigin.forEach((cartBundleItem) => {
+          if (cartBundleItem.bundle_product_id === bundleProductId) {
+            total += (cartBundleItem.num || 1) * (cartItem.num || 1);
+          }
+        });
+        return total;
+      }, 0);
+      const totalBundleQuantity = existingBundleQuantity + bundleRequiredQuantity;
+      if (totalBundleQuantity > bundleStockQuantity) {
+        return { success: false, errorCode: "not_enough_stock" };
+      }
+    }
+  }
+  return { success: true };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  checkProductStock
+});

package/lib/solution/Checkout/index.js

@@ -659,13 +659,15 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       if (Number(remainingAmount) > 0) {
         this.logInfo("订单金额还有待付的，同步 EFTPOS 支付");
         const isEftposPayment = ((_a = paymentItem.type) == null ? void 0 : _a.toLowerCase()) === "eftpos" || ((_b = paymentItem.code) == null ? void 0 : _b.toUpperCase().includes("EFTPOS"));
+        const isCashPayment2 = paymentItem.code === "CASHMANUAL";
+        const isCustomePayment = paymentItem.type === "custom";
         this.logInfo("EFTPOS 支付检查:", {
           paymentCode: paymentItem.code,
           paymentType: paymentItem.type,
           isEftposPayment,
           currentOrderSynced: this.store.isOrderSynced
         });
-        if (isEftposPayment) {
+        if (isEftposPayment || isCashPayment2 || isCustomePayment) {
           this.logInfo("检测到 EFTPOS 支付，立即同步订单到后端...");
           try {
             const syncResult = await this.syncOrderToBackendWithReturn(true);
@@ -794,13 +796,15 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       }
       const remainingAmount = await this.calculateRemainingAmountAsync();
       const remainingValue = new import_decimal.default(remainingAmount);
-      if (remainingValue.lte(0)) {
-        this.logInfo("订单已完成支付且修改代金券，跳过操作避免重复同步:", {
+      const isOrderSynced = this.store.isOrderSynced;
+      if (remainingValue.lte(0) && isOrderSynced && voucherPaymentItems.length === 0) {
+        this.logInfo("订单已同步且支付完成，跳过清空代金券操作避免重复同步:", {
           orderUuid: this.store.currentOrder.uuid,
           orderId: this.store.currentOrder.order_id,
           remainingAmount,
+          isOrderSynced,
           voucherPaymentItemsCount: voucherPaymentItems.length,
-          reason: "Order payment completed, skip clear vouchers"
+          reason: "Order synced and payment completed, skip clear vouchers to avoid duplicate sync"
         });
         return;
       }

package/package.json

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