@pisell/pisellos 2.2.34 → 2.2.36

package/dist/modules/Discount/index.d.ts

@@ -22,6 +22,7 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
         with_discount_card: 0 | 1;
         customer_id: number;
         with_wallet_pass_holder: 0 | 1;
+        request_timezone: string;
     }): Promise<Discount[]>;
     batchSearch(code: string, customerId?: number): Promise<Discount[]>;
     filterEnabledDiscountList(discountList: Discount[]): Discount[];

package/dist/modules/Discount/index.js

@@ -190,7 +190,8 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
                 relation_product: 1,
                 with: ['extensionData', 'customScheduleSnapshot', 'holder.detail'],
                 order_behavior_count: 1,
-                order_behavior_count_customer_id: customerId || 1
+                order_behavior_count_customer_id: customerId || 1,
+                request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
               });
             case 2:
               result = _context5.sent;

package/dist/modules/Product/index.d.ts

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

package/dist/server/utils/product.js

@@ -7,7 +7,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 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 Decimal from 'decimal.js';
 import { getScheduleStartEndTimePoints } from "../modules/schedule/utils";
 import { getUniqueId } from "../../modules/Cart/utils";
 
@@ -121,9 +120,6 @@ export function applyPriceDataToProducts(products, priceData) {
               if (priceBi) {
                 // 处理 markdown 类型
                 var price = priceBi.price;
-                if (priceBi.price_type === 'markdown') {
-                  price = new Decimal(price || 0).mul(-1).toNumber();
-                }
                 return _objectSpread(_objectSpread({}, bi), {}, {
                   price: String(price),
                   base_price: String(priceBi.base_price)

package/dist/solution/BookingByStep/index.d.ts

@@ -343,7 +343,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
+    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

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

package/dist/solution/ShopDiscount/index.js

@@ -741,7 +741,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 action: 'create',
                 with_good_pass: 1,
                 with_discount_card: 1,
-                with_wallet_pass_holder: 1
+                with_wallet_pass_holder: 1,
+                request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
               });
             case 4:
               goodPassList = _context9.sent;

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

@@ -22,6 +22,7 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
         with_discount_card: 0 | 1;
         customer_id: number;
         with_wallet_pass_holder: 0 | 1;
+        request_timezone: string;
     }): Promise<Discount[]>;
     batchSearch(code: string, customerId?: number): Promise<Discount[]>;
     filterEnabledDiscountList(discountList: Discount[]): Discount[];

package/lib/modules/Discount/index.js

@@ -111,7 +111,8 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
       relation_product: 1,
       with: ["extensionData", "customScheduleSnapshot", "holder.detail"],
       order_behavior_count: 1,
-      order_behavior_count_customer_id: customerId || 1
+      order_behavior_count_customer_id: customerId || 1,
+      request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
     });
     const resultDiscountList = this.filterEnabledDiscountList((result == null ? void 0 : result.data) || []) || [];
     return resultDiscountList;

package/lib/modules/Product/index.d.ts

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

package/lib/server/utils/product.js

@@ -1,8 +1,6 @@
-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)
@@ -16,14 +14,6 @@ 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/server/utils/product.ts
@@ -34,7 +24,6 @@ __export(product_exports, {
   getIsSessionProduct: () => getIsSessionProduct
 });
 module.exports = __toCommonJS(product_exports);
-var import_decimal = __toESM(require("decimal.js"));
 var import_utils = require("../modules/schedule/utils");
 var import_utils2 = require("../../modules/Cart/utils");
 function buildPriceIndexMap(priceData) {
@@ -108,9 +97,6 @@ function applyPriceDataToProducts(products, priceData) {
                 const priceBi = groupItemMap.get(bi.id);
                 if (priceBi) {
                   let price = priceBi.price;
-                  if (priceBi.price_type === "markdown") {
-                    price = new import_decimal.default(price || 0).mul(-1).toNumber();
-                  }
                   return {
                     ...bi,
                     price: String(price),

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

@@ -343,7 +343,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
+    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

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

package/lib/solution/ShopDiscount/index.js

@@ -490,7 +490,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         action: "create",
         with_good_pass: 1,
         with_discount_card: 1,
-        with_wallet_pass_holder: 1
+        with_wallet_pass_holder: 1,
+        request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
       }));
       const scanDiscount = (_c = this.getDiscountList()) == null ? void 0 : _c.filter(
         (item) => item.isScan

package/package.json

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