@pisell/pisellos 3.0.78 → 3.0.80

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

@@ -146,6 +146,8 @@ export interface CartItem {
     _optionsOrigin?: any[];
     /** 操作系统提示 */
     osWarnTips?: string[];
+    /** 金额差值 */
+    totalDifference?: number;
 }
 /**
  * 购物车状态接口

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

@@ -13,6 +13,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import Decimal from 'decimal.js';
 import { isNormalProduct } from "../../Product/utils";
 import { getDiscountAmount } from "../../../solution/ShopDiscount/utils";
+import { calcDiscountListDifference } from "../../Summary/utils";
 
 /**
  * @title 处理组合商品
@@ -69,6 +70,11 @@ export var formatProductToCartItem = function formatProductToCartItem(params) {
       num: num,
       discounts: discounts
     });
+    cartItem.totalDifference = getTotalDifference({
+      product: product,
+      bundle: bundle,
+      discounts: discounts
+    });
     cartItem.summaryTotal = cartItem.total * (num || 1);
     cartItem.origin_total = getProductOriginTotalPrice({
       product: product,
@@ -218,6 +224,19 @@ export var getProductTotalPrice = function getProductTotalPrice(params) {
   }
   return Math.max(0, price);
 };
+var getTotalDifference = function getTotalDifference(params) {
+  var bundle = params.bundle,
+    discounts = params.discounts;
+  var bundleDiscountList = [];
+  if (bundle !== null && bundle !== void 0 && bundle.length) {
+    bundle.forEach(function (currentValue) {
+      bundleDiscountList.push.apply(bundleDiscountList, _toConsumableArray((currentValue === null || currentValue === void 0 ? void 0 : currentValue.discount_list) || []));
+    });
+  }
+  var allDiscounts = [].concat(_toConsumableArray(discounts || []), bundleDiscountList);
+  var productDiscountProductDiscountDifference = calcDiscountListDifference(allDiscounts);
+  return productDiscountProductDiscountDifference || 0;
+};
 
 /**
  * 获取商品原始总价
@@ -304,7 +323,8 @@ export var formatBundle = function formatBundle(bundle) {
       options: formatOptions(item === null || item === void 0 ? void 0 : item.option),
       _bundle_product_id: item._bundle_product_id,
       discount_list: item.discount_list,
-      originBundleItem: item.originBundleItem || item
+      originBundleItem: item.originBundleItem || item,
+      is_charge_tax: item === null || item === void 0 ? void 0 : item.is_charge_tax
     };
   });
 };

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

@@ -57,6 +57,12 @@ function _updateAllCartItemPrice() {
                       if (targetBundleItem.price_type === 'markdown') {
                         targetBundleItem.price = new Decimal(targetBundleItem.price || 0).mul(-1).toNumber();
                       }
+                      // 如果有选择 option，还需要加上 option 的价格
+                      if (n.option) {
+                        targetBundleItem.price = new Decimal(targetBundleItem.price || 0).add(n.option.reduce(function (pre, cur) {
+                          return pre + new Decimal(cur.price || 0).mul(cur.num || 1).toNumber();
+                        }, 0)).toNumber();
+                      }
                       if (targetBundleItem) {
                         return _objectSpread(_objectSpread({}, n), {}, {
                           price: targetBundleItem.price,

package/dist/modules/Date/index.d.ts

@@ -37,5 +37,5 @@ export declare class DateModule extends BaseModule implements Module, DateModule
     getResourceAvailableTimeList(params: IGetAvailableTimeListParams): Promise<ITime[]>;
     clearDateRange(): void;
     storeChange(): void;
-    getResourcesListByDate(date: string): any[] | undefined;
+    getResourcesListByDate(date: string): any[];
 }

package/dist/modules/Date/index.js

@@ -85,6 +85,14 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setDateRange",
     value: function setDateRange(dateRange) {
+      var _this2 = this;
+      // 如果 dateRange 传入的日期里没有 resource，但是本地有的，要尝试补充下
+      dateRange.forEach(function (item) {
+        var _item$resource;
+        if (!((_item$resource = item.resource) !== null && _item$resource !== void 0 && _item$resource.length)) {
+          item.resource = _this2.getResourcesListByDate(item.date);
+        }
+      });
       this.store.dateRange = dateRange;
     }
   }, {
@@ -157,10 +165,10 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
           return n.date === item.date;
         });
         if (currentItemIndex !== -1) {
-          var _item$resource, _currentItem$resource3;
+          var _item$resource2, _currentItem$resource3;
           var currentItem = currentDateList[currentItemIndex];
           // 看那一天的数据有没有相同的，把不同的资源合并进去即可
-          var newResource = (_item$resource = item.resource) === null || _item$resource === void 0 ? void 0 : _item$resource.filter(function (n) {
+          var newResource = (_item$resource2 = item.resource) === null || _item$resource2 === void 0 ? void 0 : _item$resource2.filter(function (n) {
             var _currentItem$resource2;
             return !((_currentItem$resource2 = currentItem.resource) !== null && _currentItem$resource2 !== void 0 && _currentItem$resource2.some(function (m) {
               return m.id === n.id;
@@ -168,8 +176,8 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
           });
           // 如果有相同的资源，则使用 item 中的新的resource.times，而不是 currentItem 中的
           (_currentItem$resource3 = currentItem.resource) === null || _currentItem$resource3 === void 0 || _currentItem$resource3.forEach(function (n) {
-            var _item$resource2;
-            var newResource = (_item$resource2 = item.resource) === null || _item$resource2 === void 0 ? void 0 : _item$resource2.find(function (m) {
+            var _item$resource3;
+            var newResource = (_item$resource3 = item.resource) === null || _item$resource3 === void 0 ? void 0 : _item$resource3.find(function (m) {
               return m.id === n.id;
             });
             if (newResource) {
@@ -261,7 +269,7 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "correctResourceTimeSlots",
     value: function correctResourceTimeSlots(resourcesData) {
-      var _this2 = this;
+      var _this3 = this;
       return resourcesData.map(function (resource) {
         // 检查资源是否有 times 数组和 start_time
         if (!resource.times || !Array.isArray(resource.times) || !resource.start_time) {
@@ -284,7 +292,7 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
           // 如果 start_at 早于资源的 start_time，需要修正
           if (startAt.isBefore(resourceStartTime)) {
             // 将 start_time 向上取整到下一个10分钟整数
-            var roundedStartTime = _this2.roundUpToNext10Minutes(resourceStartTime);
+            var roundedStartTime = _this3.roundUpToNext10Minutes(resourceStartTime);
             var roundedStartTimeDayjs = dayjs(roundedStartTime);
             console.log("[DateModule] \u4FEE\u6B63\u65F6\u95F4\u6BB5\u5F00\u59CB\u65F6\u95F4: ".concat(timeSlot.start_at, " -> ").concat(roundedStartTime, " (\u8D44\u6E90ID: ").concat(resource.id, ", \u539F\u59CBstart_time: ").concat(resource.start_time, ")"));
 
@@ -393,9 +401,9 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
     value: function getResourcesListByDate(date) {
       var _dateList$find;
       var dateList = this.store.dateList;
-      var resourcesList = (_dateList$find = dateList.find(function (item) {
+      var resourcesList = (dateList === null || dateList === void 0 || (_dateList$find = dateList.find(function (item) {
         return item.date === date;
-      })) === null || _dateList$find === void 0 ? void 0 : _dateList$find.resource;
+      })) === null || _dateList$find === void 0 ? void 0 : _dateList$find.resource) || [];
       return resourcesList;
     }
   }]);

package/dist/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/dist/modules/Discount/index.js

@@ -190,7 +190,8 @@ export var DiscountModule = /*#__PURE__*/function (_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
               });
             case 2:
               result = _context5.sent;

