@pisell/pisellos 2.1.150 → 2.1.151

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

@@ -28,6 +28,7 @@ export interface RulesModuleAPI {
     calcDiscount: (params: {
         discountList: any[];
         productList: any[];
+        orderTotalAmount: number;
         holders: {
             form_record_id: number;
         }[];
@@ -66,6 +67,7 @@ export interface RulesParamsHooks {
         quantity?: number;
         bundle?: any[];
         main_product_selling_price?: string | number;
+        options?: any[];
     }) => Record<string, any>;
 }
 export {};

package/lib/modules/Schedule/getDateIsInSchedule.js

@@ -70,7 +70,7 @@ var isInStandardSchedule = (targetDate, targetDateString, targetTimeString, sche
   }
   const startDate = (0, import_dayjs.default)(schedule.start_time);
   const endDate = (0, import_dayjs.default)(schedule.end_time);
-  const isInBasicRange = targetDate.isSameOrAfter(startDate) && targetDate.isBefore(endDate);
+  const isInBasicRange = targetDate.isSameOrAfter(startDate) && targetDate.isSameOrBefore(endDate);
   if (schedule.repeat_type === "none") {
     return isInBasicRange;
   }
@@ -80,14 +80,16 @@ var isInTimeSlotsSchedule = (targetDate, targetDateString, targetTimeString, sch
   if (!schedule.start_time) {
     return false;
   }
-  const scheduleStartDate = (0, import_dayjs.default)(schedule.start_time.split(" ")[0]);
-  if (!isDateInTimeSlotsSchedule(targetDate, schedule, scheduleStartDate)) {
+  const scheduleDate = schedule.start_time.split(" ")[0];
+  if (targetDateString !== scheduleDate) {
     return false;
   }
   for (const timeSlot of schedule.time_slot) {
-    const slotStart = (0, import_dayjs.default)(`${targetDateString} ${timeSlot.start_time}:00`);
-    const slotEnd = (0, import_dayjs.default)(`${targetDateString} ${timeSlot.end_time}:00`);
-    if (targetDate.isSameOrAfter(slotStart) && targetDate.isBefore(slotEnd)) {
+    const slotStart = `${scheduleDate} ${timeSlot.start_time}:00`;
+    const slotEnd = `${scheduleDate} ${timeSlot.end_time}:00`;
+    const slotStartDate = (0, import_dayjs.default)(slotStart);
+    const slotEndDate = (0, import_dayjs.default)(slotEnd);
+    if (targetDate.isSameOrAfter(slotStartDate) && targetDate.isSameOrBefore(slotEndDate)) {
       return true;
     }
   }
@@ -102,7 +104,7 @@ var isInDesignationSchedule = (targetDate, targetDateString, targetTimeString, s
     const endDateTime = `${designation.end_date} ${designation.end_time}:00`;
     const startDate = (0, import_dayjs.default)(startDateTime);
     const endDate = (0, import_dayjs.default)(endDateTime);
-    if (targetDate.isSameOrAfter(startDate) && targetDate.isBefore(endDate)) {
+    if (targetDate.isSameOrAfter(startDate) && targetDate.isSameOrBefore(endDate)) {
       return true;
     }
   }
@@ -156,7 +158,7 @@ var isInDailyRepeat = (targetDate, startDate, endDate, repeatRule) => {
   const targetTimeOfDay = targetDate.hour() * 3600 + targetDate.minute() * 60 + targetDate.second();
   const startTimeOfDay = startDate.hour() * 3600 + startDate.minute() * 60 + startDate.second();
   const endTimeOfDay = endDate.hour() * 3600 + endDate.minute() * 60 + endDate.second();
-  return targetTimeOfDay >= startTimeOfDay && targetTimeOfDay < endTimeOfDay;
+  return targetTimeOfDay >= startTimeOfDay && targetTimeOfDay <= endTimeOfDay;
 };
 var isInWeeklyRepeat = (targetDate, startDate, endDate, repeatRule) => {
   const targetDayOfWeek = targetDate.day();
@@ -173,7 +175,7 @@ var isInWeeklyRepeat = (targetDate, startDate, endDate, repeatRule) => {
   const targetTimeOfDay = targetDate.hour() * 3600 + targetDate.minute() * 60 + targetDate.second();
   const startTimeOfDay = startDate.hour() * 3600 + startDate.minute() * 60 + startDate.second();
   const endTimeOfDay = endDate.hour() * 3600 + endDate.minute() * 60 + endDate.second();
-  return targetTimeOfDay >= startTimeOfDay && targetTimeOfDay < endTimeOfDay;
+  return targetTimeOfDay >= startTimeOfDay && targetTimeOfDay <= endTimeOfDay;
 };
 var getScheduleStartEndTimePoints = (date, scheduleList) => {
   if (!date || !scheduleList || scheduleList.length === 0) {

package/lib/modules/Schedule/utils.d.ts

@@ -46,7 +46,7 @@ export declare const formatScheduleResult: (schedule: ScheduleItem) => {
 };
 export declare const calcScheduleDateRange: (schedule: ScheduleItem) => any[];
 export declare const calcCalendarDataBySchedules: (schedules: ScheduleItem[]) => unknown[];
-export declare const calcMinTimeMaxTimeBySchedules: (schedules: ScheduleItem[], scheduleAllMap?: ScheduleAllMap, selectDate?: string) => ScheduleAllMap;
+export declare const calcMinTimeMaxTimeBySchedules: (schedules: ScheduleItem[], scheduleAllMap?: ScheduleAllMap, selectDate?: string) => {};
 /**
  * @title: 格式化日程数据
  * @description:

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

@@ -6,6 +6,8 @@ export interface ISummaryState {
         subtotal: string | number;
         /** 最终总价 */
         total: string | number;
+        /** 最终原始价格 不包含折扣卡商品券折扣 */
+        originTotal: string | number;
         /** 税率标题 */
         taxTitle?: string;
         /** 商品总费率 */

package/lib/modules/Summary/utils.d.ts

@@ -7,8 +7,8 @@ export declare const calculatePriceDetails: (shopInfo: any, items: CartItem[], i
  * @param item
  */
 export declare const getBundleDiscountList: (bundle: any[]) => any[];
-export declare const calcDiscountListDifference: (discountList: any[]) => number;
-export declare const getProductDiscountProductDiscountDifference: (item: CartItem) => number;
+export declare const calcDiscountListDifference: (discountList: any[]) => any;
+export declare const getProductDiscountProductDiscountDifference: (item: CartItem) => any;
 /**
  * 计算订单税费（折扣前/折扣后），并把单品税费信息回写到商品数据上（用于明细展示/后续计算）。
  *
@@ -58,6 +58,12 @@ export declare const getTax: ({ service, addons, bookingDetail, bookingId }: {
  * @returns 商品总价字符串，保留2位小数
  */
 export declare const calculateSubtotal: (items: CartItem[]) => string;
+/**
+ * 计算商品小计（不含其他费用 不包含折扣卡商品券抵扣金额）
+ * @param items - 购物车商品数组
+ * @returns 商品总价字符串，保留2位小数
+ */
+export declare const calculateOriginSubtotal: (items: CartItem[]) => string;
 /**
  * @title: 单个商品的税费
  * @description:
@@ -94,7 +100,7 @@ export declare const calculateDeposit: (items: CartItem[]) => {
 export declare const getSurchargeAmount: ({ bookingDetail, bookingId }: {
     bookingDetail?: any;
     bookingId?: number | undefined;
-}, surcharge: any[], options: any) => number;
+}, surcharge: any[], options: any) => any;
 /**
  * 订单附加费各项信息
  *

package/lib/modules/Summary/utils.js

@@ -31,6 +31,7 @@ var utils_exports = {};
 __export(utils_exports, {
   calcDiscountListDifference: () => calcDiscountListDifference,
   calculateDeposit: () => calculateDeposit,
+  calculateOriginSubtotal: () => calculateOriginSubtotal,
   calculatePriceDetails: () => calculatePriceDetails,
   calculateSubtotal: () => calculateSubtotal,
   calculateTaxFee: () => calculateTaxFee,
@@ -46,6 +47,7 @@ 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 surchargeAmount = new import_decimal.default(getSurchargeAmount({ bookingDetail: null, bookingId: void 0 }, surcharge, { isEdit: false }));
@@ -59,10 +61,12 @@ 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,
@@ -87,8 +91,8 @@ var getBundleDiscountList = (bundle) => {
 var calcDiscountListDifference = (discountList) => {
   return discountList.reduce((pre, cur) => {
     var _a;
-    return pre.plus(((_a = cur == null ? void 0 : cur.metadata) == null ? void 0 : _a.product_discount_difference) || 0);
-  }, new import_decimal.default(0)).toNumber();
+    return pre + (((_a = cur == null ? void 0 : cur.metadata) == null ? void 0 : _a.product_discount_difference) || 0);
+  }, 0);
 };
 var getProductDiscountProductDiscountDifference = (item) => {
   var _a, _b, _c, _d;
@@ -360,6 +364,16 @@ 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";
@@ -408,8 +422,8 @@ var getSurchargeAmount = ({ bookingDetail, bookingId }, surcharge, options) => {
   if (!Array.isArray(surcharge))
     return 0;
   return surcharge.reduce((total, item) => {
-    return total.plus(item.value || 0);
-  }, new import_decimal.default(0)).toNumber();
+    return total + (item.value || 0);
+  }, 0);
 };
 var getBundleItemIsOriginalPrice = (item) => {
   return (item == null ? void 0 : item.price_type) === "markup" && (item == null ? void 0 : item.price_type_ext) === "product_price";
@@ -429,24 +443,18 @@ var getDiscountAmount = (discounts) => {
   }, new import_decimal.default(0)).toNumber();
 };
 var getMainProductTotal = (item) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
-  let total = new import_decimal.default(
-    (item == null ? void 0 : item.main_product_selling_price) ?? ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.main_product_selling_price) ?? ((_b = item == null ? void 0 : item.metadata) == null ? void 0 : _b.main_product_original_price) ?? 0
-  );
-  const hasMainProductPrice = (item == null ? void 0 : item.main_product_selling_price) != null || ((_c = item == null ? void 0 : item.metadata) == null ? void 0 : _c.main_product_selling_price) != null || ((_d = item == null ? void 0 : item.metadata) == null ? void 0 : _d.main_product_original_price) != null;
-  if (!hasMainProductPrice) {
-    total = new import_decimal.default((item == null ? void 0 : item.main_product_selling_price) ?? ((_e = item == null ? void 0 : item.metadata) == null ? void 0 : _e.main_product_selling_price) ?? item.price ?? 0);
-    const discount = ((_g = (_f = item == null ? void 0 : item._origin) == null ? void 0 : _f.product) == null ? void 0 : _g.discount_list) || ((_j = (_i = (_h = item == null ? void 0 : item._originData) == null ? void 0 : _h.product) == null ? void 0 : _i.discount_list) == null ? void 0 : _j.filter((item2) => {
-      var _a2;
-      return !((_a2 = item2 == null ? void 0 : item2.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id);
-    })) || [];
-    const mainProductDiscountAmount = getDiscountAmount(discount);
-    total = total.minus(mainProductDiscountAmount);
-    if ((item == null ? void 0 : item.option) && Array.isArray(item == null ? void 0 : item.option)) {
-      total = total.add(item == null ? void 0 : item.option.reduce((t, option) => {
-        return t.add(new import_decimal.default(option.price || 0).mul(option.num || 1));
-      }, new import_decimal.default(0)));
-    }
+  var _a, _b, _c, _d, _e, _f;
+  let total = new import_decimal.default((item == null ? void 0 : item.main_product_selling_price) ?? ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.main_product_selling_price) ?? item.price ?? 0);
+  const discount = ((_c = (_b = item == null ? void 0 : item._origin) == null ? void 0 : _b.product) == null ? void 0 : _c.discount_list) || ((_f = (_e = (_d = item == null ? void 0 : item._originData) == null ? void 0 : _d.product) == null ? void 0 : _e.discount_list) == null ? void 0 : _f.filter((item2) => {
+    var _a2;
+    return !((_a2 = item2 == null ? void 0 : item2.metadata) == null ? void 0 : _a2.custom_product_bundle_map_id);
+  })) || [];
+  const mainProductDiscountAmount = getDiscountAmount(discount);
+  total = total.minus(mainProductDiscountAmount);
+  if ((item == null ? void 0 : item.option) && Array.isArray(item == null ? void 0 : item.option)) {
+    total = total.add(item == null ? void 0 : item.option.reduce((t, option) => {
+      return t.add(new import_decimal.default(option.price || 0).mul(option.num || 1));
+    }, new import_decimal.default(0)));
   }
   for (let bundleItem of (item == null ? void 0 : item.bundle) || []) {
     if (getBundleItemIsMarkupOrDiscountPrice(bundleItem)) {
@@ -791,6 +799,7 @@ function resetItemsSurchargeSideEffects({ service, addons }) {
 0 && (module.exports = {
   calcDiscountListDifference,
   calculateDeposit,
+  calculateOriginSubtotal,
   calculatePriceDetails,
   calculateSubtotal,
   calculateTaxFee,

package/lib/modules/index.d.ts

@@ -11,8 +11,4 @@ export * from './Payment';
 export * from './Resource';
 export * from './Step';
 export * from './Summary';
-export * from './SalesSummary';
 export * from './Schedule';
-export * from './Quotation';
-export * from './ScanOrderLogger';
-export * from './OpenData';

package/lib/modules/index.js

@@ -29,11 +29,7 @@ __reExport(modules_exports, require("./Payment"), module.exports);
 __reExport(modules_exports, require("./Resource"), module.exports);
 __reExport(modules_exports, require("./Step"), module.exports);
 __reExport(modules_exports, require("./Summary"), module.exports);
-__reExport(modules_exports, require("./SalesSummary"), module.exports);
 __reExport(modules_exports, require("./Schedule"), module.exports);
-__reExport(modules_exports, require("./Quotation"), module.exports);
-__reExport(modules_exports, require("./ScanOrderLogger"), module.exports);
-__reExport(modules_exports, require("./OpenData"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./Product"),
@@ -49,9 +45,5 @@ __reExport(modules_exports, require("./OpenData"), module.exports);
   ...require("./Resource"),
   ...require("./Step"),
   ...require("./Summary"),
-  ...require("./SalesSummary"),
-  ...require("./Schedule"),
-  ...require("./Quotation"),
-  ...require("./ScanOrderLogger"),
-  ...require("./OpenData")
+  ...require("./Schedule")
 });

package/lib/plugins/window.d.ts

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

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

@@ -144,6 +144,7 @@ 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;
@@ -301,7 +302,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     autoSelectAllProductResources(resources_code: string, timeSlots?: TimeSliceItem): {
         errorList: any[];
     };
-    getTimeSlotByAllResources(resources_code: string, split?: number): any[];
+    getTimeSlotByAllResources(resources_code: string): any[];
     getTimeSlotByAllResourcesForDate({ resources_code, startDate, endDate }: {
         resources_code: string;
         startDate: string;
@@ -310,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 5 | 4 | 3 | 6;
+        weekNum: 0 | 2 | 1 | 5 | 3 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/BookingByStep/index.js

@@ -1235,7 +1235,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         }
       );
       cartItems2.forEach((item, index) => {
-        var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
+        var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j;
         const { currentCapacity } = (0, import_capacity.getCapacityInfoByCartItem)(item);
         const hasOriginTimeSlot = Boolean(item._origin.start_time) && Boolean(item._origin.end_time) && !(timeSlots == null ? void 0 : timeSlots.start_time);
         if (hasOriginTimeSlot) {
@@ -1368,9 +1368,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             const fastestResource = (0, import_timeslots.findFastestAvailableResource)({
               resources: targetRenderList,
               currentCapacity,
-              countMap: selectResourcesMap,
-              targetDate: (_k = dateRange == null ? void 0 : dateRange[0]) == null ? void 0 : _k.date,
-              durationMinutes: ((_l = item == null ? void 0 : item.duration) == null ? void 0 : _l.value) || ((_n = (_m = item == null ? void 0 : item._productOrigin) == null ? void 0 : _m.duration) == null ? void 0 : _n.value) || 10
+              countMap: selectResourcesMap
             });
             const targetResource = fastestResource || targetRenderList[0];
             targetResource.capacity = currentCapacity;
@@ -1407,7 +1405,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     return { errorList };
   }
   // 从购物车中获取已经分配好第一步资源的所有时间片
-  getTimeSlotByAllResources(resources_code, split = 10) {
+  getTimeSlotByAllResources(resources_code) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     let dateRange = this.store.date.getDateRange();
     const resources = [];
@@ -1565,7 +1563,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       resourcesMap,
       duration,
       currentDate: dateRange[0].date,
-      split,
+      split: 10,
       resourcesUseableMap,
       capacity: maxCapacity,
       cut_off_time: maxCutOffTime,

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

@@ -1,4 +1,4 @@
-import { ProductList, CartModule, ProductData, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, SalesSummaryModule, ScheduleModule, ScanOrderLoggerModule } from '../../modules';
+import { ProductList, CartModule, ProductData, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, ScheduleModule } from '../../modules';
 export interface BookingByStepState {
     cart: CartModule;
     summary: SummaryModule;
@@ -14,8 +14,6 @@ export interface BookingByStepState {
     currentProduct?: ProductData;
     currentProductMeta?: Record<string, any>;
     schedule: ScheduleModule;
-    salesSummary?: SalesSummaryModule;
-    scanOrderLogger?: ScanOrderLoggerModule;
 }
 export declare function createModule<T extends keyof BookingByStepState>(moduleName: T, solutionName: string, name?: string, version?: string): BookingByStepState[T];
 export declare enum BookingByStepHooks {

package/lib/solution/BookingByStep/types.js

@@ -36,11 +36,6 @@ function createModule(moduleName, solutionName, name, version) {
         `${solutionName}_${name || moduleName}`,
         version
       );
-    case "salesSummary":
-      return new import_modules.SalesSummaryModule(
-        `${solutionName}_${name || moduleName}`,
-        version
-      );
     case "step":
       return new import_modules.StepModule(
         `${solutionName}_${name || moduleName}`,
@@ -76,11 +71,6 @@ function createModule(moduleName, solutionName, name, version) {
         `${solutionName}_${name || moduleName}`,
         version
       );
-    case "scanOrderLogger":
-      return new import_modules.ScanOrderLoggerModule(
-        `${solutionName}_${name || moduleName}`,
-        version
-      );
     default:
       throw new Error(`Unknown module type: ${moduleName}`);
   }

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

@@ -19,12 +19,10 @@ export declare function calculateResourceAvailableTime({ resource, timeSlots, cu
  * @param countMap 已预约数量映射
  * @returns 最快可用的资源
  */
-export declare function findFastestAvailableResource({ resources, currentCapacity, countMap, targetDate, durationMinutes, }: {
+export declare function findFastestAvailableResource({ resources, currentCapacity, countMap, }: {
     resources: ResourceItem[];
     currentCapacity?: number;
     countMap?: Record<number, number>;
-    targetDate?: string | Dayjs;
-    durationMinutes?: number;
 }): ResourceItem | null;
 /**
  * 给定一个时间列表，通过开始和结束时间过滤出符合条件的时间段

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

@@ -77,15 +77,10 @@ function calculateResourceAvailableTime({
 function findFastestAvailableResource({
   resources,
   currentCapacity = 1,
-  countMap = {},
-  targetDate,
-  durationMinutes = 30
+  countMap = {}
 }) {
   var _a, _b, _c;
   const currentTime = (0, import_dayjs.default)();
-  const resolvedDuration = durationMinutes > 0 ? durationMinutes : 30;
-  const targetDay = targetDate ? (0, import_dayjs.default)(targetDate) : currentTime;
-  const isTargetDayToday = targetDay.isSame(currentTime, "day");
   let fastestTime = null;
   let fastestResources = [];
   console.log("[TimeslotUtils] 查找最快可用资源:", {
@@ -95,22 +90,19 @@ function findFastestAvailableResource({
     countMap
   });
   for (const resource of resources) {
-    const targetDayTimes = resource.times.filter((time) => {
-      const isSameTargetDay = (0, import_dayjs.default)(time.start_at).isSame(targetDay, "day");
-      if (!isSameTargetDay)
-        return false;
-      if (!isTargetDayToday)
-        return true;
-      return (0, import_dayjs.default)(time.end_at).isAfter(currentTime);
+    const todayTimes = resource.times.filter((time) => {
+      const isToday = (0, import_dayjs.default)(time.start_at).isSame(currentTime, "day");
+      const isStillWorking = (0, import_dayjs.default)(time.end_at).isAfter(currentTime);
+      return isToday && isStillWorking;
     });
-    if (targetDayTimes.length === 0) {
+    if (todayTimes.length === 0) {
       console.log(`[TimeslotUtils] 资源 ${resource.id}(${resource.main_field}) 今日无可用时间段`);
       continue;
     }
-    for (const time of targetDayTimes) {
+    for (const time of todayTimes) {
       const workStartTime = (0, import_dayjs.default)(time.start_at);
       const workEndTime = (0, import_dayjs.default)(time.end_at);
-      let nextAvailableTime = isTargetDayToday && currentTime.isAfter(workStartTime) ? currentTime : workStartTime;
+      let nextAvailableTime = currentTime.isBefore(workStartTime) ? workStartTime : currentTime;
       console.log(`[TimeslotUtils] 检查资源 ${resource.id}(${resource.main_field}):`, {
         workTime: `${workStartTime.format("HH:mm")}-${workEndTime.format("HH:mm")}`,
         checkStartTime: nextAvailableTime.format("HH:mm:ss"),
@@ -134,7 +126,7 @@ function findFastestAvailableResource({
           pax: event.pax || 1
         });
         if (resource.resourceType === "single" || (resource.capacity || 1) === 1) {
-          if (finalAvailableTime.isBefore(eventEnd) && eventStart.isBefore(finalAvailableTime.add(resolvedDuration, "minute"))) {
+          if (finalAvailableTime.isBefore(eventEnd) && eventStart.isBefore(finalAvailableTime.add(30, "minute"))) {
             finalAvailableTime = eventEnd;
             console.log(`[TimeslotUtils] 发现时间冲突，调整到: ${finalAvailableTime.format("HH:mm:ss")}`);
           }
@@ -142,7 +134,7 @@ function findFastestAvailableResource({
           const totalCapacity = resource.capacity || 0;
           const currentUsedCapacity = countMap[resource.id] || 0;
           const eventUsedCapacity = event.pax || 1;
-          if (finalAvailableTime.isBefore(eventEnd) && eventStart.isBefore(finalAvailableTime.add(resolvedDuration, "minute"))) {
+          if (finalAvailableTime.isBefore(eventEnd) && eventStart.isBefore(finalAvailableTime.add(30, "minute"))) {
             const totalRequiredCapacity = currentUsedCapacity + currentCapacity + eventUsedCapacity;
             if (totalRequiredCapacity > totalCapacity) {
               finalAvailableTime = eventEnd;
@@ -151,7 +143,7 @@ function findFastestAvailableResource({
           }
         }
       }
-      if (finalAvailableTime.add(resolvedDuration, "minute").isAfter(workEndTime)) {
+      if (finalAvailableTime.isAfter(workEndTime)) {
         console.log(`[TimeslotUtils] 资源 ${resource.id} 可用时间超出工作时间，跳过`);
         continue;
       }

package/lib/solution/Checkout/index.js

@@ -222,6 +222,7 @@ 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,
           // 若商品不含税，计算得到的税费，单位（元）
@@ -246,6 +247,7 @@ 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,6 +22,7 @@ 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;
@@ -29,7 +30,6 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
         type?: 'form' | 'customer';
         [key: string]: any;
     }): void;
-    setOrderId(id?: number): void;
     calcDiscount(productList: Record<string, any>[], options?: SetDiscountSelectedParams): {
         productList: Record<string, any>[];
         discountList: Discount[];
@@ -57,7 +57,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     private bestDiscount;
     loadPrepareConfig(params: {
         customerId: number;
-        action?: 'create' | 'edit';
+        action?: 'create' | 'update';
         with_good_pass?: 0 | 1;
         with_discount_card?: 0 | 1;
     }): Promise<void>;