@pisell/pisellos 0.0.181 → 0.0.184

package/dist/modules/Rules/index.js

@@ -348,7 +348,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         });
 
         // 选择第一个适用的优惠券（已经按过期时间排序）
-        var selectedDiscount = applicableDiscounts[0];
+        // 如果有 isScan 且 isSelected 的折扣卡，则优先选中，否则再选择第一个
+        // 用于处理：先手动扫描了一张折扣卡，扫描完以后带入客户信息，但是之前那张折扣卡不是最优惠的情况
+        var selectedDiscountCard = applicableDiscounts.find(function (n) {
+          return n.isScan && n.isSelected && (n.tag || n.type) !== 'good_pass';
+        });
+        var selectedDiscount = selectedDiscountCard || applicableDiscounts[0];
 
         // 如果是手动折扣，则不适用优惠券
         var isManualDiscount = typeof product.isManualDiscount === 'boolean' ? product.isManualDiscount : product.total != product.origin_total && (!((_product$discount_lis6 = product.discount_list) !== null && _product$discount_lis6 !== void 0 && _product$discount_lis6.length) || (product === null || product === void 0 || (_product$discount_lis7 = product.discount_list) === null || _product$discount_lis7 === void 0 || (_product$discount_lis8 = _product$discount_lis7.every) === null || _product$discount_lis8 === void 0 ? void 0 : _product$discount_lis8.call(_product$discount_lis7, function (item) {
@@ -418,7 +423,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }));
         }
         for (var _i = 0; _i < splitCount; _i++) {
-          var _selectedDiscount = applicableDiscounts[_i];
+          // 如果用过折扣卡，也就不存在拆分的情况了，这里直接使用上面计算出来的折扣卡
+          var _selectedDiscount = selectedDiscountCard || applicableDiscounts[_i];
           // 标记优惠券为已使用
           usedDiscounts.set(_selectedDiscount.id, true);
 

package/dist/modules/Schedule/utils.js

@@ -140,7 +140,11 @@ var getDaysByRepeatWeek = function getDaysByRepeatWeek(params, isGetRange) {
     for (var i = 0; i < frequency_date.length; i++) {
       var item = frequency_date[i];
       var _start = startTmp.day(item);
+      // 如果周结束的那一天还超过了deadline，则需要把_end置为deadline
       var _end = _start.add(scheduleDiff, 'second');
+      if (_end.isAfter(deadline, 'day')) {
+        _end = deadline;
+      }
       if (isGetRange) {
         if (excludedDaysMap.has(_start.format('YYYY-MM-DD'))) {
           startTmp = startTmp.day(1).add(frequency, 'day');

package/dist/solution/BookingByStep/index.js

@@ -272,7 +272,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _loadProductByScheduleDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref2) {
         var _schedule$product_ids;
-        var date, _ref2$product_ids, product_ids, _ref2$category_ids, category_ids, scheduleList, schedule, otherProductsIds, allProductIds;
+        var date, _ref2$product_ids, product_ids, _ref2$category_ids, category_ids, scheduleList, newProductIds, schedule, otherProductsIds, allProductIds;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -289,27 +289,38 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 week: '',
                 weekNum: 0
               }]);
+              newProductIds = []; // const scheduleIds = scheduleList
+              //   .filter((n) => n.date === date)
+              //   .flatMap((n) => n.schedule_id)
+              //   .filter((n) => n !== null && n !== undefined);
+              // 如果外面没传 product_ids，尝试从对应 schedule 里拿 product_ids
+              // if (!product_ids?.length) {
+              //   const schedule = scheduleList.find((n) => n.date === date);
+              //   if (schedule && schedule.product_ids?.length) {
+              //     product_ids = schedule.product_ids;
+              //   }
+              // }
               // V2接口修改后，只能从schedule 接口里拿数据，不可以从外面拿，外面给的是装修数据
               schedule = scheduleList.find(function (n) {
                 return n.date === date;
               });
               if (schedule && (_schedule$product_ids = schedule.product_ids) !== null && _schedule$product_ids !== void 0 && _schedule$product_ids.length) {
-                product_ids = schedule.product_ids;
+                newProductIds = schedule.product_ids;
               }
               // 尝试去拿schedule 里的 other_product_ids 和 product_ids 拼在一起去重
               otherProductsIds = this.store.schedule.getOtherProductsIds() || [];
-              allProductIds = [].concat(_toConsumableArray(product_ids), _toConsumableArray(otherProductsIds)).filter(function (n, index, self) {
+              allProductIds = [].concat(_toConsumableArray(newProductIds), _toConsumableArray(otherProductsIds)).filter(function (n, index, self) {
                 return self.indexOf(n) === index;
               });
-              _context3.next = 9;
+              _context3.next = 10;
               return this.loadProducts({
                 product_ids: allProductIds,
                 category_ids: category_ids,
                 schedule_date: date
               });
-            case 9:
-              return _context3.abrupt("return", _context3.sent);
             case 10:
+              return _context3.abrupt("return", _context3.sent);
+            case 11:
             case "end":
               return _context3.stop();
           }

package/lib/modules/Rules/index.js

@@ -229,7 +229,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         }
         return false;
       });