package/dist/modules/Rules/index.js

@@ -691,7 +691,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         // 收集该折扣卡适用的商品（排除被其他专属折扣卡占用的商品）
         var applicableProducts = [];
         sortedFlattenedList.forEach(function (flatItem) {
-          var _flatItem$parentProdu2, _product$price, _ref5, _flatItem$original_pr;
+          var _flatItem$parentProdu2, _flatItem$parentProdu3, _product$price, _ref5, _flatItem$original_pr;
           // 🔥 检查该商品是否被其他专属折扣卡占用
           var occupyingDiscountId = occupiedItems.get(flatItem._id);
           if (occupyingDiscountId !== undefined && occupyingDiscountId !== discount.id) {
@@ -715,7 +715,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
 
           // 对于 bundle 子商品，quantity 需要乘以主商品的购买数量
-          var quantity = flatItem.type === 'main' ? product.quantity || 1 : (product.num || 1) * (((_flatItem$parentProdu2 = flatItem.parentProduct) === null || _flatItem$parentProdu2 === void 0 ? void 0 : _flatItem$parentProdu2.quantity) || 1);
+          var quantity = flatItem.type === 'main' ? product.num || product.quantity || 1 : (product.num || product.quantity || 1) * (((_flatItem$parentProdu2 = flatItem.parentProduct) === null || _flatItem$parentProdu2 === void 0 ? void 0 : _flatItem$parentProdu2.num) || ((_flatItem$parentProdu3 = flatItem.parentProduct) === null || _flatItem$parentProdu3 === void 0 ? void 0 : _flatItem$parentProdu3.quantity) || 1);
 
           // 对于主商品：使用 price
           // 对于子商品：优先使用 flatItem.original_price，否则使用 flatItem.price
@@ -730,8 +730,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 子商品需要传递主商品数量
           if (flatItem.type === 'bundle') {
-            var _flatItem$parentProdu3;
-            productData.parentQuantity = ((_flatItem$parentProdu3 = flatItem.parentProduct) === null || _flatItem$parentProdu3 === void 0 ? void 0 : _flatItem$parentProdu3.quantity) || 1;
+            var _flatItem$parentProdu4;
+            productData.parentQuantity = ((_flatItem$parentProdu4 = flatItem.parentProduct) === null || _flatItem$parentProdu4 === void 0 ? void 0 : _flatItem$parentProdu4.quantity) || 1;
           }
           applicableProducts.push(productData);
         });
@@ -758,7 +758,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           product = flatItem.product;
           originProduct = flatItem.originProduct;
         } else {
-          var _flatItem$parentProdu4;
+          var _flatItem$parentProdu5;
           // bundle子商品：构造虚拟商品对象
           product = {
             _id: flatItem._id,
@@ -770,7 +770,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             origin_total: flatItem.origin_total,
             booking_id: flatItem.booking_id,
             discount_list: flatItem.discount_list || [],
-            startDate: (_flatItem$parentProdu4 = flatItem.parentProduct) === null || _flatItem$parentProdu4 === void 0 ? void 0 : _flatItem$parentProdu4.startDate
+            startDate: (_flatItem$parentProdu5 = flatItem.parentProduct) === null || _flatItem$parentProdu5 === void 0 ? void 0 : _flatItem$parentProdu5.startDate
           };
           originProduct = flatItem.originProduct;
         }
