@pisell/pisellos 2.2.243 → 2.2.244

package/lib/modules/Cart/utils/changePrice.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,6 +16,14 @@ 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/modules/Cart/utils/changePrice.ts
@@ -22,7 +32,7 @@ __export(changePrice_exports, {
   updateAllCartItemPrice: () => updateAllCartItemPrice
 });
 module.exports = __toCommonJS(changePrice_exports);
-var import_utils = require("../../Order/utils");
+var import_decimal = __toESM(require("decimal.js"));
 async function updateAllCartItemPrice(cartItems, priceData, getProduct, updateCart, updateItemInitInfo) {
   var _a, _b;
   for (const item of cartItems) {
@@ -47,20 +57,18 @@ async function updateAllCartItemPrice(cartItems, priceData, getProduct, updateCa
         const targetBundleItem = targetBundle.bundle_item.find(
           (m) => m.id === n.id
         );
+        if (targetBundleItem.price_type === "markdown") {
+          targetBundleItem.price = new import_decimal.default(targetBundleItem.price || 0).mul(-1).toNumber();
+        }
+        if (n.option) {
+          targetBundleItem.price = new import_decimal.default(targetBundleItem.price || 0).add(n.option.reduce((pre, cur) => {
+            return pre + new import_decimal.default(cur.price || 0).mul(cur.num || 1).toNumber();
+          }, 0)).toNumber();
+        }
         if (targetBundleItem) {
-          const normalizedBundle = {
-            ...n,
-            price: targetBundleItem.price,
-            custom_price: targetBundleItem.price,
-            price_type: targetBundleItem.price_type,
-            price_type_ext: targetBundleItem.price_type_ext
-          };
-          const bundleSellingPrice = (0, import_utils.getBundleSellingMagnitude)(normalizedBundle).toFixed(2);
           return {
             ...n,
-            custom_price: targetBundleItem.price,
-            price: targetBundleItem.price_type === "markdown" ? bundleSellingPrice : targetBundleItem.price,
-            bundle_selling_price: bundleSellingPrice,
+            price: targetBundleItem.price,
             base_price: targetBundleItem.base_price
           };
         }

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

@@ -7,25 +7,11 @@ export declare class CustomerModule extends BaseModule implements Module, Custom
     private store;
     private request;
     private cacheId;
-    /**
-     * 判断两份选中客户的核心展示字段是否一致，用于避免重复 clone / emit。
-     *
-     * @example
-     * this.isSameSelectedCustomer(currentCustomer, nextCustomer);
-     */
-    private isSameSelectedCustomer;
     private openCache;
     private fatherModule;
     private otherParams;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
-    /**
-     * 更新父级解决方案透传的运行态参数，并刷新客户模块缓存配置。
-     *
-     * @example
-     * customerModule.updateOtherParams({ isFranchisee: true, cacheId: 'cache-2' });
-     */
-    updateOtherParams(params: Record<string, any>): void;
     /**
      * 获取客户列表数据（内部方法）
      * @param params 查询参数
@@ -38,12 +24,6 @@ export declare class CustomerModule extends BaseModule implements Module, Custom
      * @param operation 操作名称
      */
     private handleCustomerListError;
-    /**
-     * 查询客户列表但不写入 customerList / pagination 状态。
-     *
-     * 用于按 ID 补齐客户等内部查询，避免把临时的 num/searchParams 污染到滚动列表。
-     */
-    queryCustomerList(params?: ShopGetCustomerListParams): Promise<ICustomerListResponse>;
     /**
      * 获取客户列表
      * @param params 查询参数

package/lib/modules/Customer/index.js

@@ -48,29 +48,6 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
     this.openCache = false;
     this.otherParams = {};
   }
-  /**
-   * 判断两份选中客户的核心展示字段是否一致，用于避免重复 clone / emit。
-   *
-   * @example
-   * this.isSameSelectedCustomer(currentCustomer, nextCustomer);
-   */
-  isSameSelectedCustomer(current, next) {
-    const normalizedNext = !next ? import_constants.DEFAULT_CUSTOMER : next;
-    const normalizedCurrent = current || null;
-    if (!normalizedCurrent)
-      return false;
-    if (String((normalizedCurrent == null ? void 0 : normalizedCurrent.id) ?? "") === "1" && String((normalizedNext == null ? void 0 : normalizedNext.id) ?? "") === "1") {
-      return true;
-    }
-    const keys = [
-      "id",
-      "name",
-      "phone",
-      "email",
-      "country_calling_code"
-    ];
-    return keys.every((key) => String((normalizedCurrent == null ? void 0 : normalizedCurrent[key]) ?? "") === String((normalizedNext == null ? void 0 : normalizedNext[key]) ?? ""));
-  }
   async initialize(core, options) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     this.core = core;
@@ -98,7 +75,7 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
     } else {
       this.store.currentPage = 1;
     }
-    if (typeof ((_e = options == null ? void 0 : options.initialState) == null ? void 0 : _e.pageSize) === "number" && options.initialState.pageSize > 1) {
+    if (typeof ((_e = options == null ? void 0 : options.initialState) == null ? void 0 : _e.pageSize) === "number") {
       this.store.pageSize = options.initialState.pageSize;
     } else {
       this.store.pageSize = import_constants.DEFAULT_PAGE_SIZE;
@@ -114,18 +91,6 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
       this.fatherModule = options.otherParams.fatherModule;
     }
   }
-  /**
-   * 更新父级解决方案透传的运行态参数，并刷新客户模块缓存配置。
-   *
-   * @example
-   * customerModule.updateOtherParams({ isFranchisee: true, cacheId: 'cache-2' });
-   */
-  updateOtherParams(params) {
-    this.otherParams = params || {};
-    this.openCache = this.otherParams.openCache ?? false;
-    this.cacheId = this.otherParams.cacheId;
-    this.fatherModule = this.otherParams.fatherModule;
-  }
   /**
    * 获取客户列表数据（内部方法）
    * @param params 查询参数
@@ -187,20 +152,6 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
       this.store.error
     );
   }
-  /**
-   * 查询客户列表但不写入 customerList / pagination 状态。
-   *
-   * 用于按 ID 补齐客户等内部查询，避免把临时的 num/searchParams 污染到滚动列表。
-   */
-  async queryCustomerList(params = {}) {
-    const { customerList, total, page, pageSize } = await this.fetchCustomerListData(params);
-    return {
-      list: customerList,
-      total,
-      page,
-      pageSize
-    };
-  }
   /**
    * 获取客户列表
    * @param params 查询参数
@@ -218,6 +169,10 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
       this.store.total = total;
       this.store.hasMore = page * pageSize < total;
       this.store.customerList = (0, import_lodash_es.cloneDeep)(customerList);
+      await this.core.effects.emit(
+        `${this.name}:onCustomerListUpdate`,
+        this.store
+      );
       this.triggerPaginationChange({
         page,
         pageSize,
@@ -237,10 +192,6 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
     } finally {
       this.store.loading = false;
       this.storeChange();
-      await this.core.effects.emit(
-        `${this.name}:onCustomerListUpdate`,
-        this.store
-      );
     }
   }
   /**
@@ -260,9 +211,6 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
    * @param customer 选择的客户
    */
   setSelectedCustomer(customer) {
-    if (this.isSameSelectedCustomer(this.store.selectedCustomer, customer)) {
-      return;
-    }
     this.store.selectedCustomer = !customer ? import_constants.DEFAULT_CUSTOMER : (0, import_lodash_es.cloneDeep)(customer);
     this.core.effects.emit(
       `${this.name}:onCustomerSelected`,
@@ -404,13 +352,12 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
     try {
       this.store.loadingMore = true;
       this.store.error = null;
-      const loadMoreParams = {
+      const { customerList: newCustomers, total, page, pageSize } = await this.fetchCustomerListData({
         skip: nextPage,
         num: this.store.pageSize,
         ...this.store.searchParams
         // 使用存储的搜索条件
-      };
-      const { customerList: newCustomers, total, page, pageSize } = await this.fetchCustomerListData(loadMoreParams);
+      });
       const updatedCustomerList = [...this.store.customerList, ...(0, import_lodash_es.cloneDeep)(newCustomers)];
       this.store.customerList = updatedCustomerList;
       this.store.currentPage = page;
@@ -425,6 +372,10 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
           hasMore: this.store.hasMore
         }
       );
+      await this.core.effects.emit(
+        `${this.name}:onCustomerListUpdate`,
+        this.store
+      );
       this.triggerPaginationChange({
         page,
         pageSize,
@@ -445,10 +396,6 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
     } finally {
       this.store.loadingMore = false;
       this.storeChange();
-      await this.core.effects.emit(
-        `${this.name}:onCustomerListUpdate`,
-        this.store
-      );
     }
   }
   /**

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

@@ -110,8 +110,6 @@ export interface CustomerState {
 export interface CustomerModuleAPI {
     /** 获取客户列表 */
     getCustomerList: (params?: ShopGetCustomerListParams) => Promise<ICustomerListResponse>;
-    /** 查询客户列表但不更新列表分页状态 */
-    queryCustomerList: (params?: ShopGetCustomerListParams) => Promise<ICustomerListResponse>;
     /** 设置客户列表 */
     setCustomerList: (customers: ShopCustomer[], total?: number) => void;
     /** 设置当前选择的客户 */

package/lib/modules/Discount/index.js

@@ -97,12 +97,8 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
       `/order/prepare/config`,
       params
     );
-    const rawDiscountList = [
-      ...((_a = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _a.good_pass_list) || [],
-      ...((_b = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _b.discount_card_list) || []
-    ];
     const goodPassList = this.filterEnabledDiscountList(
-      rawDiscountList
+      [...((_a = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _a.good_pass_list) || [], ...((_b = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _b.discount_card_list) || []]
     ) || [];
     return goodPassList;
   }

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

@@ -140,7 +140,6 @@ export interface Discount {
     appliedProductDetails: ApplicableProductDetails[];
     isDisabledForProductUsed?: boolean;
     amount?: number;
-    customer_id?: number | string | null;
     extension_data?: ExtensionData[];
     total_order_behavior_count?: number;
     today_order_behavior_count?: number;

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

@@ -9,7 +9,6 @@ export declare class OpenDataModule extends BaseModule implements Module {
     protected defaultVersion: string;
     private request;
     private window;
-    private appPlugin;
     private store;
     private cacheId;
     private openCache;
@@ -17,13 +16,6 @@ export declare class OpenDataModule extends BaseModule implements Module {
     private otherParams;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
-    /**
-     * 更新父级解决方案透传的运行态参数，并刷新 OpenData 缓存配置。
-     *
-     * @example
-     * openDataModule.updateOtherParams({ openCache: true, cacheId: 'cache-2' })
-     */
-    updateOtherParams(params: Record<string, any>): void;
     fetchOpenData(params: OpenDataFetchParams): Promise<OpenDataConfig>;
     getOpenData(): OpenDataConfig | null;
     getLastFetchedAt(): number | null;

package/lib/modules/OpenData/index.js

@@ -52,32 +52,18 @@ var OpenDataModule = class extends import_BaseModule.BaseModule {
     }
     this.request = core.getPlugin("request");
     this.window = core.getPlugin("window");
-    this.appPlugin = core.getPlugin("app");
     if (!this.request)
       throw new Error("OpenDataModule 需要 request 插件支持");
     if (!this.window)
       throw new Error("OpenDataModule 需要 window 插件支持");
     console.log("[OpenDataModule] 初始化完成");
   }
-  /**
-   * 更新父级解决方案透传的运行态参数，并刷新 OpenData 缓存配置。
-   *
-   * @example
-   * openDataModule.updateOtherParams({ openCache: true, cacheId: 'cache-2' })
-   */
-  updateOtherParams(params) {
-    this.otherParams = params || {};
-    this.openCache = this.otherParams.openCache ?? false;
-    this.cacheId = this.otherParams.cacheId;
-    this.fatherModule = this.otherParams.fatherModule;
-  }
   async fetchOpenData(params) {
-    var _a, _b;
-    const getData = (_b = (_a = this.appPlugin).getData) == null ? void 0 : _b.call(_a);
-    const shopId = getData == null ? void 0 : getData("shop_id");
+    var _a, _b, _c, _d;
+    const shopId = (_b = (_a = this.otherParams) == null ? void 0 : _a.getStateData) == null ? void 0 : _b.call(_a, "shop_id");
     if (!shopId)
       throw new Error("[OpenDataModule] 无法获取 shop_id");
-    const tenantId = getData == null ? void 0 : getData("tenant_id");
+    const tenantId = (_d = (_c = this.otherParams) == null ? void 0 : _c.getStateData) == null ? void 0 : _d.call(_c, "tenant_id");
     const headers = {};
     if (tenantId)
       headers["Tenant-Id"] = String(tenantId);
@@ -88,7 +74,7 @@ var OpenDataModule = class extends import_BaseModule.BaseModule {
         target: params.target,
         section_code: params.section_code
       },
-      { pisell2: true, isPisell2: true, prefix: false, headers }
+      { pisell2: true, headers }
     );
     if ((response == null ? void 0 : response.status) === false) {
       throw new Error((response == null ? void 0 : response.message) || "获取 OpenData 配置失败");
@@ -106,7 +92,7 @@ var OpenDataModule = class extends import_BaseModule.BaseModule {
   }
   checkAvailability(scheduleModule) {
     var _a;
-    const scheduleList = scheduleModule ? scheduleModule == null ? void 0 : scheduleModule.getScheduleListByIds(
+    const scheduleList = scheduleModule ? scheduleModule.getScheduleListByIds(
       ((_a = this.store.data) == null ? void 0 : _a["availability.operating_hours"]) || []
     ) : void 0;
     return (0, import_utils.computeAvailability)({