@pisell/pisellos 2.2.131 → 2.2.133

package/dist/solution/ShopDiscount/index.js

@@ -480,7 +480,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               this.setDiscountList(newDiscountList || []);
               this.store.originalDiscountList = newDiscountList || [];
               this.setProductList(newProductList || []);
-              if (!(this.isWalkIn() && resultDiscountList.length && ((_this$options$otherPa6 = this.options.otherParams) === null || _this$options$otherPa6 === void 0 ? void 0 : _this$options$otherPa6.platform) === 'shop')) {
+              if (!(this.isWalkIn() && resultDiscountList.length && ((_this$options$otherPa6 = this.options.otherParams) === null || _this$options$otherPa6 === void 0 ? void 0 : _this$options$otherPa6.platform) === 'shop' && !((resultDiscountList[0].customer_id || 1) === 1))) {
                 _context5.next = 24;
                 break;
               }

package/lib/core/index.js

@@ -50,7 +50,6 @@ var PisellOSCore = class {
       this.serverOptions = options.server;
     }
     this.initialize(options);
-    console.log("initialize123");
   }
   initialize(options) {
     if (options == null ? void 0 : options.plugins) {

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

@@ -19,7 +19,7 @@ interface PackageSubItemUsageRules {
     type: 'universal_discount' | 'package_exclusive' | 'single_item_promo' | 'custom_usage_rules';
     rules: ("original_price" | "markup_price")[];
     package_scope?: {
-        type: 'all_packages' | 'specific_packages';
+        type: 'all_packages' | 'specific_packages' | 'product_all' | 'products';
         exclude_bundle_product_ids: number[];
         include_bundle_product_ids: number[];
         filter: 0 | 1;

package/lib/modules/Rules/index.js

@@ -105,12 +105,12 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       };
     }
     const filteredOldDiscountList = oldDiscountList.filter(
-      (discount) => !discount.isEditMode && discount.tag !== "good_pass"
-    );
-    const mergedDiscountList = (0, import_utils.uniqueById)(
-      (0, import_utils.uniqueById)([...filteredOldDiscountList, ...newDiscountList]),
-      "product_id"
+      (discount) => !discount.isEditMode && (discount.tag !== "good_pass" || discount.isScan)
     );
+    const mergedDiscountList = (0, import_utils.uniqueById)([
+      ...filteredOldDiscountList,
+      ...newDiscountList
+    ]);
     const result = this.calcDiscount(
       {
         discountList: mergedDiscountList,
@@ -1621,14 +1621,14 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           const _isMarkupPrice = isMarkupPrice && rules.includes("markup_price");
           const isPriceValid = _isOriginalPrice || _isMarkupPrice;
           let isScopeValid = false;
-          if (scopeType === "all_packages") {
+          if (scopeType === "all_packages" || scopeType === "product_all") {
             if (!filter) {
               isScopeValid = true;
             } else {
               isScopeValid = !exclude_bundle_product_ids.includes(Number(mainProductId));
             }
           }
-          if (scopeType === "specific_packages") {
+          if (scopeType === "specific_packages" || scopeType === "products") {
             isScopeValid = include_bundle_product_ids.includes(Number(mainProductId));
           }
           if (isPriceValid && isScopeValid) {

package/lib/server/index.d.ts

@@ -166,6 +166,11 @@ declare class Server {
      * 存储订阅者信息，便于数据变更时推送最新结果
      */
     private handleProductQuery;
+    /**
+     * 按商品 id 查询单条（GET /shop/product/query/:productId）
+     * schedule_date 必填：query 或 data；schedule_datetime 可选。不走订阅。
+     */
+    private handleProductQueryById;
     /**
      * 取消商品查询订阅（HTTP 路由入口）
      */

package/lib/server/index.js

@@ -168,6 +168,49 @@ var Server = class {
       }
       return this.computeProductQueryResult({ menu_list_ids, schedule_date, schedule_datetime });
     };
+    /**
+     * 按商品 id 查询单条（GET /shop/product/query/:productId）
+     * schedule_date 必填：query 或 data；schedule_datetime 可选。不走订阅。
+     */
+    this.handleProductQueryById = async ({ path, method, data, url }) => {
+      const pathname = this.parseRequestPath(url || "", path);
+      const idMatch = pathname.match(/^\/shop\/product\/query\/(\d+)$/);
+      const productId = idMatch ? Number(idMatch[1]) : NaN;
+      console.log("[Server] handleProductQueryById:", pathname, method, data);
+      if (!Number.isFinite(productId)) {
+        this.logWarning("handleProductQueryById: 无效的商品 id", { path: pathname });
+        return {
+          code: 400,
+          message: "无效的商品路径",
+          status: false,
+          data: { item: null }
+        };
+      }
+      const scheduleDateFromData = data && typeof data === "object" && typeof data.schedule_date === "string" ? data.schedule_date.trim() : "";
+      const schedule_date = scheduleDateFromData || (this.extractQueryParam(url || "", "schedule_date") || "").trim() || (0, import_dayjs.default)().format("YYYY-MM-DD");
+      if (!schedule_date) {
+        this.logWarning("handleProductQueryById: 缺少 schedule_date", { productId });
+        return {
+          code: 400,
+          message: "schedule_date 为必填（query 或 data）",
+          status: false,
+          data: null
+        };
+      }
+      const scheduleDtFromData = data && typeof data === "object" && typeof data.schedule_datetime === "string" ? data.schedule_datetime.trim() : "";
+      const scheduleDtFromUrl = (this.extractQueryParam(url || "", "schedule_datetime") || "").trim();
+      const scheduleDatetime = scheduleDtFromData || scheduleDtFromUrl || `${schedule_date}T00:00:00`;
+      this.logInfo("handleProductQueryById: 开始", {
+        productId,
+        schedule_date,
+        schedule_datetime: scheduleDatetime
+      });
+      return this.computeProductQueryResult({
+        schedule_date,
+        schedule_datetime: scheduleDatetime,
+        product_id: productId
+      });
+    };
     /**
      * 取消商品查询订阅（HTTP 路由入口）
      */
@@ -920,6 +963,9 @@ var Server = class {
     if (exact) {
       return exact;
     }
+    if (method === "get" && /^\/shop\/product\/query\/\d+$/.test(path)) {
+      return this.handleProductQueryById;
+    }
     if (method === "get" && this.prefixRouterGet.length > 0) {
       for (const { prefix, handler } of this.prefixRouterGet) {
         if (path === prefix || path.startsWith(`${prefix}/`)) {
@@ -1712,18 +1758,48 @@ var Server = class {
    */
   async computeProductQueryResult(context, options) {
     const tTotal = performance.now();
-    const { menu_list_ids, schedule_date, schedule_datetime } = context;
-    debugger;
+    const { menu_list_ids, schedule_date, schedule_datetime, product_id } = context;
     this.logInfo("computeProductQueryResult 开始", {
       menuListIdsCount: (menu_list_ids == null ? void 0 : menu_list_ids.length) ?? 0,
       schedule_datetime,
       schedule_date,
+      product_id,
       changedIds: options == null ? void 0 : options.changedIds
     });
     if (!this.products) {
       this.logError("computeProductQueryResult: Products 模块未注册");
       return { message: "Products 模块未注册", data: { list: [], count: 0 } };
     }
+    if (product_id != null && Number.isFinite(Number(product_id))) {
+      const pid = Number(product_id);
+      const tPrice2 = performance.now();
+      const allProductsWithPrice2 = await this.products.getProductsWithPrice(schedule_date, {
+        scheduleModule: this.getSchedule()
+      }, {
+        changedIds: options == null ? void 0 : options.changedIds
+      });
+      (0, import_product.perfMark)("computeQuery.getProductsWithPrice(single)", performance.now() - tPrice2, {
+        count: allProductsWithPrice2.length,
+        productId: pid
+      });
+      const published = allProductsWithPrice2.filter((p) => ((p == null ? void 0 : p.status) || "published") === "published");
+      const item = published.find((p) => Number(p.id) === pid) ?? null;
+      (0, import_product.perfMark)("computeProductQueryResult", performance.now() - tTotal, {
+        mode: "single",
+        productId: pid,
+        found: !!item
+      });
+      this.logInfo("computeProductQueryResult 完成（单商品）", {
+        productId: pid,
+        found: !!item
+      });
+      return {
+        code: 200,
+        data: item,
+        message: item ? "" : "商品不存在或未发布",
+        status: true
+      };
+    }
     if (!this.menu) {
       this.logError("computeProductQueryResult: Menu 模块未注册");
       return { message: "Menu 模块未注册", data: { list: [], count: 0 } };

package/lib/solution/ShopDiscount/index.js

@@ -322,7 +322,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         this.setDiscountList(newDiscountList || []);
         this.store.originalDiscountList = newDiscountList || [];
         this.setProductList(newProductList || []);
-        if (this.isWalkIn() && resultDiscountList.length && ((_c = this.options.otherParams) == null ? void 0 : _c.platform) === "shop") {
+        if (this.isWalkIn() && resultDiscountList.length && ((_c = this.options.otherParams) == null ? void 0 : _c.platform) === "shop" && !((resultDiscountList[0].customer_id || 1) === 1)) {
           await this.getCustomerWallet(
             resultDiscountList[0].customer_id
           );

package/package.json

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