@@ -849,7 +849,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           product = flatItem.product;
           originProduct = flatItem.originProduct;
         } else {
-          var _flatItem$bundleItem5, _flatItem$bundleItem6, _flatItem$bundleItem7, _flatItem$parentProdu5;
+          var _flatItem$bundleItem5, _flatItem$bundleItem6, _flatItem$bundleItem7, _flatItem$parentProdu6;
           // bundle子商品
           product = {
             _id: flatItem._id,
@@ -862,7 +862,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             origin_total: flatItem === null || flatItem === void 0 || (_flatItem$bundleItem6 = flatItem.bundleItem) === null || _flatItem$bundleItem6 === void 0 ? void 0 : _flatItem$bundleItem6.original_price,
             booking_id: flatItem.booking_id,
             discount_list: (flatItem === null || flatItem === void 0 || (_flatItem$bundleItem7 = flatItem.bundleItem) === null || _flatItem$bundleItem7 === void 0 ? void 0 : _flatItem$bundleItem7.discount_list) || [],
-            startDate: (_flatItem$parentProdu5 = flatItem.parentProduct) === null || _flatItem$parentProdu5 === void 0 ? void 0 : _flatItem$parentProdu5.startDate
+            startDate: (_flatItem$parentProdu6 = flatItem.parentProduct) === null || _flatItem$parentProdu6 === void 0 ? void 0 : _flatItem$parentProdu6.startDate
           };
           originProduct = flatItem.originProduct;
         }
