@pisell/pisellos 3.0.66 → 3.0.67

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

@@ -15,8 +15,9 @@ export declare const formatDefaultCapacitys: ({ capacity, product_bundle, }: any
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getSumCapacity: ({ capacity }: {
+export declare const getSumCapacity: ({ capacity, num }: {
     capacity: CapacityItem[];
+    num: number;
 }) => number;
 /**
  * 给定购物车数据，返回对应的 capacity 信息和套餐 capacity
@@ -67,4 +68,8 @@ export declare function getResourcesIdsByProduct(product: any): number[];
 /**
  * 检查特定时间段的容量是否足够
  */
-export declare function checkTimeSlotCapacity(timeSlotStart: string, timeSlotEnd: string, cartItems: CartItem[], allResources: ResourceItem[]): boolean;
+export declare function checkTimeSlotCapacity(timeSlotStart: string, timeSlotEnd: string, cartItems: CartItem[], allResources: ResourceItem[]): {
+    success: boolean;
+    required: number;
+    available: number;
+};

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

@@ -60,7 +60,9 @@ export var formatDefaultCapacitys = function formatDefaultCapacitys(_ref) {
  * @Author: zhiwei.Wang
  */
 export var getSumCapacity = function getSumCapacity(_ref2) {
-  var capacity = _ref2.capacity;
+  var capacity = _ref2.capacity,
+    _ref2$num = _ref2.num,
+    num = _ref2$num === void 0 ? 1 : _ref2$num;
   var sum = 0;
   var _iterator = _createForOfIteratorHelper(capacity || []),
     _step;
@@ -74,7 +76,7 @@ export var getSumCapacity = function getSumCapacity(_ref2) {
   } finally {
     _iterator.f();
   }
-  return sum;
+  return sum * num;
 };
 
 /**
@@ -91,7 +93,8 @@ export function getCapacityInfoByCartItem(targetCartItem) {
     product_bundle: targetCartItem._origin.product.product_bundle
   });
   var currentCapacity = getSumCapacity({
-    capacity: formatCapacity
+    capacity: formatCapacity,
+    num: (targetCartItem === null || targetCartItem === void 0 ? void 0 : targetCartItem.num) || 1
   });
   return {
     formatCapacity: formatCapacity,
@@ -262,7 +265,7 @@ export function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, all
       if (needsThisResourceType) {
         // 需要判断是单个预约还是多个预约，如果是单个预约，不用加 capacity，只用+1
         if (selectType === 'single') {
-          requiredCapacityByType[formId] = (requiredCapacityByType[formId] || 0) + 1;
+          requiredCapacityByType[formId] = (requiredCapacityByType[formId] || 0) + ((cartItem === null || cartItem === void 0 ? void 0 : cartItem.num) || 1);
         } else {
           requiredCapacityByType[formId] = (requiredCapacityByType[formId] || 0) + currentCapacity;
         }
@@ -327,7 +330,11 @@ export function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, all
         if (totalAvailableCapacity < requiredCapacity) {
           console.log("\u8D44\u6E90\u7C7B\u578B ".concat(formId, " \u5BB9\u91CF\u4E0D\u8DB3: \u9700\u8981 ").concat(requiredCapacity, ", \u53EF\u7528 ").concat(totalAvailableCapacity));
           return {
-            v: false
+            v: {
+              success: false,
+              required: requiredCapacity,
+              available: totalAvailableCapacity
+            }
           };
         }
       } else {
@@ -336,7 +343,8 @@ export function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, all
         resourcesInType.forEach(function (resource) {
           // 过滤出在时间段内的资源时间片
           var availableTimes = resource.times.filter(function (time) {
-            return !dayjs(time.start_at).isAfter(dayjs(timeSlotStart), 'minute') && !dayjs(time.end_at).isBefore(dayjs(timeSlotEnd), 'minute') || dayjs(time.start_at).isBefore(dayjs(timeSlotEnd), 'minute') && dayjs(time.end_at).isAfter(dayjs(timeSlotStart), 'minute');
+            var _time$event_list;
+            return !dayjs(time.start_at).isAfter(dayjs(timeSlotStart), 'minute') && !dayjs(time.end_at).isBefore(dayjs(timeSlotEnd), 'minute') || dayjs(time.start_at).isBefore(dayjs(timeSlotEnd), 'minute') && dayjs(time.end_at).isAfter(dayjs(timeSlotStart), 'minute') && ((_time$event_list = time.event_list) === null || _time$event_list === void 0 ? void 0 : _time$event_list.length) === 0;
           });
           if (availableTimes.length > 0) {
             availableResourceCount++;
@@ -346,7 +354,11 @@ export function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, all
         if (availableResourceCount < requiredCapacity) {
           console.log("\u8D44\u6E90\u7C7B\u578B ".concat(formId, " \u6570\u91CF\u4E0D\u8DB3: \u9700\u8981 ").concat(requiredCapacity, ", \u53EF\u7528 ").concat(availableResourceCount));
           return {
-            v: false
+            v: {
+              success: false,
+              required: requiredCapacity,
+              available: availableResourceCount
+            }
           };
         }
       }
@@ -357,5 +369,9 @@ export function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, all
     if (_ret === 0) continue;
     if (_ret) return _ret.v;
   }
-  return true;
+  return {
+    success: true,
+    required: 0,
+    available: 0
+  };
 }

package/dist/solution/ShopDiscount/index.js

@@ -305,7 +305,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "scanCode",
     value: function () {
       var _scanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(code, customerId) {
-        var _this$store$discount3, resultDiscountList, rulesModule, withScanList, _ref3, newProductList, newDiscountList, isAvailable, _this$options$otherPa6;
+        var _this$store$discount3, resultDiscountList, rulesModule, withScanList, currentSelectedDiscountList, _ref3, newProductList, newDiscountList, isAvailable, _this$options$otherPa6;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -348,7 +348,25 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 return _objectSpread(_objectSpread({}, item), {}, {
                   isScan: true
                 });
+              }); // 如果扫回来的券当前有选中的，则不进行计算
+              currentSelectedDiscountList = this.getDiscountList().filter(function (n) {
+                return n.isSelected;
               });
+              if (!(currentSelectedDiscountList.length && currentSelectedDiscountList.some(function (n) {
+                return withScanList.some(function (m) {
+                  return m.id === n.id;
+                });
+              }))) {
+                _context5.next = 16;
+                break;
+              }
+              return _context5.abrupt("return", {
+                type: "clientCalc",
+                isAvailable: true,
+                productList: this.store.productList || [],
+                discountList: this.getDiscountList()
+              });
+            case 16:
               _ref3 = rulesModule.isDiscountListAvailable({
                 productList: this.store.productList || [],
                 oldDiscountList: this.getDiscountList(),
@@ -359,26 +377,26 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 discountList: this.getDiscountList()
               }, newProductList = _ref3.productList, newDiscountList = _ref3.discountList, isAvailable = _ref3.isAvailable;
               if (!isAvailable) {
-                _context5.next = 20;
+                _context5.next = 23;
                 break;
               }
               this.setDiscountList(newDiscountList || []);
               this.setProductList(newProductList || []);
               if (!(this.isWalkIn() && resultDiscountList.length && ((_this$options$otherPa6 = this.options.otherParams) === null || _this$options$otherPa6 === void 0 ? void 0 : _this$options$otherPa6.platform) === 'shop')) {
-                _context5.next = 20;
+                _context5.next = 23;
                 break;
               }
-              _context5.next = 20;
+              _context5.next = 23;
               return this.getCustomerWallet(resultDiscountList[0].customer_id);
-            case 20:
+            case 23:
               return _context5.abrupt("return", {
                 type: "clientCalc",
                 isAvailable: isAvailable || false,
                 productList: newProductList || this.store.productList || [],
                 discountList: newDiscountList || this.getDiscountList()
               });
-            case 23:
-              _context5.prev = 23;
+            case 26:
+              _context5.prev = 26;
               _context5.t1 = _context5["catch"](0);
               console.error('[ShopDiscount] 扫码出错:', _context5.t1);
               return _context5.abrupt("return", {
@@ -387,11 +405,11 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 productList: this.store.productList || [],
                 discountList: this.getDiscountList()
               });
-            case 27:
+            case 30:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[0, 23]]);
+        }, _callee5, this, [[0, 26]]);
       }));
       function scanCode(_x4, _x5) {
         return _scanCode.apply(this, arguments);

package/lib/modules/ProductList/index.js

@@ -89,11 +89,19 @@ var ProductList = class extends import_BaseModule.BaseModule {
         front_end_cache_id: cacheId,
         // client_schedule_ids: schedule_ids,
         schedule_date,
-        application_code: (_b = this.otherParams) == null ? void 0 : _b.channel
+        application_code: (_b = this.otherParams) == null ? void 0 : _b.channel,
+        is_eject: 1
       },
       { useCache: true }
     );
     const sortedList = (productsData.data.list || []).slice().sort((a, b) => Number(b.sort) - Number(a.sort));
+    if (sortedList.length) {
+      sortedList.forEach((n) => {
+        if (n.is_eject !== 1 && n["schedule.ids"] && n["schedule.ids"].length) {
+          n.is_eject = 1;
+        }
+      });
+    }
     this.addProduct(sortedList);
     return sortedList;
   }

package/lib/solution/BookingByStep/index.d.ts

@@ -324,6 +324,22 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         success: boolean;
         minAvailableCount: number;
     };
+    /**
+     * 将 ProductData 转换为 CartItem，但不添加到购物车
+     * 参考 addProductToCart 方法的实现
+     */
+    private convertProductToCartItem;
+    checkMaxDurationCapacityForDetailNums({ product, date, account, }: {
+        product: ProductData;
+        date?: {
+            startTime: string;
+            endTime: string;
+        } | null;
+        account?: Account | null;
+    }): {
+        success: boolean;
+        minAvailableCount: number;
+    };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
     getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;