-      const selectedDiscount = applicableDiscounts[0];
+      const selectedDiscountCard = applicableDiscounts.find((n) => n.isScan && n.isSelected && (n.tag || n.type) !== "good_pass");
+      const selectedDiscount = selectedDiscountCard || applicableDiscounts[0];
       let isManualDiscount = typeof product.isManualDiscount === "boolean" ? product.isManualDiscount : product.total != product.origin_total && (!((_c = product.discount_list) == null ? void 0 : _c.length) || ((_e = (_d = product == null ? void 0 : product.discount_list) == null ? void 0 : _d.every) == null ? void 0 : _e.call(_d, (item) => item.type === "product")));
       if ((options == null ? void 0 : options.discountId) && ((_f = product.discount_list) == null ? void 0 : _f.some((item) => {
         var _a2;
@@ -293,7 +294,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         }));
       }
       for (let i2 = 0; i2 < splitCount; i2++) {
-        const selectedDiscount2 = applicableDiscounts[i2];
+        const selectedDiscount2 = selectedDiscountCard || applicableDiscounts[i2];
         usedDiscounts.set(selectedDiscount2.id, true);
         const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
         const productOriginTotal = product.origin_total || product.total || 0;

package/lib/modules/Schedule/utils.js

@@ -140,7 +140,10 @@ var getDaysByRepeatWeek = (params, isGetRange) => {
     for (let i = 0; i < frequency_date.length; i++) {
       const item = frequency_date[i];
       const _start = startTmp.day(item);
-      const _end = _start.add(scheduleDiff, "second");
+      let _end = _start.add(scheduleDiff, "second");
+      if (_end.isAfter(deadline, "day")) {
+        _end = deadline;
+      }
       if (isGetRange) {
         if (excludedDaysMap.has(_start.format("YYYY-MM-DD"))) {
           startTmp = startTmp.day(1).add(frequency, "day");

package/lib/solution/BookingByStep/index.js

@@ -217,12 +217,13 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       { date, status: "available", week: "", weekNum: 0 },
       { date, status: "available", week: "", weekNum: 0 }
     ]);
+    let newProductIds = [];
     const schedule = scheduleList.find((n) => n.date === date);
     if (schedule && ((_a = schedule.product_ids) == null ? void 0 : _a.length)) {
-      product_ids = schedule.product_ids;
+      newProductIds = schedule.product_ids;
     }
     const otherProductsIds = this.store.schedule.getOtherProductsIds() || [];
-    const allProductIds = [...product_ids, ...otherProductsIds].filter(
+    const allProductIds = [...newProductIds, ...otherProductsIds].filter(
       (n, index, self) => self.indexOf(n) === index
     );
     return await this.loadProducts({

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.0.181",
+  "version": "0.0.184",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",