@pisell/pisellos 2.1.85 → 2.1.87

package/lib/modules/Summary/utils.js

@@ -31,7 +31,6 @@ var utils_exports = {};
 __export(utils_exports, {
   calcDiscountListDifference: () => calcDiscountListDifference,
   calculateDeposit: () => calculateDeposit,
-  calculateOriginSubtotal: () => calculateOriginSubtotal,
   calculatePriceDetails: () => calculatePriceDetails,
   calculateSubtotal: () => calculateSubtotal,
   calculateTaxFee: () => calculateTaxFee,
@@ -43,11 +42,12 @@ __export(utils_exports, {
 });
 module.exports = __toCommonJS(utils_exports);
 var import_decimal = __toESM(require("decimal.js"));
-var calculatePriceDetails = (shopInfo, items, isInScheduleByDate, surchargeList) => {
+var import_utils = require("../Product/utils");
+var import_dayjs = __toESM(require("dayjs"));
+var calculatePriceDetails = (shopInfo, items, isInScheduleByDate, surchargeList, scheduleById) => {
   const subtotal = new import_decimal.default(calculateSubtotal(items));
-  const subOriginTotal = new import_decimal.default(calculateOriginSubtotal(items));
   const totalTaxFee = new import_decimal.default(calculateTaxFee(shopInfo, items));
-  const surcharge = getSurcharge({ service: items, addons: [], bookingDetail: null, bookingId: void 0 }, { isEdit: false, isInScheduleByDate, surcharge_list: surchargeList, scheduleById: {} });
+  const surcharge = getSurcharge({ service: items, addons: [], bookingDetail: null, bookingId: void 0 }, { isEdit: false, isInScheduleByDate, surcharge_list: surchargeList, scheduleById });
   const surchargeAmount = new import_decimal.default(getSurchargeAmount({ bookingDetail: null, bookingId: void 0 }, surcharge, { isEdit: false }));
   const { tax, originTax } = getTax({ service: items, bookingDetail: null, bookingId: void 0 }, {
     computed: {
@@ -59,12 +59,10 @@ var calculatePriceDetails = (shopInfo, items, isInScheduleByDate, surchargeList)
     is_price_include_tax: shopInfo == null ? void 0 : shopInfo.is_price_include_tax
   });
   const total = (shopInfo == null ? void 0 : shopInfo.is_price_include_tax) ? subtotal.plus(surchargeAmount) : subtotal.plus(tax).plus(surchargeAmount);
-  const originTotal = (shopInfo == null ? void 0 : shopInfo.is_price_include_tax) ? subOriginTotal : subOriginTotal.plus(totalTaxFee);
   const deposit = calculateDeposit(items);
   return {
     subtotal: subtotal.toFixed(2),
     total: total.toFixed(2),
-    originTotal: originTotal.toFixed(2),
     taxTitle: shopInfo == null ? void 0 : shopInfo.tax_title,
     taxRate: shopInfo == null ? void 0 : shopInfo.tax_rate,
     totalTaxFee: tax,
@@ -362,16 +360,6 @@ var calculateSubtotal = (items) => {
   }, new import_decimal.default(0));
   return subtotal.toFixed(2);
 };
-var calculateOriginSubtotal = (items) => {
-  if (!(items == null ? void 0 : items.length)) {
-    return "0.00";
-  }
-  const subtotal = items.reduce((sum, item) => {
-    const cartItemTotalPrice = new import_decimal.default(item.summaryOriginTotal || 0);
-    return sum.plus(cartItemTotalPrice);
-  }, new import_decimal.default(0));
-  return subtotal.toFixed(2);
-};
 var calculateTaxFee = (shopInfo, items) => {
   if (!(items == null ? void 0 : items.length)) {
     return "0.00";
@@ -456,9 +444,7 @@ var getMainProductTotal = (item) => {
   }
   for (let bundleItem of (item == null ? void 0 : item.bundle) || []) {
     if (getBundleItemIsMarkupOrDiscountPrice(bundleItem)) {
-      const discountAmount = getDiscountAmount(bundleItem.discount_list);
-      const bundleItemPrice = new import_decimal.default(bundleItem.bundle_selling_price ?? bundleItem.price ?? 0);
-      const bundleItemTotal = bundleItemPrice.minus(discountAmount);
+      const bundleItemTotal = new import_decimal.default(bundleItem.bundle_selling_price ?? bundleItem.price ?? 0);
       total = total.add(bundleItemTotal);
     }
   }
@@ -522,8 +508,17 @@ var isProductMatchSurchargeCondition = (item, options) => {
   return isProductMatch && isScheduleMatch;
 };
 var getSurcharge = ({ service, addons, bookingDetail, bookingId }, options) => {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   const { isEdit, isInScheduleByDate, surcharge_list, scheduleById } = options;
+  const firstAppointmentCartItem = (_a = service.filter(
+    (n) => !(0, import_utils.isNormalProduct)(n._productOrigin)
+  )) == null ? void 0 : _a[0];
+  let startDate = "";
+  if (firstAppointmentCartItem) {
+    startDate = firstAppointmentCartItem.start_date + " " + firstAppointmentCartItem.start_time + ":00";
+  } else {
+    startDate = (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss");
+  }
   if (!isEdit && bookingId) {
     if (Array.isArray(bookingDetail == null ? void 0 : bookingDetail.surcharge)) {
       return ((bookingDetail == null ? void 0 : bookingDetail.surcharge) || []).filter((d) => Number(d.amount) > 0).map(
@@ -570,7 +565,7 @@ var getSurcharge = ({ service, addons, bookingDetail, bookingId }, options) => {
         if (isProductMatchSurchargeCondition(
           {
             isCustomItem: item.isCustomItem,
-            startDate: (item == null ? void 0 : item.startDate) || "",
+            startDate,
             product_id: item.id
           },
           {
@@ -602,7 +597,7 @@ var getSurcharge = ({ service, addons, bookingDetail, bookingId }, options) => {
           if (getBundleItemIsOriginalPrice(bundleItem) && isProductMatchSurchargeCondition(
             {
               isCustomItem: false,
-              startDate: item.startDate,
+              startDate,
               product_id: bundleItem._bundle_product_id
             },
             {
@@ -628,7 +623,7 @@ var getSurcharge = ({ service, addons, bookingDetail, bookingId }, options) => {
           if (isProductMatchSurchargeCondition(
             {
               isCustomItem: false,
-              startDate: item.startDate,
+              startDate,
               product_id: relationDetail.product_id
             },
             {
@@ -640,7 +635,7 @@ var getSurcharge = ({ service, addons, bookingDetail, bookingId }, options) => {
             matchedItems.push({
               isMain: false,
               total: Number(
-                (relationDetail == null ? void 0 : relationDetail.price) || ((_a = relationDetail == null ? void 0 : relationDetail.metadata) == null ? void 0 : _a.main_product_attached_bundle_selling_price)
+                (relationDetail == null ? void 0 : relationDetail.price) || ((_b = relationDetail == null ? void 0 : relationDetail.metadata) == null ? void 0 : _b.main_product_attached_bundle_selling_price)
               ),
               quantity: relationDetail.num || relationDetail.quantity || 1,
               item: relationDetail,
@@ -653,7 +648,7 @@ var getSurcharge = ({ service, addons, bookingDetail, bookingId }, options) => {
     }
     if (Array.isArray(addons == null ? void 0 : addons.value)) {
       for (let item of addons.value) {
-        if (isProductMatchSurchargeCondition(item, {
+        if (isProductMatchSurchargeCondition({ ...item, startDate }, {
           surchargeConfig,
           scheduleById: scheduleById || {},
           isInScheduleByDate
@@ -714,13 +709,13 @@ var getSurcharge = ({ service, addons, bookingDetail, bookingId }, options) => {
               const surchargeFee = originSurchargeFee.plus(itemSurcharge).plus(fixedSurcharge).toDecimalPlaces(2, import_decimal.default.ROUND_DOWN).toNumber();
               productTotalSurcharge = productTotalSurcharge.plus(new import_decimal.default(surchargeFee).times(itemQuantity).toNumber());
               item.item.surcharge_fee = surchargeFee;
-              item.item.relation_surcharge_ids = [...((_b = item.item) == null ? void 0 : _b.relation_surcharge_ids) || [], id];
+              item.item.relation_surcharge_ids = [...((_c = item.item) == null ? void 0 : _c.relation_surcharge_ids) || [], id];
             } else {
               const originSurchargeFee = new import_decimal.default(item.item.surcharge_fee || 0);
               const surchargeFee = originSurchargeFee.plus(itemSurcharge).plus(fixedSurcharge).toDecimalPlaces(2, import_decimal.default.ROUND_DOWN).toNumber();
               productTotalSurcharge = productTotalSurcharge.plus(new import_decimal.default(surchargeFee).times(itemQuantity).toNumber());
               item.item.surcharge_fee = surchargeFee;
-              item.item.relation_surcharge_ids = [...((_c = item.item) == null ? void 0 : _c.relation_surcharge_ids) || [], id];
+              item.item.relation_surcharge_ids = [...((_d = item.item) == null ? void 0 : _d.relation_surcharge_ids) || [], id];
             }
           }
           if (isLast && configTotal.minus(productTotalSurcharge).gt(0)) {
@@ -790,7 +785,6 @@ function resetItemsSurchargeSideEffects({ service, addons }) {
 0 && (module.exports = {
   calcDiscountListDifference,
   calculateDeposit,
-  calculateOriginSubtotal,
   calculatePriceDetails,
   calculateSubtotal,
   calculateTaxFee,

package/lib/plugins/window.d.ts

@@ -1,4 +1,3 @@
-import { WalletPassEvaluator } from '../model';
 import { Plugin } from '../types';
 /**
  * WindowPlugin 接口定义
@@ -15,7 +14,6 @@ export interface WindowPlugin extends Plugin {
     document: Partial<Document>;
     history: History;
     interaction?: any;
-    getWalletPassEvaluator?: () => WalletPassEvaluator;
 }
 /**
  * 简单的 Storage 接口实现

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

@@ -144,7 +144,6 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     getSummary(): Promise<{
         subtotal: string | number;
         total: string | number;
-        originTotal: string | number;
         taxTitle?: string | undefined;
         totalTaxFee?: string | number | undefined;
         isPriceIncludeTax?: 0 | 1 | undefined;

package/lib/solution/BookingByStep/index.js

@@ -1766,6 +1766,28 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         newResources.forEach((resource) => {
           var _a3, _b2, _c, _d, _e, _f, _g, _h, _i, _j, _k;
           if (((_b2 = (_a3 = item._productOrigin) == null ? void 0 : _a3.duration) == null ? void 0 : _b2.type) === "flexible") {
+            let getEarliestBlockedStartTime = function({
+              currentStartTime: currentStartTime2,
+              times
+            }) {
+              const currentStart = (0, import_dayjs.default)(currentStartTime2);
+              let earliestBlockStart;
+              for (const time of times || []) {
+                for (const event of time.event_list || []) {
+                  const eventStart = (0, import_dayjs.default)(event.start_at);
+                  const eventEnd = (0, import_dayjs.default)(event.end_at);
+                  if (eventStart.isBefore(currentStart) && eventEnd.isAfter(currentStart)) {
+                    return currentStart.format("YYYY-MM-DD HH:mm");
+                  }
+                  if (eventStart.isAfter(currentStart)) {
+                    if (!earliestBlockStart || eventStart.isBefore(earliestBlockStart)) {
+                      earliestBlockStart = eventStart;
+                    }
+                  }
+                }
+              }
+              return earliestBlockStart == null ? void 0 : earliestBlockStart.format("YYYY-MM-DD HH:mm");
+            };
             item.duration = {
               type: "minutes",
               value: 10
@@ -1780,13 +1802,22 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
               },
               targetResourceTimes[0]
             );
+            const earliestBlockedStartTime = getEarliestBlockedStartTime({
+              currentStartTime,
+              times: targetResourceTimes
+            });
             const resourceDate = (0, import_dayjs.default)(resourcesEndTime.end_at).format(
               "YYYY-MM-DD"
             );
             const operatingBoundaryDateTime = `${resourceDate} ${operating_day_boundary.type === "start_time" ? "23:59" : operating_day_boundary.time}`;
-            const endTime = (0, import_dayjs.default)(resourcesEndTime.end_at).isBefore(
-              (0, import_dayjs.default)(operatingBoundaryDateTime)
-            ) ? resourcesEndTime.end_at : operatingBoundaryDateTime;
+            const endTimeCandidates = [
+              resourcesEndTime.end_at,
+              operatingBoundaryDateTime,
+              ...earliestBlockedStartTime ? [earliestBlockedStartTime] : []
+            ];
+            const endTime = endTimeCandidates.reduce((earliest, value) => {
+              return (0, import_dayjs.default)(value).isBefore((0, import_dayjs.default)(earliest)) ? value : earliest;
+            }, endTimeCandidates[0]);
             let formattedEndTime;
             if (typeof endTime === "string" && endTime.includes(":") && !endTime.includes(" ") && !endTime.includes("T")) {
               const currentDate = timeSlots.start_at.format("YYYY-MM-DD");

package/lib/solution/Checkout/index.js

@@ -222,7 +222,6 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           product_id: item.product_id,
           product_variant_id: item.product_variant_id,
           quantity: item.num,
-          is_price_include_tax: item.is_price_include_tax,
           // 商品是否含税：1；0
           is_charge_tax: item.is_charge_tax ?? 0,
           // 若商品不含税，计算得到的税费，单位（元）
@@ -247,7 +246,6 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           },
           product_bundle: item.product_bundle.map((bundle) => {
             return {
-              is_price_include_tax: item.is_price_include_tax,
               bundle_id: bundle.bundle_id,
               bundle_product_id: bundle.bundle_product_id,
               bundle_variant_id: bundle.bundle_variant_id,

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

@@ -22,7 +22,6 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     getCurrentBookingTime(): string | null;
     private filterDiscountListByBookingTime;
     setCustomer(customer: Customer): Promise<void>;
-    setOriginTotalAmount(amount: number): void;
     setHolders(holders: {
         form_record_id: number;
     }[]): void;

package/lib/solution/ShopDiscount/index.js

@@ -56,7 +56,6 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       originalDiscountList: [],
       currentBookingTime: "",
       filteredDiscountList: [],
-      orderTotalAmount: 0,
       bookingSubject: void 0
     };
   }
@@ -195,9 +194,6 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       );
     }
   }
-  setOriginTotalAmount(amount) {
-    this.store.orderTotalAmount = amount;
-  }
   // 设置holders
   setHolders(holders) {
     this.store.holders = holders;
@@ -218,7 +214,6 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         productList,
         discountList: this.getDiscountList(),
         holders: this.store.holders || [],
-        orderTotalAmount: this.store.orderTotalAmount || 0,
         isFormSubject: ((_a = this.store.bookingSubject) == null ? void 0 : _a.type) === "form"
       },
       options
@@ -312,7 +307,6 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         oldDiscountList: this.getDiscountList(),
         newDiscountList: withScanList,
         holders: this.store.holders || [],
-        orderTotalAmount: this.store.orderTotalAmount || 0,
         isFormSubject: ((_b = this.store.bookingSubject) == null ? void 0 : _b.type) === "form"
       }) || {
         isAvailable: false,
@@ -501,7 +495,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/lib/solution/ShopDiscount/types.d.ts

@@ -31,7 +31,6 @@ export interface ShopDiscountState {
     originalDiscountList: Discount[];
     currentBookingTime: string | null;
     filteredDiscountList: Discount[];
-    orderTotalAmount?: number;
     bookingSubject?: {
         type?: 'form' | 'customer';
         [key: string]: any;

package/package.json

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

package/dist/model/index.d.ts

@@ -1 +0,0 @@
-export * from './strategy';

package/dist/model/index.js

@@ -1 +0,0 @@
-export * from "./strategy";

package/dist/model/strategy/adapter/index.d.ts

@@ -1,3 +0,0 @@
-export * from './type';
-export { default as WalletPassAdapter } from './walletPass';
-export { WalletPassEvaluator } from './walletPass/evaluator';

package/dist/model/strategy/adapter/index.js

@@ -1,4 +0,0 @@
-export * from "./type";
-export { default as WalletPassAdapter } from "./walletPass";
-export { WalletPassEvaluator } from "./walletPass/evaluator";
-// export * from './walletPass/type';

package/dist/model/strategy/adapter/type.d.ts

@@ -1,28 +0,0 @@
-import { EvaluationResult, RuntimeContext } from '../type';
-export interface BusinessAdapter {
-    /**
-     * 适配器名称
-     */
-    name: string;
-    /**
-     * 适配器版本
-     */
-    version: string;
-    /**
-     * 准备运行时上下文
-     * 将业务数据转换为策略引擎可识别的上下文
-     */
-    prepareContext(businessData: any): RuntimeContext;
-    /**
-     * 转换执行结果
-     * 将策略引擎的通用结果转换为业务层需要的格式
-     */
-    transformResult(result: EvaluationResult, businessData?: any): any;
-    /**
-     * 根据业务数据重新格式化配置
-     */
-    formatConfig(result: EvaluationResult, businessData?: any): {
-        result: EvaluationResult;
-        businessData?: any;
-    };
-}

package/dist/model/strategy/adapter/type.js

@@ -1 +0,0 @@
-export {};

package/dist/model/strategy/adapter/walletPass/evaluator.d.ts

@@ -1,84 +0,0 @@
-import { StrategyConfig } from '../../type';
-import { Voucher, Product, VoucherEvaluationResult, EvaluatorInput } from './type';
-/**
- * Wallet Pass 评估器
- * 用于评估哪些 voucher 可以在当前订单中使用
- */
-export declare class WalletPassEvaluator {
-    private engine;
-    private strategyConfigs;
-    private locale;
-    constructor();
-    setStrategyConfigs(strategyConfigs: StrategyConfig[]): void;
-    getStrategyConfigs(): StrategyConfig[];
-    setLocale(locale: string): void;
-    getText(key: string): string;
-    /**
-     * 搜索券的格式
-     * @param input 输入
-     * @returns 返回搜索券的格式
-     */
-    searchVoucherFormat(input: EvaluatorInput): Voucher[];
-    /**
-     * 评估可用的 vouchers
-     */
-    evaluate(input: EvaluatorInput): VoucherEvaluationResult[];
-    /** 检查代金券/折扣卡是否可用 并返回config */
-    checkVoucherAvailability(input: EvaluatorInput): {
-        isAvailable: boolean;
-        config: {
-            [x: string]: any;
-        };
-    };
-    /**
-     * 获取推荐券
-     * @param input 输入
-     * @returns 返回推荐券列表
-     */
-    getRecommendedVouchers(input: EvaluatorInput): {
-        recommendedAmount: any;
-        recommended: any[];
-        transformList: any[];
-        noApplicableVoucher: Voucher[];
-    };
-    enhanceWithReason(voucher: any): any;
-    /**
-     * 优惠券处理函数
-     * @param applicableVouchers 可用的券列表
-     * @param orderTotalAmount 订单总金额
-     * @param products 订单商品列表
-     * @returns 返回推荐券列表和全部列表，每个券包含 _available_max_amount 和 _unified_available_status
-     */
-    processVouchers(vouchers: Voucher[], orderTotalAmount: number, products: Product[]): {
-        recommended: any[];
-        transformList: any[];
-    };
-    /**
-     * 重新计算优惠券状态（基于已选券的增量计算）
-     * @param allVouchers 所有原始券列表
-     * @param selectedVouchers 已选中的券列表（按选中顺序）
-     * @param orderTotalAmount 订单总金额
-     * @param products 订单商品列表
-     * @returns 返回更新后的所有券列表和已选券的详细抵扣信息
-     */
-    recalculateVouchers(allVouchers: any[], selectedVouchers: any[], orderTotalAmount: number, products: any[]): {
-        allWithUpdatedStatus: any[];
-        selectedWithDetails: any[];
-    };
-    /**
-     * 查找适用于指定 voucher 的策略配置
-     */
-    private findApplicableStrategies;
-    /**
-     * 检查策略中是否包含指定的 voucher ID
-     */
-    private checkVoucherInStrategy;
-    /**
-     * 递归检查条件组中是否包含 voucher ID
-     */
-    private checkVoucherInConditionGroup;
-    /**
-     * 计算适用商品的总金额和数量
-     */
-    private calculateApplicableProducts;
-}