@pisell/pisellos 3.0.91 → 3.0.93

package/lib/model/strategy/adapter/promotion/index.js

@@ -0,0 +1,49 @@
+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)
+    __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 __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/model/strategy/adapter/promotion/index.ts
+var promotion_exports = {};
+__export(promotion_exports, {
+  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter: () => import_adapter.PromotionAdapter,
+  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
+  default: () => import_adapter2.default
+});
+module.exports = __toCommonJS(promotion_exports);
+var import_evaluator = require("./evaluator");
+var import_adapter = require("./adapter");
+var import_adapter2 = __toESM(require("./adapter"));
+var import_examples = require("./examples");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter,
+  PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY
+});

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

@@ -33,6 +33,8 @@ interface Limitedrelationproductdata {
     product_ids: number[];
     product_collection_id: number[];
     package_sub_item_usage_rules?: PackageSubItemUsageRules;
+    exclude_product_ids?: number[];
+    filter?: 0 | 1;
 }
 interface ApplicableProductDetails {
     amount: string;

package/lib/modules/ProductList/index.js

@@ -59,7 +59,7 @@ var ProductList = class extends import_BaseModule.BaseModule {
     cacheId,
     menu_list_ids = []
   }) {
-    var _a;
+    var _a, _b, _c;
     let userPlugin = this.core.getPlugin("user");
     let customer_id = void 0;
     try {
@@ -67,6 +67,13 @@ var ProductList = class extends import_BaseModule.BaseModule {
     } catch (error) {
       console.error(error);
     }
+    const channelMap = {
+      "online_store": "online-store",
+      "scan_to_order": "online-store",
+      "scan_to_order_2": "online-store",
+      "scan_to_order_3": "online-store"
+    };
+    const saleChannel = channelMap[(_b = this.otherParams) == null ? void 0 : _b.channel] || ((_c = this.otherParams) == null ? void 0 : _c.channel);
     try {
       const productsData = await this.request.post(
         `/product/query`,
@@ -93,8 +100,7 @@ var ProductList = class extends import_BaseModule.BaseModule {
           // client_schedule_ids: schedule_ids,
           schedule_date,
           schedule_datetime,
-          // application_code: this.otherParams?.channel === 'online_store' ? 'online-store' : this.otherParams?.channel,
-          application_code: "online-store",
+          application_code: saleChannel,
           is_eject: 1,
           menu_list_ids,
           open_deposit: 1

package/lib/modules/Rules/index.js

@@ -358,6 +358,11 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       }
       return priceB.minus(priceA).toNumber();
     });
+    const isProductIncludedByLimitedData = (limitedData, productId) => {
+      const excludedIds = (limitedData == null ? void 0 : limitedData.exclude_product_ids) || [];
+      const isExcluded = (limitedData == null ? void 0 : limitedData.filter) === 1 && excludedIds.some((id) => String(id) === String(productId));
+      return !isExcluded;
+    };
     const usedDiscounts = /* @__PURE__ */ new Map();
     const discountApplicability = /* @__PURE__ */ new Map();
     const discountApplicableProducts = /* @__PURE__ */ new Map();
@@ -627,6 +632,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           return false;
         }
         if (limitedData.type === "product_all") {
+          if (!isProductIncludedByLimitedData(limitedData, product.id)) {
+            return false;
+          }
           if (!this.checkPackageSubItemUsageRules(discount, flatItem)) {
             return false;
           }

package/lib/modules/Summary/utils.js

@@ -373,6 +373,26 @@ var calculateTaxFee = (shopInfo, items) => {
   }, new import_decimal.default(0));
   return totalTaxFee;
 };