@@ -974,11 +974,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
           // bundle子商品：检查自己的 discount_list 或父主商品的 discount_list
           if (flatItem.type === 'bundle') {
-            var _product$discount_lis7, _flatItem$parentProdu6;
+            var _product$discount_lis7, _flatItem$parentProdu7;
             if ((_product$discount_lis7 = product.discount_list) !== null && _product$discount_lis7 !== void 0 && _product$discount_lis7.some(function (item) {
               var _item$discount2;
               return ((_item$discount2 = item.discount) === null || _item$discount2 === void 0 ? void 0 : _item$discount2.resource_id) === options.discountId;
-            }) || (_flatItem$parentProdu6 = flatItem.parentProduct) !== null && _flatItem$parentProdu6 !== void 0 && (_flatItem$parentProdu6 = _flatItem$parentProdu6.discount_list) !== null && _flatItem$parentProdu6 !== void 0 && _flatItem$parentProdu6.some(function (item) {
+            }) || (_flatItem$parentProdu7 = flatItem.parentProduct) !== null && _flatItem$parentProdu7 !== void 0 && (_flatItem$parentProdu7 = _flatItem$parentProdu7.discount_list) !== null && _flatItem$parentProdu7 !== void 0 && _flatItem$parentProdu7.some(function (item) {
               var _item$discount3;
               return ((_item$discount3 = item.discount) === null || _item$discount3 === void 0 ? void 0 : _item$discount3.resource_id) === options.discountId;
             })) {
@@ -1000,14 +1000,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
           // bundle子商品：检查自己的 discount_list 或父主商品的 discount_list
           if (flatItem.type === 'bundle') {
-            var _product$discount_lis9, _flatItem$parentProdu7;
+            var _product$discount_lis9, _flatItem$parentProdu8;
             if ((_product$discount_lis9 = product.discount_list) !== null && _product$discount_lis9 !== void 0 && _product$discount_lis9.some(function (item) {
               var _options$selectedList2;
               return options === null || options === void 0 || (_options$selectedList2 = options.selectedList) === null || _options$selectedList2 === void 0 ? void 0 : _options$selectedList2.some(function (n) {
                 var _item$discount5;
                 return n.discountId === ((_item$discount5 = item.discount) === null || _item$discount5 === void 0 ? void 0 : _item$discount5.resource_id);
               });
-            }) || (_flatItem$parentProdu7 = flatItem.parentProduct) !== null && _flatItem$parentProdu7 !== void 0 && (_flatItem$parentProdu7 = _flatItem$parentProdu7.discount_list) !== null && _flatItem$parentProdu7 !== void 0 && _flatItem$parentProdu7.some(function (item) {
+            }) || (_flatItem$parentProdu8 = flatItem.parentProduct) !== null && _flatItem$parentProdu8 !== void 0 && (_flatItem$parentProdu8 = _flatItem$parentProdu8.discount_list) !== null && _flatItem$parentProdu8 !== void 0 && _flatItem$parentProdu8.some(function (item) {
               var _options$selectedList3;
               return options === null || options === void 0 || (_options$selectedList3 = options.selectedList) === null || _options$selectedList3 === void 0 ? void 0 : _options$selectedList3.some(function (n) {
                 var _item$discount6;
@@ -1260,7 +1260,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               }));
             }
           } else {
-            var _selectedDiscount3$me, _selectedDiscount3$me2, _flatItem$parentProdu8;
+            var _selectedDiscount3$me, _selectedDiscount3$me2, _flatItem$parentProdu9;
             // 折扣卡：不拆分数量，直接应用
             var _selectedDiscount3 = selectedDiscountCard || applicableDiscounts[0];
             usedDiscounts.set(_selectedDiscount3.id, true);
@@ -1306,7 +1306,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               }, _productDiscountDifference !== undefined && {
                 product_discount_difference: _productDiscountDifference
               }),
-              _num: (product.num || 1) * ((flatItem === null || flatItem === void 0 || (_flatItem$parentProdu8 = flatItem.parentProduct) === null || _flatItem$parentProdu8 === void 0 ? void 0 : _flatItem$parentProdu8.num) || 1)
+              _num: (product.num || 1) * ((flatItem === null || flatItem === void 0 || (_flatItem$parentProdu9 = flatItem.parentProduct) === null || _flatItem$parentProdu9 === void 0 ? void 0 : _flatItem$parentProdu9.num) || 1)
             };
 
             // 记录实际应用的折扣

package/dist/modules/Schedule/getDateIsInSchedule.d.ts

@@ -0,0 +1,32 @@
+import dayjs from "dayjs";
+import { ScheduleItem } from "./types";
+export declare const getDateIsInSchedule: (dateTime: string, scheduleList: ScheduleItem[]) => boolean;
+export type ScheduleTimeSlot = {
+    /** 开始时间 HH:mm */
+    start_time: string;
+    /** 结束时间 HH:mm */
+    end_time: string;
+    /** 开始日期时间 YYYY-MM-DD HH:mm:ss */
+    start_at: dayjs.Dayjs;
+    /** 结束日期时间 YYYY-MM-DD HH:mm:ss */
+    end_at: dayjs.Dayjs;
+};
+/**
+ * 获取当前日期日程时间点
+ * @param date 日期 YYYY-MM-DD
+ * @param scheduleList 日程列表
+ * @returns 当前日期日程时间点 结构，数组 [{
+ *
+ *  // HH:mm
+ *  end_time: string,
+ *  // HH:mm
+ *  start_time: string,
+ *  // 日期时间
+ *  // YYYY-MM-DD HH:mm:ss
+ *  end_at: Dayjs,
+ *  // YYYY-MM-DD HH:mm:ss
+ *  start_at: Dayjs,
+ *
+ * }]
+ */
+export declare const getScheduleStartEndTimePoints: (date: string, scheduleList: ScheduleItem[]) => ScheduleTimeSlot[];