@pisell/pisellos 2.1.84 → 2.1.85

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

@@ -31,6 +31,7 @@ export interface RulesModuleAPI {
         holders: {
             form_record_id: number;
         }[];
+        orderTotalAmount: number;
         isFormSubject: boolean;
     }) => DiscountResult;
 }

package/lib/modules/Summary/index.js

@@ -65,7 +65,7 @@ var SummaryModule = class extends import_BaseModule.BaseModule {
     this.getSurchargeList();
   }
   async getSurchargeList() {
-    const surchargeList = await this.request.get("/order/custom-surcharge/available/v2", {
+    const surchargeList = await this.request.get("/order/custom-surcharge/available", {
       channel: "online-store",
       is_assemble_product_data: 1,
       is_assemble_schedule_data: 1,
@@ -74,18 +74,14 @@ var SummaryModule = class extends import_BaseModule.BaseModule {
     this.store.surchargeList = (surchargeList == null ? void 0 : surchargeList.data) || [];
   }
   async getSummary(cartItems) {
-    var _a, _b, _c;
+    var _a, _b;
     const shopInfo = ((_b = (_a = this.shopStore.get("core")) == null ? void 0 : _a.core) == null ? void 0 : _b.shop) || {};
-    const scheduleModule = this.core.getModule("appointmentBooking_schedule");
-    const needScheduleIds = this.store.surchargeList.map((item) => item.available_schedule_ids).flat();
-    const scheduleList = scheduleModule == null ? void 0 : scheduleModule.getScheduleListByIds(needScheduleIds);
-    const scheduleById = {};
-    if (Array.isArray(scheduleList)) {
-      for (let item of scheduleList) {
-        scheduleById[item.id] = item;
-      }
-    }
-    const summary = (0, import_utils.calculatePriceDetails)(shopInfo, cartItems, (_c = import_Schedule.ScheduleModule) == null ? void 0 : _c.isInScheduleByDate, this.store.surchargeList, scheduleById);
+    const summary = (0, import_utils.calculatePriceDetails)(
+      shopInfo,
+      cartItems,
+      import_Schedule.ScheduleModule.isInScheduleByDate,
+      this.store.surchargeList
+    );
     this.store.summary = summary;
     return this.store.summary;
   }
@@ -119,16 +115,7 @@ var SummaryModule = class extends import_BaseModule.BaseModule {
     });
   }
   getSurchargeforUtils(items) {
-    const scheduleModule = this.core.getModule("appointmentBooking_schedule");
-    const needScheduleIds = this.store.surchargeList.map((item) => item.available_schedule_ids).flat();
-    const scheduleList = scheduleModule == null ? void 0 : scheduleModule.getScheduleListByIds(needScheduleIds);
-    const scheduleById = {};
-    if (Array.isArray(scheduleList)) {
-      for (let item of scheduleList) {
-        scheduleById[item.id] = item;
-      }
-    }
-    const surchargeList = (0, import_utils.getSurcharge)({ service: items, addons: [], bookingDetail: null, bookingId: void 0 }, { isEdit: false, isInScheduleByDate: import_Schedule.ScheduleModule.isInScheduleByDate, surcharge_list: this.store.surchargeList, scheduleById });
+    const surchargeList = (0, import_utils.getSurcharge)({ service: items, addons: [], bookingDetail: null, bookingId: void 0 }, { isEdit: false, isInScheduleByDate: import_Schedule.ScheduleModule.isInScheduleByDate, surcharge_list: this.store.surchargeList, scheduleById: {} });
     const surchargeAmount = new import_decimal.default((0, import_utils.getSurchargeAmount)({ bookingDetail: null, bookingId: void 0 }, surchargeList, { isEdit: false }));
     return {
       surchargeList,

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

@@ -1,7 +1,7 @@
 import Decimal from 'decimal.js';
 import { CartItem } from '../Cart/types';
 import { ISummaryState } from './types';
-export declare const calculatePriceDetails: (shopInfo: any, items: CartItem[], isInScheduleByDate: any, surchargeList: any[], scheduleById: Record<string, any>) => ISummaryState['summary'];
+export declare const calculatePriceDetails: (shopInfo: any, items: CartItem[], isInScheduleByDate: any, surchargeList: any[]) => ISummaryState['summary'];
 /**
  * 获取子商品折扣信息
  * @param item
@@ -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:

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,
@@ -42,12 +43,11 @@ __export(utils_exports, {
 });
 module.exports = __toCommonJS(utils_exports);
 var import_decimal = __toESM(require("decimal.js"));
-var import_utils = require("../Product/utils");
-var import_dayjs = __toESM(require("dayjs"));
-var calculatePriceDetails = (shopInfo, items, isInScheduleByDate, surchargeList, scheduleById) => {
+var calculatePriceDetails = (shopInfo, items, isInScheduleByDate, surchargeList) => {
   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,10 +59,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,
@@ -360,6 +362,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";
@@ -510,17 +522,8 @@ var isProductMatchSurchargeCondition = (item, options) => {
   return isProductMatch && isScheduleMatch;
 };
 var getSurcharge = ({ service, addons, bookingDetail, bookingId }, options) => {
-  var _a, _b, _c, _d;
+  var _a, _b, _c;
   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(
@@ -567,7 +570,7 @@ var getSurcharge = ({ service, addons, bookingDetail, bookingId }, options) => {
         if (isProductMatchSurchargeCondition(
           {
             isCustomItem: item.isCustomItem,
-            startDate,
+            startDate: (item == null ? void 0 : item.startDate) || "",
             product_id: item.id
           },
           {
@@ -599,7 +602,7 @@ var getSurcharge = ({ service, addons, bookingDetail, bookingId }, options) => {
           if (getBundleItemIsOriginalPrice(bundleItem) && isProductMatchSurchargeCondition(
             {
               isCustomItem: false,
-              startDate,
+              startDate: item.startDate,
               product_id: bundleItem._bundle_product_id
             },
             {
@@ -625,7 +628,7 @@ var getSurcharge = ({ service, addons, bookingDetail, bookingId }, options) => {
           if (isProductMatchSurchargeCondition(
             {
               isCustomItem: false,
-              startDate,
+              startDate: item.startDate,
               product_id: relationDetail.product_id
             },
             {
@@ -637,7 +640,7 @@ var getSurcharge = ({ service, addons, bookingDetail, bookingId }, options) => {
             matchedItems.push({
               isMain: false,
               total: Number(
-                (relationDetail == null ? void 0 : relationDetail.price) || ((_b = relationDetail == null ? void 0 : relationDetail.metadata) == null ? void 0 : _b.main_product_attached_bundle_selling_price)
+                (relationDetail == null ? void 0 : relationDetail.price) || ((_a = relationDetail == null ? void 0 : relationDetail.metadata) == null ? void 0 : _a.main_product_attached_bundle_selling_price)
               ),
               quantity: relationDetail.num || relationDetail.quantity || 1,
               item: relationDetail,
@@ -650,7 +653,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, startDate }, {
+        if (isProductMatchSurchargeCondition(item, {
           surchargeConfig,
           scheduleById: scheduleById || {},
           isInScheduleByDate
@@ -711,13 +714,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 = [...((_c = item.item) == null ? void 0 : _c.relation_surcharge_ids) || [], id];
+              item.item.relation_surcharge_ids = [...((_b = item.item) == null ? void 0 : _b.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 = [...((_d = item.item) == null ? void 0 : _d.relation_surcharge_ids) || [], id];
+              item.item.relation_surcharge_ids = [...((_c = item.item) == null ? void 0 : _c.relation_surcharge_ids) || [], id];
             }
           }
           if (isLast && configTotal.minus(productTotalSurcharge).gt(0)) {
@@ -787,6 +790,7 @@ function resetItemsSurchargeSideEffects({ service, addons }) {
 0 && (module.exports = {
   calcDiscountListDifference,
   calculateDeposit,
+  calculateOriginSubtotal,
   calculatePriceDetails,
   calculateSubtotal,
   calculateTaxFee,

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;

package/lib/solution/BookingByStep/index.js

@@ -1766,28 +1766,6 @@ 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
@@ -1802,22 +1780,13 @@ 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 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]);
+            const endTime = (0, import_dayjs.default)(resourcesEndTime.end_at).isBefore(
+              (0, import_dayjs.default)(operatingBoundaryDateTime)
+            ) ? resourcesEndTime.end_at : operatingBoundaryDateTime;
             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,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;

package/lib/solution/ShopDiscount/index.js

@@ -56,6 +56,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       originalDiscountList: [],
       currentBookingTime: "",
       filteredDiscountList: [],
+      orderTotalAmount: 0,
       bookingSubject: void 0
     };
   }
@@ -194,6 +195,9 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       );
     }
   }
+  setOriginTotalAmount(amount) {
+    this.store.orderTotalAmount = amount;
+  }
   // 设置holders
   setHolders(holders) {
     this.store.holders = holders;
@@ -214,6 +218,7 @@ 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
@@ -307,6 +312,7 @@ 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,
@@ -495,8 +501,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         action: "create",
         with_good_pass: 1,
         with_discount_card: 1,
-        with_wallet_pass_holder: 1,
-        request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
+        with_wallet_pass_holder: 1
       }));
       const scanDiscount = (_c = this.getDiscountList()) == null ? void 0 : _c.filter(
         (item) => item.isScan

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

@@ -31,6 +31,7 @@ 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.84",
+  "version": "2.1.85",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",