@pisell/pisellos 2.2.10 → 2.2.11

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

@@ -44,7 +44,6 @@ type ProductDetail = {
     quantity: number;
     vouchersApplicable?: boolean;
     holder_id?: number;
-    startDate?: any;
 };
 export interface RulesParamsHooks {
     getProduct: (product: Record<string, any>) => ProductDetail;
@@ -55,10 +54,8 @@ export interface RulesParamsHooks {
         origin_total?: number;
         price?: string | number;
         variant?: any[];
-        original_price?: number | string;
+        original_price?: number;
         quantity?: number;
-        bundle?: any[];
-        main_product_selling_price?: string | number;
     }) => Record<string, any>;
 }
 export {};

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

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

package/lib/solution/BookingByStep/index.js

@@ -185,19 +185,13 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     collection = [],
     schedule_date
   }) {
-    const res = await this.store.products.loadProducts({
+    return this.store.products.loadProducts({
       category_ids,
       product_ids,
       collection,
       schedule_date,
       cacheId: this.cacheId
     });
-    this.getAvailableDate({
-      startDate: schedule_date || (0, import_dayjs.default)().format("YYYY-MM-DD"),
-      endDate: schedule_date || (0, import_dayjs.default)().format("YYYY-MM-DD"),
-      products: [...res]
-    });
-    return res;
   }
   /**
    * 通过 schedule 来读取商品，适用于 session 类商品
@@ -234,12 +228,11 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const allProductIds = [...newProductIds, ...otherProductsIds].filter(
       (n, index, self) => self.indexOf(n) === index
     );
-    const res = await this.loadProducts({
+    return await this.loadProducts({
       product_ids: allProductIds,
       category_ids,
       schedule_date: date
     });
-    return res;
   }
   /**
    * 更新完商品数据、切换日期、或者在较后的流程里登录了，检测当前购物车里是否有商品，如果有，则需要更新购物车里的商品价格
@@ -606,12 +599,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       quantity = 1
     } = product || {};
     const productData = { ...origin, product_variant_id };
-    debugger;
-    if ((0, import_products.isSessionProduct)(productData)) {
-      if (!date || !date.startTime || !date.endTime) {
-        return { success: false, errorCode: "date_or_time_required" };
-      }
-    }
     const currentCartItems = this.store.cart.getItems();
     const stockCheckResult = (0, import_stock.checkProductStock)({
       productData,
@@ -1619,10 +1606,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         }
       });
     });
-    this.core.effects.emit(
-      `${this.store.cart.name}:onUpdateBookingDate`,
-      {}
-    );
   }
   getScheduleDataByIds(scheduleIds) {
     const targetSchedules = this.store.schedule.getScheduleListByIds(scheduleIds);

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

@@ -9,9 +9,3 @@ export declare const getAvailableProductResources: (products: ProductData[]) =>
     rules: any[];
     resourcesMap: Record<number, ProductResourceItem>;
 };
-/**
- * 判断商品是否是 session 商品
- * @param product 商品数据
- * @returns 是否是 session 商品
- */
-export declare const isSessionProduct: (product: ProductData) => boolean;

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

@@ -19,8 +19,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/solution/BookingByStep/utils/products.ts
 var products_exports = {};
 __export(products_exports, {
-  getAvailableProductResources: () => getAvailableProductResources,
-  isSessionProduct: () => isSessionProduct
+  getAvailableProductResources: () => getAvailableProductResources
 });
 module.exports = __toCommonJS(products_exports);
 var getAvailableProductResources = (products) => {
@@ -58,12 +57,7 @@ var getAvailableProductResources = (products) => {
   });
   return { resourceIds: [...new Set(resourceIds)], rules, resourcesMap };
 };
-var isSessionProduct = (product) => {
-  var _a;
-  return (((_a = product == null ? void 0 : product["schedule.ids"]) == null ? void 0 : _a.length) ?? 0) > 0;
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getAvailableProductResources,
-  isSessionProduct
+  getAvailableProductResources
 });

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/Checkout/index.js