+var getCartItemDepositData = (item) => {
+  var _a, _b, _c, _d;
+  const target = item;
+  return ((_a = target == null ? void 0 : target._productOrigin) == null ? void 0 : _a.custom_deposit_data) || ((_b = target == null ? void 0 : target._origin) == null ? void 0 : _b.custom_deposit_data) || ((_d = (_c = target == null ? void 0 : target._origin) == null ? void 0 : _c.product) == null ? void 0 : _d.custom_deposit_data);
+};
+var getCartItemQuantity = (item) => {
+  return new import_decimal.default((item == null ? void 0 : item.num) || 1);
+};
+var calculateCartItemDepositTotal = (item) => {
+  var _a;
+  const depositData = getCartItemDepositData(item);
+  if ((depositData == null ? void 0 : depositData.has_deposit) == 1 && typeof (depositData == null ? void 0 : depositData.deposit_fixed) === "string" && typeof (depositData == null ? void 0 : depositData.deposit_percentage) === "string") {
+    const lineTotal = new import_decimal.default(item.summaryTotal ?? item.total ?? 0);
+    const quantity = getCartItemQuantity(item);
+    const fixedTotal = new import_decimal.default(depositData.deposit_fixed || 0).times(quantity);
+    const percentageTotal = new import_decimal.default(depositData.deposit_percentage || 0).times(lineTotal);
+    return fixedTotal.plus(percentageTotal);
+  }
+  return new import_decimal.default(((_a = item == null ? void 0 : item.deposit) == null ? void 0 : _a.total) || 0);
+};
 var calculateDeposit = (items) => {
   if (!(items == null ? void 0 : items.length)) {
     return void 0;
@@ -380,11 +400,11 @@ var calculateDeposit = (items) => {
   const protocols = [];
   let hasDeposit = false;
   const total = items.reduce((sum, item) => {
-    var _a, _b, _c;
+    var _a, _b;
     if (item == null ? void 0 : item.deposit) {
       hasDeposit = true;
-      const cartItemTotalPrice = new import_decimal.default(((_a = item == null ? void 0 : item.deposit) == null ? void 0 : _a.total) || 0);
-      (_c = (_b = item == null ? void 0 : item.deposit) == null ? void 0 : _b.protocols) == null ? void 0 : _c.forEach((protocol) => {
+      const cartItemTotalPrice = calculateCartItemDepositTotal(item);
+      (_b = (_a = item == null ? void 0 : item.deposit) == null ? void 0 : _a.protocols) == null ? void 0 : _b.forEach((protocol) => {
         if (protocols.findIndex((p) => p.id === protocol.id) === -1) {
           protocols.push(protocol);
         }

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

@@ -168,6 +168,11 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     getOrderProducts(): ScanOrderOrderProduct[];
     getSummary(): Promise<import("./types").ScanOrderSummary>;
     submitOrder<T = any>(): Promise<T>;
+    /**
+     * 0 元订单免费领取（非定金场景）
+     * 与 appointment getFreeProduct 同接口：POST /pay/order/free-pay/:id
+     */
+    submitFreeOrder(id: string | number): Promise<any>;
     addProductToOrder(product: Partial<ScanOrderOrderProduct> & ScanOrderOrderProductIdentity): Promise<ScanOrderOrderProduct[]>;
     updateProductInOrder(params: UpdateProductInOrderParams): Promise<ScanOrderOrderProduct[]>;
     removeProductFromOrder(identity: ScanOrderOrderProductIdentity): Promise<ScanOrderOrderProduct[]>;

package/lib/solution/VenueBooking/index.js

@@ -1437,6 +1437,24 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
       throw error;
     }
   }
+  /**
+   * 0 元订单免费领取（非定金场景）
+   * 与 appointment getFreeProduct 同接口：POST /pay/order/free-pay/:id
+   */
+  async submitFreeOrder(id) {
+    this.logMethodStart("submitFreeOrder", { id });
+    try {
+      if (!id) {
+        throw new Error("订单 ID 不能为空");
+      }
+      const res = await this.request.post(`/pay/order/free-pay/${id}`);
+      this.logMethodSuccess("submitFreeOrder", { id, status: res == null ? void 0 : res.status });
+      return res;
+    } catch (error) {
+      this.logMethodError("submitFreeOrder", error);
+      throw error;
+    }
+  }
   async addProductToOrder(product) {
     var _a;
     this.logMethodStart("addProductToOrder", {

package/package.json

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