@pisell/pisellos 2.1.85 → 2.1.86

package/dist/modules/Summary/utils.js

@@ -16,9 +16,10 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import Decimal from 'decimal.js';
-export var calculatePriceDetails = function calculatePriceDetails(shopInfo, items, isInScheduleByDate, surchargeList) {
+import { isNormalProduct } from "../Product/utils";
+import dayjs from 'dayjs';
+export var calculatePriceDetails = function calculatePriceDetails(shopInfo, items, isInScheduleByDate, surchargeList, scheduleById) {
   var subtotal = new Decimal(calculateSubtotal(items));
-  var subOriginTotal = new Decimal(calculateOriginSubtotal(items));
   var totalTaxFee = new Decimal(calculateTaxFee(shopInfo, items));
   // 订单附加费列表
   var surcharge = getSurcharge({
@@ -30,7 +31,7 @@ export var calculatePriceDetails = function calculatePriceDetails(shopInfo, item
     isEdit: false,
     isInScheduleByDate: isInScheduleByDate,
     surcharge_list: surchargeList,
-    scheduleById: {}
+    scheduleById: scheduleById
   });
   // 订单附加费金额
   var surchargeAmount = new Decimal(getSurchargeAmount({
@@ -57,15 +58,11 @@ export var calculatePriceDetails = function calculatePriceDetails(shopInfo, item
     originTax = _getTax.originTax;
   var total = shopInfo !== null && shopInfo !== void 0 && shopInfo.is_price_include_tax ? subtotal.plus(surchargeAmount) : subtotal.plus(tax).plus(surchargeAmount);
 
-  // 计算总价 不包含折扣卡商品券折扣信息价格
-  var originTotal = shopInfo !== null && shopInfo !== void 0 && shopInfo.is_price_include_tax ? subOriginTotal : subOriginTotal.plus(totalTaxFee);
-
   // 计算定金
   var deposit = calculateDeposit(items);
   return {
     subtotal: subtotal.toFixed(2),
     total: total.toFixed(2),
-    originTotal: originTotal.toFixed(2),
     taxTitle: shopInfo === null || shopInfo === void 0 ? void 0 : shopInfo.tax_title,
     taxRate: shopInfo === null || shopInfo === void 0 ? void 0 : shopInfo.tax_rate,
     totalTaxFee: tax,
@@ -575,22 +572,6 @@ export var calculateSubtotal = function calculateSubtotal(items) {
   return subtotal.toFixed(2);
 };
 
-/**
- * 计算商品小计（不含其他费用 不包含折扣卡商品券抵扣金额）
- * @param items - 购物车商品数组
- * @returns 商品总价字符串，保留2位小数
- */
-export var calculateOriginSubtotal = function calculateOriginSubtotal(items) {
-  if (!(items !== null && items !== void 0 && items.length)) {
-    return '0.00';
-  }
-  var subtotal = items.reduce(function (sum, item) {
-    var cartItemTotalPrice = new Decimal(item.summaryOriginTotal || 0);
-    return sum.plus(cartItemTotalPrice);
-  }, new Decimal(0));
-  return subtotal.toFixed(2);
-};
-
 /**
  * @title: 单个商品的税费
  * @description:
@@ -736,12 +717,8 @@ var getMainProductTotal = function getMainProductTotal(item) {
       var bundleItem = _step4.value;
       if (getBundleItemIsMarkupOrDiscountPrice(bundleItem)) {
         var _ref10, _bundleItem$bundle_se2;
-        // 子商品折扣金额
-        var discountAmount = getDiscountAmount(bundleItem.discount_list);
-        // 子商品价格
-        var bundleItemPrice = new Decimal((_ref10 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref10 !== void 0 ? _ref10 : 0);
-        // todo: 套餐子商品后不需要处理 子商品价格 - 子商品折扣金额
-        var bundleItemTotal = bundleItemPrice.minus(discountAmount);
+        // IMPORTANT: 套餐子商品如果应用了 discount，bundle_selling_price和 price 其实都已经是折后价格了，不需要单独再减一次
+        var bundleItemTotal = new Decimal((_ref10 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref10 !== void 0 ? _ref10 : 0);
         total = total.add(bundleItemTotal);
       }
     }
@@ -862,6 +839,7 @@ var isProductMatchSurchargeCondition = function isProductMatchSurchargeCondition
  * @returns 附加费列表（仅返回金额 > 0 的项）
  */
 export var getSurcharge = function getSurcharge(_ref11, options) {
+  var _service$filter;
   var service = _ref11.service,
     addons = _ref11.addons,
     bookingDetail = _ref11.bookingDetail,
@@ -870,6 +848,16 @@ export var getSurcharge = function getSurcharge(_ref11, options) {
     isInScheduleByDate = options.isInScheduleByDate,
     surcharge_list = options.surcharge_list,
     scheduleById = options.scheduleById;
+  // 在所有商品里试着找 start_date，如果没有则用当前时间
+  var firstAppointmentCartItem = (_service$filter = service.filter(function (n) {
+    return !isNormalProduct(n._productOrigin);
+  })) === null || _service$filter === void 0 ? void 0 : _service$filter[0];
+  var startDate = '';
+  if (firstAppointmentCartItem) {
+    startDate = firstAppointmentCartItem.start_date + ' ' + firstAppointmentCartItem.start_time + ':00';
+  } else {
+    startDate = dayjs().format('YYYY-MM-DD HH:mm:ss');
+  }
   // 编辑状态, 且未修改商品时直接从详情取出
   if (!isEdit && bookingId) {
     if (Array.isArray(bookingDetail === null || bookingDetail === void 0 ? void 0 : bookingDetail.surcharge)) {
@@ -936,7 +924,7 @@ export var getSurcharge = function getSurcharge(_ref11, options) {
           // 主商品符合附加费条件
           if (isProductMatchSurchargeCondition({
             isCustomItem: item.isCustomItem,
-            startDate: (item === null || item === void 0 ? void 0 : item.startDate) || '',
+            startDate: startDate,
             product_id: item.id
           }, {
             surchargeConfig: surchargeConfig,
@@ -970,7 +958,7 @@ export var getSurcharge = function getSurcharge(_ref11, options) {
               // bundle商品是原价且符合附加费条件
               if (getBundleItemIsOriginalPrice(bundleItem) && isProductMatchSurchargeCondition({
                 isCustomItem: false,
-                startDate: item.startDate,
+                startDate: startDate,
                 product_id: bundleItem._bundle_product_id
               }, {
                 surchargeConfig: surchargeConfig,
@@ -1002,7 +990,7 @@ export var getSurcharge = function getSurcharge(_ref11, options) {
               var relationDetail = _step7.value;
               if (isProductMatchSurchargeCondition({
                 isCustomItem: false,
-                startDate: item.startDate,
+                startDate: startDate,
                 product_id: relationDetail.product_id
               }, {
                 surchargeConfig: surchargeConfig,
@@ -1039,7 +1027,9 @@ export var getSurcharge = function getSurcharge(_ref11, options) {
       try {
         for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
           var _item = _step8.value;
-          if (isProductMatchSurchargeCondition(_item, {
+          if (isProductMatchSurchargeCondition(_objectSpread(_objectSpread({}, _item), {}, {
+            startDate: startDate
+          }), {
             surchargeConfig: surchargeConfig,
             scheduleById: scheduleById || {},
             isInScheduleByDate: isInScheduleByDate

package/dist/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/dist/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;
@@ -311,7 +310,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/dist/solution/BookingByStep/index.js

@@ -2552,14 +2552,63 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               var targetResourceTimes = allResources === null || allResources === void 0 || (_allResources$find = allResources.find(function (n) {
                 return n.id === resource.id;
               })) === null || _allResources$find === void 0 ? void 0 : _allResources$find.times;
+              // 找到最晚的 end_at 还没用，因为可能存在资源工作时间是 10:00-19:00，但是资源的 times 里有 16:30-19:00 被 block 的情况
+              // 所以还需要排除掉 block 时间
+              function getEarliestBlockedStartTime(_ref11) {
+                var _earliestBlockStart;
+                var currentStartTime = _ref11.currentStartTime,
+                  times = _ref11.times;
+                var currentStart = dayjs(currentStartTime);
+                var earliestBlockStart;
+                var _iterator3 = _createForOfIteratorHelper(times || []),
+                  _step3;
+                try {
+                  for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+                    var time = _step3.value;
+                    var _iterator4 = _createForOfIteratorHelper(time.event_list || []),
+                      _step4;
+                    try {
+                      for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+                        var event = _step4.value;
+                        var eventStart = dayjs(event.start_at);
+                        var eventEnd = dayjs(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;
+                          }
+                        }
+                      }
+                    } catch (err) {
+                      _iterator4.e(err);
+                    } finally {
+                      _iterator4.f();
+                    }
+                  }
+                } catch (err) {
+                  _iterator3.e(err);
+                } finally {
+                  _iterator3.f();
+                }
+                return (_earliestBlockStart = earliestBlockStart) === null || _earliestBlockStart === void 0 ? void 0 : _earliestBlockStart.format('YYYY-MM-DD HH:mm');
+              }
               var resourcesEndTime = targetResourceTimes.reduce(function (acc, curr) {
                 return dayjs(curr.end_at).isAfter(dayjs(acc.end_at)) ? curr : acc;
               }, targetResourceTimes[0]);
+              var earliestBlockedStartTime = getEarliestBlockedStartTime({
+                currentStartTime: currentStartTime,
+                times: targetResourceTimes
+              });
 
               // 将 operating_day_boundary 转换为与 resourcesEndTime.end_at 相同日期的完整日期时间
               var resourceDate = dayjs(resourcesEndTime.end_at).format('YYYY-MM-DD');
               var operatingBoundaryDateTime = "".concat(resourceDate, " ").concat(operating_day_boundary.type === 'start_time' ? '23:59' : operating_day_boundary.time);
-              var endTime = dayjs(resourcesEndTime.end_at).isBefore(dayjs(operatingBoundaryDateTime)) ? resourcesEndTime.end_at : operatingBoundaryDateTime;
+              var endTimeCandidates = [resourcesEndTime.end_at, operatingBoundaryDateTime].concat(_toConsumableArray(earliestBlockedStartTime ? [earliestBlockedStartTime] : []));
+              var endTime = endTimeCandidates.reduce(function (earliest, value) {
+                return dayjs(value).isBefore(dayjs(earliest)) ? value : earliest;
+              }, endTimeCandidates[0]);
               // 修复：如果 endTime 只是时间格式（如 "17:00"），需要加上日期
               var formattedEndTime;
               if (typeof endTime === 'string' && endTime.includes(':') && !endTime.includes(' ') && !endTime.includes('T')) {
@@ -2700,14 +2749,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     // 通过商品和 schedule 来获取视频可用的时间片、时间片内资源可用的数据
   }, {
     key: "getTimeslotBySchedule",
-    value: function getTimeslotBySchedule(_ref11) {
+    value: function getTimeslotBySchedule(_ref12) {
       var _this$store$currentPr2,
         _targetProductData$pr,
         _this15 = this;
-      var date = _ref11.date,
-        scheduleIds = _ref11.scheduleIds,
-        resources = _ref11.resources,
-        product = _ref11.product;
+      var date = _ref12.date,
+        scheduleIds = _ref12.scheduleIds,
+        resources = _ref12.resources,
+        product = _ref12.product;
       var targetProduct = this.store.currentProduct;
       // 如果外面传递了product 优先用外面的
       var targetProductData = product || targetProduct;
@@ -3266,12 +3315,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             // 检查资源类型（单个预约 vs 多个预约）
             // 从商品配置中获取资源类型信息
             var resourceTypeConfig = null;
-            var _iterator3 = _createForOfIteratorHelper(items),
-              _step3;
+            var _iterator5 = _createForOfIteratorHelper(items),
+              _step5;
             try {
-              for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+              for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
                 var _cartItem$_productOri12;
-                var cartItem = _step3.value;
+                var cartItem = _step5.value;
                 if ((_cartItem$_productOri12 = cartItem._productOrigin) !== null && _cartItem$_productOri12 !== void 0 && (_cartItem$_productOri12 = _cartItem$_productOri12.product_resource) !== null && _cartItem$_productOri12 !== void 0 && _cartItem$_productOri12.resources) {
                   resourceTypeConfig = cartItem._productOrigin.product_resource.resources.find(function (r) {
                     return r.code === resourceCode && r.status === 1;
@@ -3280,9 +3329,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 }
               }
             } catch (err) {
-              _iterator3.e(err);
+              _iterator5.e(err);
             } finally {
-              _iterator3.f();
+              _iterator5.f();
             }
             var isMultipleBooking = ((_resourceTypeConfig = resourceTypeConfig) === null || _resourceTypeConfig === void 0 ? void 0 : _resourceTypeConfig.type) === 'multiple';
             var totalAvailable;
@@ -3485,17 +3534,17 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
      */
   }, {
     key: "convertProductToCartItem",
-    value: function convertProductToCartItem(_ref12) {
-      var product = _ref12.product,
-        date = _ref12.date,
-        account = _ref12.account;
-      var _ref13 = product || {},
-        bundle = _ref13.bundle,
-        options = _ref13.options,
-        origin = _ref13.origin,
-        product_variant_id = _ref13.product_variant_id,
-        _ref13$quantity = _ref13.quantity,
-        quantity = _ref13$quantity === void 0 ? 1 : _ref13$quantity;
+    value: function convertProductToCartItem(_ref13) {
+      var product = _ref13.product,
+        date = _ref13.date,
+        account = _ref13.account;
+      var _ref14 = product || {},
+        bundle = _ref14.bundle,
+        options = _ref14.options,
+        origin = _ref14.origin,
+        product_variant_id = _ref14.product_variant_id,
+        _ref14$quantity = _ref14.quantity,
+        quantity = _ref14$quantity === void 0 ? 1 : _ref14$quantity;
 
       // 处理商品数据，类似 addProductToCart 中的逻辑
       var productData = _objectSpread(_objectSpread({}, origin), {}, {
@@ -3550,11 +3599,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     }
   }, {
     key: "checkMaxDurationCapacityForDetailNums",
-    value: function checkMaxDurationCapacityForDetailNums(_ref14) {
+    value: function checkMaxDurationCapacityForDetailNums(_ref15) {
       var _this17 = this;
-      var product = _ref14.product,
-        date = _ref14.date,
-        account = _ref14.account;
+      var product = _ref15.product,
+        date = _ref15.date,
+        account = _ref15.account;
       var cartItems = this.store.cart.getItems().filter(function (item) {
         return !isNormalProduct(item._productOrigin);
       });
@@ -3699,12 +3748,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             // 检查资源类型（单个预约 vs 多个预约）
             // 从商品配置中获取资源类型信息
             var resourceTypeConfig = null;
-            var _iterator4 = _createForOfIteratorHelper(items),
-              _step4;
+            var _iterator6 = _createForOfIteratorHelper(items),
+              _step6;
             try {
-              for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+              for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
                 var _cartItem$_productOri15;
-                var cartItem = _step4.value;
+                var cartItem = _step6.value;
                 if ((_cartItem$_productOri15 = cartItem._productOrigin) !== null && _cartItem$_productOri15 !== void 0 && (_cartItem$_productOri15 = _cartItem$_productOri15.product_resource) !== null && _cartItem$_productOri15 !== void 0 && _cartItem$_productOri15.resources) {
                   resourceTypeConfig = cartItem._productOrigin.product_resource.resources.find(function (r) {
                     return r.code === resourceCode && r.status === 1;
@@ -3713,9 +3762,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 }
               }
             } catch (err) {
-              _iterator4.e(err);
+              _iterator6.e(err);
             } finally {
-              _iterator4.f();
+              _iterator6.f();
             }
             var isMultipleBooking = ((_resourceTypeConfig2 = resourceTypeConfig) === null || _resourceTypeConfig2 === void 0 ? void 0 : _resourceTypeConfig2.type) === 'multiple';
             var totalAvailable;
@@ -4086,12 +4135,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getTimeslotsScheduleByDateRange",
     value: (function () {
-      var _getTimeslotsScheduleByDateRange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(_ref15) {
+      var _getTimeslotsScheduleByDateRange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(_ref16) {
         var startDate, endDate, scheduleIds, resources, dates, currentDate, end, results, _i5, _dates, date;
         return _regeneratorRuntime().wrap(function _callee27$(_context28) {
           while (1) switch (_context28.prev = _context28.next) {
             case 0:
-              startDate = _ref15.startDate, endDate = _ref15.endDate, scheduleIds = _ref15.scheduleIds, resources = _ref15.resources;
+              startDate = _ref16.startDate, endDate = _ref16.endDate, scheduleIds = _ref16.scheduleIds, resources = _ref16.resources;
               console.log('appoimentBooking-session-date-getTimeslotsScheduleByDateRange', {
                 startDate: startDate,
                 endDate: endDate,

package/dist/solution/BookingTicket/index.d.ts

@@ -115,7 +115,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/dist/solution/Checkout/index.js

@@ -403,7 +403,6 @@ export var CheckoutImpl = /*#__PURE__*/function (_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 = item.is_charge_tax) !== null && _item$is_charge_tax !== void 0 ? _item$is_charge_tax : 0,
             // 若商品不含税，计算得到的税费，单位（元）
@@ -428,7 +427,6 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
             },
             product_bundle: item.product_bundle.map(function (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/dist/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/dist/solution/ShopDiscount/index.js

@@ -56,7 +56,6 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       originalDiscountList: [],
       currentBookingTime: "",
       filteredDiscountList: [],
-      orderTotalAmount: 0,
       bookingSubject: undefined
     };
     return _this;
@@ -289,14 +288,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
         return _setCustomer.apply(this, arguments);
       }
       return setCustomer;
-    }()
-  }, {
-    key: "setOriginTotalAmount",
-    value: function setOriginTotalAmount(amount) {
-      this.store.orderTotalAmount = amount;
-    }
-
-    // 设置holders
+    }() // 设置holders
   }, {
     key: "setHolders",
     value: function setHolders(holders) {
@@ -325,7 +317,6 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
           productList: productList,
           discountList: this.getDiscountList(),
           holders: this.store.holders || [],
-          orderTotalAmount: this.store.orderTotalAmount || 0,
           isFormSubject: ((_this$store$bookingSu = this.store.bookingSubject) === null || _this$store$bookingSu === void 0 ? void 0 : _this$store$bookingSu.type) === 'form'
         }, options) || {
           productList: productList,
@@ -467,7 +458,6 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 oldDiscountList: this.getDiscountList(),
                 newDiscountList: withScanList,
                 holders: this.store.holders || [],
-                orderTotalAmount: this.store.orderTotalAmount || 0,
                 isFormSubject: ((_this$store$bookingSu2 = this.store.bookingSubject) === null || _this$store$bookingSu2 === void 0 ? void 0 : _this$store$bookingSu2.type) === 'form'
               }) || {
                 isAvailable: false,
@@ -755,7 +745,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_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
               });
             case 4:
               goodPassList = _context9.sent;

package/dist/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/lib/index.d.ts

@@ -6,7 +6,6 @@ export * from './types';
 export * from './modules';
 export * from './plugins';
 export * from './solution';
-export * from './model';
 export { PisellOSCore } from './core';
 import PisellOSCore from './core';
 export default PisellOSCore;

package/lib/index.js

@@ -38,7 +38,6 @@ __reExport(src_exports, require("./types"), module.exports);
 __reExport(src_exports, require("./modules"), module.exports);
 __reExport(src_exports, require("./plugins"), module.exports);
 __reExport(src_exports, require("./solution"), module.exports);
-__reExport(src_exports, require("./model"), module.exports);
 var import_core = require("./core");
 var import_core2 = __toESM(require("./core"));
 var src_default = import_core2.default;
@@ -48,6 +47,5 @@ var src_default = import_core2.default;
   ...require("./types"),
   ...require("./modules"),
   ...require("./plugins"),
-  ...require("./solution"),
-  ...require("./model")
+  ...require("./solution")
 });

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

@@ -75,8 +75,6 @@ export interface CartItem {
     summaryTotal?: number | string;
     /** 商品原价总价，排除原始价格为0的场景 */
     origin_total?: number | string;
-    /** 基于 origin_total 乘以 商品数量的价格 */
-    summaryOriginTotal?: number | string;
     /** 商品数量 */
     num?: number;
     /** 商品图片 */

package/lib/modules/Cart/utils/cartProduct.js

@@ -90,14 +90,6 @@ var formatProductToCartItem = (params) => {
       num,
       discounts
     });
-    const origin_total = getProductTotalPrice({
-      product: cartItem._productInit || cartItem._productOrigin,
-      bundle,
-      options,
-      num,
-      discounts: []
-    });
-    cartItem.summaryOriginTotal = (origin_total || 0) * (num || 1);
     cartItem.image = product == null ? void 0 : product.cover;
     cartItem.like_status = "common";
     cartItem.duration = product == null ? void 0 : product.duration;
@@ -199,7 +191,6 @@ var getProductTotalPrice = (params) => {
         amount: currentValue.amount,
         tag: currentValue.type,
         par_value: currentValue.discount.percent,
-        config: currentValue.config,
         metadata: {
           discount_card_type: (_a = currentValue == null ? void 0 : currentValue.discount) == null ? void 0 : _a.discount_card_type
         }

package/lib/modules/Cart/utils/changePrice.js

@@ -60,6 +60,11 @@ async function updateAllCartItemPrice(cartItems, priceData, getProduct, updateCa
         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) {
           return {
             ...n,

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

@@ -22,6 +22,7 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
         with_discount_card: 0 | 1;
         customer_id: number;
         with_wallet_pass_holder: 0 | 1;
+        request_timezone: string;
     }): Promise<Discount[]>;
     batchSearch(code: string, customerId?: number): Promise<Discount[]>;
     filterEnabledDiscountList(discountList: Discount[]): Discount[];

package/lib/modules/Discount/index.js

@@ -111,7 +111,8 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
       relation_product: 1,
       with: ["extensionData", "customScheduleSnapshot", "holder.detail"],
       order_behavior_count: 1,
-      order_behavior_count_customer_id: customerId || 1
+      order_behavior_count_customer_id: customerId || 1,
+      request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
     });
     const resultDiscountList = this.filterEnabledDiscountList((result == null ? void 0 : result.data) || []) || [];
     return resultDiscountList;

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

@@ -25,8 +25,6 @@ interface Limitedrelationproductdata {
     product_ids: number[];
     product_collection_id: number[];
     package_sub_item_usage_rules?: PackageSubItemUsageRules;
-    filter: 0 | 1;
-    exclude_product_ids: number[];
 }
 interface ApplicableProductDetails {
     amount: string;
@@ -107,19 +105,6 @@ export interface Discount {
     isSelected?: boolean;
     isAvailable?: boolean;
     isUsed?: boolean;
-    config?: {
-        isAvailable?: boolean;
-        /** 最大抵扣金额 */
-        maxDeductionAmount?: number;
-        /** 每单最多使用张数 */
-        maxUsagePerOrder?: number;
-        /** 是否抵扣税费与附加费 */
-        deductTaxAndFee?: boolean;
-        /** 适用粒度（多商品共用） */
-        allowCrossProduct?: boolean;
-        /** 可用商品数量上限 */
-        applicableProductLimit?: number;
-    };
     applicableProductIds?: number[];
     applicableProductDetails: ApplicableProductDetails[];
     appliedProductDetails: ApplicableProductDetails[];

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

@@ -1,5 +1,5 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
-import { RequestPlugin, WindowPlugin } from '../../plugins';
+import { RequestPlugin } from '../../plugins';
 import { BaseModule } from '../BaseModule';
 import { PaymentModuleAPI, PaymentMethod, PaymentOrder, PaymentItem, PaymentItemInput, PaymentUpdateFields, PushOrderParams, CashPayment, EftposPayment, WalletPassPayment, RoundingRule, RoundingInterval, RoundingResult } from './types';
 export * from './types';
@@ -21,7 +21,6 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
     request: RequestPlugin;
     private app;
     private store;
-    window: WindowPlugin;
     private dbManager;
     private logger;
     protected otherParams: any;

package/lib/modules/Payment/index.js

@@ -70,7 +70,6 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
     this.otherParams = options.otherParams || {};
     this.request = core.getPlugin("request");
     const appPlugin = core.getPlugin("app");
-    this.window = core.getPlugin("window");
     if (!this.request) {
       throw new Error("支付模块需要 request 插件支持");
     }

package/lib/modules/Payment/utils.js

@@ -25,9 +25,6 @@ __export(utils_exports, {
 });
 module.exports = __toCommonJS(utils_exports);
 var getAvailableMaxAmount = (data) => {
-  if (typeof data._available_max_amount === "number") {
-    return data._available_max_amount;
-  }
   return data.tag !== "point_card" ? data.available_max_amount : data == null ? void 0 : data.recommended_usage_amount;
 };
 var formatWalletPassList2PreparePayments = (list) => {