@@ -216,70 +216,23 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         return pre + (item.amount || 0);
       }, 0);
     };
-    const formatProduct = (items) => {
-      return items.map(
-        (item) => ({
-          product_id: item.product_id,
-          product_variant_id: item.product_variant_id,
-          quantity: item.num,
-          // 商品是否含税：1；0
-          is_charge_tax: item.is_charge_tax ?? 0,
-          // 若商品不含税，计算得到的税费，单位（元）
-          tax_fee: item.tax_fee,
-          // 整个商品折扣后的总金额
-          selling_price: item.calculated_selling_price,
-          // 使用者id
-          holder_id: item.holder_id,
-          // 整个商品折扣前的总金额
-          original_price: item.calculated_original_price,
-          // 主商品折扣前金额，不包含套餐子商品
-          main_product_original_price: item.price,
-          // 主商品折扣后金额，不包含套餐子商品
-          main_product_selling_price: item.main_product_selling_price,
-          metadata: {
-            // 主商品+非原价(加减价)子商品税费
-            "main_product_attached_bundle_tax_fee": item.metadata.main_product_attached_bundle_tax_fee,
-            // 主商品+非原价(加减价)子商品附加费
-            "main_product_attached_bundle_surcharge_fee": item.metadata.main_product_attached_bundle_surcharge_fee,
-            // 可选，附加费均摊舍入金额
-            "surcharge_rounding_remainder": item.metadata.surcharge_rounding_remainder
-          },
-          product_bundle: item.product_bundle.map((bundle) => {
-            return {
-              bundle_id: bundle.bundle_id,
-              bundle_product_id: bundle.bundle_product_id,
-              bundle_variant_id: bundle.bundle_variant_id,
-              price_type: bundle.price_type,
-              price_type_ext: bundle.price_type_ext,
-              // 套餐子商品总价，不包含折扣金额
-              bundle_sum_price: bundle.bundle_sum_price,
-              // 套餐子商品折扣后金额
-              bundle_selling_price: bundle.bundle_selling_price,
-              num: bundle.num,
-              is_charge_tax: bundle.is_charge_tax,
-              tax_fee: bundle.tax_fee,
-              metadata: {
-                // 子商品单数量附加费
-                "surcharge_fee": bundle.metadata.surcharge_fee,
-                // 可选，附加费均摊舍入金额
-                "surcharge_rounding_remainder": bundle.metadata.surcharge_rounding_remainder
-              }
-            };
-          })
-        })
-      ) || [];
-    };
-    const productList = formatProduct(
-      ((_c = (_b = (_a = this.store.currentOrder.order_info) == null ? void 0 : _a.original_order_data) == null ? void 0 : _b.bookings) == null ? void 0 : _c.map(
-        (item) => {
-          return {
-            ...item.product,
-            holder_id: this.getHolderIdFromBooking(item)
-          };
-        }
-      )) || []
-    );
-    const relationProducts = formatProduct(((_e = (_d = this.store.currentOrder.order_info) == null ? void 0 : _d.original_order_data) == null ? void 0 : _e.relation_products) || []);
+    const productList = ((_b = (_a = this.store.currentOrder.order_info) == null ? void 0 : _a.original_order_data.bookings) == null ? void 0 : _b.map(
+      (item) => ({
+        product_id: item.product.product_id,
+        product_variant_id: item.product.product_variant_id,
+        quantity: item.product.num,
+        selling_price: item.product.calculated_selling_price,
+        holder_id: this.getHolderIdFromBooking(item)
+      })
+    )) || [];
+    const relationProducts = ((_e = (_d = (_c = this.store.currentOrder.order_info) == null ? void 0 : _c.original_order_data) == null ? void 0 : _d.relation_products) == null ? void 0 : _e.map(
+      (item) => ({
+        product_id: item.product_id,
+        product_variant_id: item.product_variant_id,
+        quantity: item.num,
+        selling_price: item.source_product_price
+      })
+    )) || [];
     return [...productList, ...relationProducts];
   }
   async initWalletData(params) {
@@ -304,8 +257,6 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         isDeposit: (_h = this.store.currentOrder) == null ? void 0 : _h.is_deposit
       },
       products: this.getProductListByOrder(),
