@pisell/pisellos 0.0.127 → 0.0.129

package/dist/solution/BookingByStep/utils/resources.d.ts

@@ -79,7 +79,7 @@ export declare const formatResources: ({ booking, resources, }: {
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getTimeSlicesByResource: ({ resource, duration, split, currentDate, capacity, resourcesUseableMap, cut_off_time, }: {
+export declare const getTimeSlicesByResource: ({ resource, duration, split, currentDate, capacity, resourcesUseableMap, cut_off_time, hasFlexibleDuration, operating_day_boundary }: {
     resource: ResourceItem;
     duration: number;
     split: number;
@@ -96,6 +96,8 @@ export declare const getTimeSlicesByResource: ({ resource, duration, split, curr
             unit: number;
         } | undefined;
     } | undefined;
+    hasFlexibleDuration?: boolean | undefined;
+    operating_day_boundary?: string | undefined;
 }) => TimeSliceItem[];
 /**
  * @title: 获取时间切片列表的交集
@@ -133,7 +135,7 @@ export declare const mergeSubResourcesTimeSlices: (resources: ResourceItem[], re
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, duration, currentDate, split, capacity, resourcesUseableMap, cut_off_time, }: {
+export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, duration, currentDate, split, capacity, resourcesUseableMap, cut_off_time, hasFlexibleDuration, operating_day_boundary }: {
     resourceIds: number[];
     resourcesMap: any;
     duration: number;
@@ -151,6 +153,8 @@ export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, dur
             unit: number;
         } | undefined;
     } | undefined;
+    hasFlexibleDuration?: boolean | undefined;
+    operating_day_boundary?: string | undefined;
 }) => any[];
 /**
  * @title: 获取其他人的已选资源

package/dist/solution/BookingByStep/utils/resources.js

@@ -415,7 +415,9 @@ export var getTimeSlicesByResource = function getTimeSlicesByResource(_ref5) {
     capacity = _ref5.capacity,
     _ref5$resourcesUseabl = _ref5.resourcesUseableMap,
     resourcesUseableMap = _ref5$resourcesUseabl === void 0 ? {} : _ref5$resourcesUseabl,
-    cut_off_time = _ref5.cut_off_time;
+    cut_off_time = _ref5.cut_off_time,
+    hasFlexibleDuration = _ref5.hasFlexibleDuration,
+    operating_day_boundary = _ref5.operating_day_boundary;
   var times = resource.times;
 
   // 存储所有时间切片
@@ -424,7 +426,7 @@ export var getTimeSlicesByResource = function getTimeSlicesByResource(_ref5) {
   // 处理每个时间范围
   times.forEach(function (time) {
     // 创建今天的日期字符串，用于构建完整的日期时间
-    var today = dayjs(currentDate).format('YYYY-MM-DD');
+    // const today = dayjs(currentDate).format('YYYY-MM-DD');
 
     // 解析开始和结束时间
     var startTime = dayjs("".concat(time.start_at));
@@ -460,6 +462,10 @@ export var getTimeSlicesByResource = function getTimeSlicesByResource(_ref5) {
         resourcesUseableMap[resource.id] = _status.usable;
       }
       if (_status.usable) {
+        // 如果有hasFlexibleDuration，且timeSlice.start_at 大于等于operating_day_boundary，则不添加时间切片
+        if (hasFlexibleDuration && operating_day_boundary && timeSlice.start_time >= operating_day_boundary) {
+          break;
+        }
         // 添加时间切片  09:00 ~ 10:00   09:20 ~ 10:20   09:00 ~ 10:00   09:20 ~ 10:20  11:00 ~ 12:00   11:20 ~ 12:20
         timeSlices.push(_objectSpread(_objectSpread({}, timeSlice), {}, {
           // 这里需要补充这个时间段内是否可预约
@@ -565,7 +571,9 @@ export var getTimeSlicesByResources = function getTimeSlicesByResources(_ref6) {
     split = _ref6.split,
     capacity = _ref6.capacity,
     resourcesUseableMap = _ref6.resourcesUseableMap,
-    cut_off_time = _ref6.cut_off_time;
+    cut_off_time = _ref6.cut_off_time,
+    hasFlexibleDuration = _ref6.hasFlexibleDuration,
+    operating_day_boundary = _ref6.operating_day_boundary;
   // 获取资源列表
   var resources = getResourcesByIds(resourcesMap, resourceIds);
   mergeSubResourcesTimeSlices(resources, resourcesMap);
@@ -588,7 +596,9 @@ export var getTimeSlicesByResources = function getTimeSlicesByResources(_ref6) {
       currentDate: currentDate,
       capacity: capacity,
       resourcesUseableMap: resourcesUseableMap,
-      cut_off_time: cut_off_time
+      cut_off_time: cut_off_time,
+      hasFlexibleDuration: hasFlexibleDuration,
+      operating_day_boundary: operating_day_boundary
     }));
   }, []);
 

package/dist/solution/ShopDiscount/index.js

@@ -1,7 +1,5 @@
-var _excluded = ["wallet_pass_list"];
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+function _objectDestructuringEmpty(obj) { if (obj == null) throw new TypeError("Cannot destructure " + obj); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -196,7 +194,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
         _this2.loadPrepareConfig({
           customerId: customer.id,
           action: 'create',
-          with_good_pass: 1
+          with_good_pass: 1,
+          with_discount_card: 1
         });
       });
     }
@@ -473,14 +472,14 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "getCustomerWallet",
     value: function () {
       var _getCustomerWallet = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(id) {
-        var result, _result$data, wallet_pass_list, customer;
+        var result, customer;
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
               _context7.prev = 0;
               _context7.next = 3;
-              return this.request.get("/customer/info/wallet/".concat(id), {
-                wallet_pass_tags: ['good_pass']
+              return this.request.get("/customer/info/".concat(id), {
+                with_trashed: 1
               });
             case 3:
               result = _context7.sent;
@@ -488,7 +487,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 _context7.next = 9;
                 break;
               }
-              _result$data = result.data, wallet_pass_list = _result$data.wallet_pass_list, customer = _objectWithoutProperties(_result$data, _excluded);
+              customer = Object.assign({}, (_objectDestructuringEmpty(result.data), result.data));
               this.setCustomer(customer);
               _context7.next = 9;
               return this.core.effects.emit(ShopDiscountHooks.onScanCustomerChange, customer);
@@ -526,7 +525,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               return (_this$store$discount7 = this.store.discount) === null || _this$store$discount7 === void 0 ? void 0 : _this$store$discount7.loadPrepareConfig({
                 customer_id: customerId,
                 action: 'create',
-                with_good_pass: 1
+                with_good_pass: 1,
+                with_discount_card: 1
               });
             case 4:
               goodPassList = _context8.sent;

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

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

package/lib/modules/Date/index.js

@@ -125,6 +125,12 @@ var DateModule = class extends import_BaseModule.BaseModule {
       });
     }
   }
+  getResourcesListByDate(date) {
+    var _a;
+    const dateList = this.store.dateList;
+    const resourcesList = (_a = dateList.find((item) => item.date === date)) == null ? void 0 : _a.resource;
+    return resourcesList;
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -17,6 +17,7 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
     loadPrepareConfig(params: {
         action?: 'create';
         with_good_pass: 0 | 1;
+        with_discount_card: 0 | 1;
         customer_id: number;
     }): Promise<Discount[]>;
     batchSearch(code: string): Promise<Discount[]>;

package/lib/modules/Discount/index.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/modules/Discount/index.ts
@@ -25,6 +35,7 @@ module.exports = __toCommonJS(Discount_exports);
 var import_utils = require("../../solution/ShopDiscount/utils");
 var import_BaseModule = require("../BaseModule");
 var import_types = require("./types");
+var import_decimal = __toESM(require("decimal.js"));
 var DiscountModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -68,21 +79,22 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
     return this.store.discountList;
   }
   async loadPrepareConfig(params) {
-    var _a;
+    var _a, _b;
     const prepareConfig = await this.request.post(
       `/order/prepare/config`,
       params
     );
     const goodPassList = this.filterEnabledDiscountList(
-      ((_a = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _a.good_pass_list) || []
+      [...((_a = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _a.good_pass_list) || [], ...((_b = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _b.discount_card_list) || []]
     ) || [];
+    this.setDiscountList(goodPassList);
     return goodPassList;
   }
   async batchSearch(code) {
     const result = await this.request.get(`/machinecode/batch-search`, {
       code,
       translate_flag: 1,
-      tag: "good_pass",
+      tags: ["good_pass", "product_discount_card"],
       available: 1,
       relation_product: 1
     });
@@ -91,7 +103,7 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
   }
   filterEnabledDiscountList(discountList) {
     return discountList.filter(
-      (discount) => discount.limit_status === "enable" && Number((discount == null ? void 0 : discount.par_value) || 0) - Number((discount == null ? void 0 : discount.used_par_value) || 0) > 0
+      (discount) => discount.limit_status === "enable" && new import_decimal.default((discount == null ? void 0 : discount.par_value) || 0).minus(new import_decimal.default((discount == null ? void 0 : discount.used_par_value) || 0)).greaterThan(0)
     );
   }
   // 根据productIds去重
@@ -110,8 +122,8 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
     }
     if (discount.appliedProductDetails) {
       return discount.appliedProductDetails.reduce((total, product) => {
-        const price = Number(product == null ? void 0 : product.amount) || 0;
-        return total + price;
+        const price = new import_decimal.default((product == null ? void 0 : product.amount) || 0);
+        return new import_decimal.default(total).plus(price).toNumber();
       }, 0);
     }
   }

package/lib/modules/Rules/index.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/modules/Rules/index.ts
@@ -26,6 +36,7 @@ var import_BaseModule = require("../BaseModule");
 var import_types = require("./types");
 var import_utils = require("../../solution/ShopDiscount/utils");
 var import_utils2 = require("../Cart/utils");
+var import_decimal = __toESM(require("decimal.js"));
 var RulesModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -107,19 +118,36 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       return !discount.isManualSelect;
     });
     const sortedDiscountList = [...filteredDiscountList].sort((a, b) => {
-      if (a.expire_time && b.expire_time) {
-        const timeA = new Date(a.expire_time).getTime();
-        const timeB = new Date(b.expire_time).getTime();
-        return timeA - timeB;
+      if (a.tag === "good_pass" && b.tag !== "good_pass")
+        return -1;
+      if (b.tag === "good_pass" && a.tag !== "good_pass")
+        return 1;
+      if (a.tag === "good_pass" && b.tag === "good_pass") {
+        return compareByExpireTime(a, b);
+      } else if (a.tag === "product_discount_card" && b.tag === "product_discount_card") {
+        if (a.par_value !== b.par_value) {
+          const valueA = new import_decimal.default(a.par_value || 0);
+          const valueB = new import_decimal.default(b.par_value || 0);
+          return valueA.minus(valueB).toNumber();
+        }
+        return compareByExpireTime(a, b);
+      }
+      return compareByExpireTime(a, b);
+      function compareByExpireTime(itemA, itemB) {
+        if (itemA.expire_time && itemB.expire_time) {
+          const timeA = new Date(itemA.expire_time).getTime();
+          const timeB = new Date(itemB.expire_time).getTime();
+          return timeA - timeB;
+        }
+        return itemA.expire_time ? -1 : itemB.expire_time ? 1 : 0;
       }
-      return a.expire_time ? -1 : b.expire_time ? 1 : 0;
     });
     const sortedProductList = [...productList].sort((a, b) => {
       const aProduct = this.hooks.getProduct(a);
       const bProduct = this.hooks.getProduct(b);
-      const priceA = parseFloat(aProduct.price || "0");
-      const priceB = parseFloat(bProduct.price || "0");
-      return priceB - priceA;
+      const priceA = new import_decimal.default(aProduct.price || "0");
+      const priceB = new import_decimal.default(bProduct.price || "0");
+      return priceB.minus(priceA).toNumber();
     });
     const usedDiscounts = /* @__PURE__ */ new Map();
     const discountApplicability = /* @__PURE__ */ new Map();
@@ -146,7 +174,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             discount: {
               resource_id: discount.id,
               title: discount.format_title,
-              original_amount: product.origin_total
+              original_amount: product.origin_total,
+              pre_value: discount.par_value
             }
           });
           discountApplicableProducts.set(discount.id, applicableProducts);
@@ -220,14 +249,16 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       }
       usedDiscounts.set(selectedDiscount.id, true);
       const appliedProducts = appliedDiscountProducts.get(selectedDiscount.id) || [];
+      const targetProductPrice = selectedDiscount.tag === "good_pass" ? "0" : new import_decimal.default(selectedDiscount.par_value || 0).div(100).mul(new import_decimal.default(product.price || 0)).toFixed(2);
       const discountDetail = {
-        amount: product.price,
-        type: selectedDiscount.tag,
+        amount: selectedDiscount.tag === "product_discount_card" ? new import_decimal.default(product.price || 0).minus(new import_decimal.default(targetProductPrice)).toNumber() : product.price,
+        type: selectedDiscount.tag === "product_discount_card" ? "discount_card" : selectedDiscount.tag,
         discount: {
           resource_id: selectedDiscount.id,
           title: selectedDiscount.format_title,
-          original_amount: product.origin_total,
-          product_id: selectedDiscount.product_id
+          original_amount: product.price,
+          product_id: selectedDiscount.product_id,
+          percent: selectedDiscount.par_value
         }
       };
       appliedProducts.push(discountDetail);
@@ -237,7 +268,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           product._id,
           this.hooks.setProduct(originProduct, {
             discount_list: [discountDetail],
-            price: 0,
+            price: new import_decimal.default(targetProductPrice).toNumber(),
             origin_total: (0, import_utils2.getProductOriginTotalPrice)({
               product: {
                 original_price: product.original_price
@@ -247,7 +278,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             }),
             total: (0, import_utils2.getProductTotalPrice)({
               product: {
-                price: "0"
+                price: targetProductPrice
               },
               bundle: product.bundle,
               options: product.options
@@ -259,8 +290,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           product._id,
           this.hooks.setProduct(originProduct, {
             discount_list: [discountDetail],
-            price: 0,
-            total: (product.origin_total || product.total) - product.price,
+            price: new import_decimal.default(targetProductPrice).toNumber(),
+            total: new import_decimal.default(product.origin_total || product.total || 0).minus(new import_decimal.default(product.price || 0)).toNumber(),
             origin_total: product.origin_total || product.total
           })
         );