-      is_price_include_tax: this.otherParams.is_price_include_tax,
-      // core 有
       ...params
     };
     if (this.store.isOrderSynced) {
@@ -502,7 +453,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
    * 会覆盖 order_info 与金额等字段，并重新计算待付金额，最后设置为 currentOrder。
    */
   async updateLocalOrderAsync(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
     this.logInfo("updateLocalOrderAsync called", {
       orderId: params.orderId,
       orderDataType: (_a = params.orderData) == null ? void 0 : _a.type,
@@ -709,7 +660,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       }
     });
     this.store.currentOrder = created;
-    if (params.existPayment && params.existPayment.length > 0) {
+    if (params.existPayment && params.existPayment.length > 0 || ((_p = this.store.currentOrder) == null ? void 0 : _p.order_id) && !(0, import_utils.isVirtualOrderId)((_q = this.store.currentOrder) == null ? void 0 : _q.order_id)) {
       this.store.isOrderSynced = true;
       const syncedPayments = created.payment.filter((p) => p.isSynced && p.status !== "voided");
       const syncedAmount = syncedPayments.reduce((sum, p) => {

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

@@ -18,8 +18,6 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     private initializePlugins;
     private registerDependentModules;
     private registerEventListeners;
-    getCurrentBookingTime(): string | null;
-    private filterDiscountListByBookingTime;
     setCustomer(customer: Customer): Promise<void>;
     setHolders(holders: {
         form_record_id: number;

package/lib/solution/ShopDiscount/index.js

@@ -36,7 +36,6 @@ module.exports = __toCommonJS(ShopDiscount_exports);
 var import_BaseModule = require("../../modules/BaseModule");
 var import_Discount = require("../../modules/Discount");
 var import_Rules = require("../../modules/Rules");
-var import_utils = require("./utils");
 var import_decimal = __toESM(require("decimal.js"));
 var import_lodash_es = require("lodash-es");
 var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
@@ -52,8 +51,6 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       discount: null,
       rules: null,
       originalDiscountList: [],
-      currentBookingTime: "",
-      filteredDiscountList: [],
       holders: []
     };
   }
@@ -143,44 +140,6 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     );
   }
   // =========== 公共 API ===========
-  // 设置预约时间
-  // public async setBookingTime(bookingTime: string | null): Promise<void> {
-  //   if (this.store.currentBookingTime !== bookingTime) {
-  //     this.store.currentBookingTime = bookingTime;
-  //
-  //     // 更新过滤后的优惠券列表
-  //     await this.updateFilteredDiscountList();
-  //   }
-  // }
-  // 获取当前预约时间
-  getCurrentBookingTime() {
-    return this.store.currentBookingTime;
-  }
-  // 根据预约时间过滤优惠券列表
-  filterDiscountListByBookingTime(discountList, bookingTime) {
-    if ((0, import_utils.isAllNormalProduct)(this.store.productList || [])) {
-      return discountList;
-    }
-    return (0, import_utils.filterDiscountListByBookingTime)(discountList, bookingTime);
-  }
-  // 更新过滤后的优惠券列表
-  // private async updateFilteredDiscountList(): Promise<void> {
-  //   const originalList = this.store.originalDiscountList;
-  //   const filteredList = this.filterDiscountListByBookingTime(originalList, this.store.currentBookingTime);
-  //
-  //   this.store.filteredDiscountList = filteredList;
-  //
-  //   // 更新 DiscountModule 中的优惠券列表
-  //   this.setDiscountList(filteredList);
-  //
-  //   if (this.store.productList?.length) {
-  //     const result = this.calcDiscount(this.store.productList);
-  //     await this.core.effects.emit(
-  //       ShopDiscountHooks.onLoadPrepareCalcResult,
-  //       result,
-  //     );
-  //   }
-  // }
   // 设置客户
   async setCustomer(customer) {
     var _a;
@@ -372,7 +331,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
               editModeDiscountList[index] = {
                 ...editModeDiscountList[index],
                 amount: new import_decimal.default(discount.amount || 0).plus(new import_decimal.default(editModeDiscountList[index].amount || 0)).toNumber(),
-                savedAmount: new import_decimal.default(discount.amount || 0).times((product == null ? void 0 : product.quantity) || (product == null ? void 0 : product.num) || 1).plus(new import_decimal.default(editModeDiscountList[index].savedAmount || 0)).toNumber()
+                savedAmount: new import_decimal.default(discount.amount || 0).times((product == null ? void 0 : product.num) || 1).plus(new import_decimal.default(editModeDiscountList[index].savedAmount || 0)).toNumber()
               };
             } else {
               if (discount.type && !discount.tag) {
@@ -383,7 +342,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
                 name: discount.name || discount.discount.title.auto,
                 isEditMode: true,
                 limited_relation_product_data: {},
-                savedAmount: discount.amount * ((product == null ? void 0 : product.quantity) || (product == null ? void 0 : product.num) || 1),
+                savedAmount: discount.amount * ((product == null ? void 0 : product.num) || 1),
                 isAvailable: true,
                 id: ((_a3 = discount.discount) == null ? void 0 : _a3.resource_id) || discount.id,
                 format_title: ((_b = discount.discount) == null ? void 0 : _b.title) || discount.format_title,
@@ -403,17 +362,15 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     const isProductFree = (id) => {
       var _a2;
       const targetProduct = productList.find((n) => n.id === id);
-      if (!targetProduct)
-        return false;
       const product = (_a2 = this.hooks) == null ? void 0 : _a2.getProduct(targetProduct);
       return Number(product == null ? void 0 : product.total) <= 0 && (Number(product == null ? void 0 : product.origin_total) <= 0 || !(product == null ? void 0 : product.origin_total)) || (0, import_lodash_es.isBoolean)(product == null ? void 0 : product.vouchersApplicable) && !(product == null ? void 0 : product.vouchersApplicable);
     };
-    const allUsedProductIds = newDiscountList.filter((item) => !(item == null ? void 0 : item.isEditMode)).map((n) => {
+    const allUsedProductIds = newDiscountList.map((n) => {
       var _a2;
-      return n.isSelected ? ((_a2 = n.appliedProductDetails) == null ? void 0 : _a2.map((n2) => {
+      return n.isSelected ? (_a2 = n.appliedProductDetails) == null ? void 0 : _a2.map((n2) => {
         var _a3;
         return (_a3 = n2.discount) == null ? void 0 : _a3.product_id;
-      })) || n.product_id : [];
+      }) : [];
     }).flat();
     newDiscountList.forEach((item) => {
       var _a2;
@@ -475,7 +432,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   }
   // 加载准备配置
   async loadPrepareConfig(params) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d;
     try {
       const customerId = params.customerId || ((_a = this.getCustomer()) == null ? void 0 : _a.id);
       const goodPassList = await ((_b = this.store.discount) == null ? void 0 : _b.loadPrepareConfig({
@@ -492,11 +449,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       const newGoodPassList = goodPassList == null ? void 0 : goodPassList.filter((n) => !scanDiscountIds.includes(n.id));
       const newDiscountList = [...scanDiscount, ...newGoodPassList || []];
       this.store.originalDiscountList = newDiscountList;
-      await ((_d = this.store.discount) == null ? void 0 : _d.setOriginalDiscountList(newDiscountList));
-      const filteredDiscountList = this.filterDiscountListByBookingTime(newDiscountList, this.store.currentBookingTime);
-      this.store.filteredDiscountList = filteredDiscountList;
-      this.setDiscountList(filteredDiscountList || []);
-      if ((_e = this.store.productList) == null ? void 0 : _e.length) {
+      this.setDiscountList(newDiscountList || []);
+      if ((_d = this.store.productList) == null ? void 0 : _d.length) {
         const result = this.calcDiscount(this.store.productList);
         await this.core.effects.emit(
           `${this.name}:onLoadPrepareCalcResult`,
@@ -505,7 +459,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       }
       await this.core.effects.emit(
         `${this.name}:onLoadDiscountList`,
-        filteredDiscountList
+        newDiscountList
       );
     } catch (error) {
       console.error("[ShopDiscount] 加载准备配置出错:", error);

package/lib/solution/ShopDiscount/types.d.ts

@@ -1,6 +1,5 @@
-import { DiscountModule } from '../../modules/Discount';
+import { DiscountModule, Discount } from '../../modules/Discount';
 import { RulesModule } from '../../modules/Rules';
-import { Discount } from "../../modules/Discount/types";
 export declare enum ShopDiscountHooks {
     onInited = "shopDiscount:onInited",
     onDestroy = "shopDiscount:onDestroy",
@@ -29,8 +28,6 @@ export interface ShopDiscountState {
         form_id?: number;
         main_field?: string;
     }[];
-    currentBookingTime: string | null;
-    filteredDiscountList: Discount[];
 }
 export interface SetDiscountSelectedParams {
     discountId: number;

package/lib/solution/ShopDiscount/utils.d.ts

@@ -1,7 +1,5 @@
 import { Discount } from "../../modules/Discount/types";
 export declare const uniqueById: <T>(arr: T[], key?: string) => T[];
-export declare const isNormalProductByDurationSchedule: (item: any) => boolean;
-export declare const isAllNormalProduct: (items: any[]) => boolean;
 /**
  * 获取折扣金额 基于折扣卡类型计算
  * 商品券：直接返回商品价格
@@ -12,56 +10,3 @@ export declare const isAllNormalProduct: (items: any[]) => boolean;
  * @returns
  */
 export declare const getDiscountAmount: (discount: Discount, total: number, price: number) => number;
-export declare const getDiscountListAmountTotal: (discount: Discount[]) => any;
-/**
- * 获取折扣金额 计算每个折扣的金额
- * @param discount
- * @returns
- */
-export declare const getDiscountListAmount: (discount: Discount[]) => any;
-export interface ScheduleItem {
-    id: number;
-    name: string | {
-        [key: string]: string;
-    };
-    type: 'standard' | 'time-slots' | 'designation';
-    start_time: string | null;
-    end_time: string | null;
-    repeat_type: 'none' | 'daily' | 'weekly';
-    repeat_rule: {
-        end: {
-            type: 'never' | 'date' | 'occurrence';
-            end_date: string | null;
-            occurrence: number | null;
-        };
-        frequency: number;
-        excluded_date: Array<{
-            start: string;
-            end: string;
-        }>;
-        included_date: Array<{
-            start: string;
-            end: string;
-        }>;
-        frequency_date: number[];
-    } | null;
-    designation: Array<{
-        start_date: string;
-        start_time: string;
-        end_date: string;
-        end_time: string;
-    }> | null;
-    is_all: number;
-    time_slot: Array<{
-        start_time: string;
-        end_time: string;
-    }>;
-}
-export declare const getDateIsInSchedule: (dateTime: string, scheduleList: ScheduleItem[]) => boolean;
-/**
- * 根据预约时间过滤优惠券列表
- * @param discountList 优惠券列表
- * @param bookingTime 预约时间 (格式: YYYY-MM-DD HH:mm:ss)
- * @returns 过滤后的优惠券列表
- */
-export declare const filterDiscountListByBookingTime: (discountList: Discount[], bookingTime: string | null) => Discount[];