@pisell/pisellos 2.1.68 → 2.1.72

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

@@ -20,7 +20,9 @@ export interface ITime {
     date: string;
     week: string;
     weekNum: number;
-    status: 'unavailable' | 'available';
+    status: 'unavailable' | 'available' | 'lots_of_space' | 'filling_up_fast' | 'sold_out';
+    summaryCount?: number;
+    availableCount?: number;
     resource?: any[];
     color?: string[];
 }

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

package/dist/modules/Rules/index.js

@@ -108,7 +108,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       if (!product.isNeedHolder) return true;
       // 商品需要holder，但父预约及商品都无holder，返回false
       if (!orderHolderId && !productHolderId) return false;
-
       // 最终直接匹配 holder 是否相同
       return (productHolderId || orderHolderId) === discount.holder.holder_id;
     }
@@ -146,10 +145,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       }
 
       // 合并新旧折扣列表，并计算折扣结果,注意，如果旧折扣里有 isEditMode 为 true 的优惠券，则不合并
+      // 保留之前扫码得到的商品券（isScan: true）
       var filteredOldDiscountList = oldDiscountList.filter(function (discount) {
-        return !discount.isEditMode && discount.tag !== 'good_pass';
+        return !discount.isEditMode && (discount.tag !== 'good_pass' || discount.isScan);
       });
-      var mergedDiscountList = uniqueById(uniqueById([].concat(_toConsumableArray(filteredOldDiscountList), _toConsumableArray(newDiscountList))), 'product_id');
+      var mergedDiscountList = uniqueById([].concat(_toConsumableArray(filteredOldDiscountList), _toConsumableArray(newDiscountList)));
       var result = this.calcDiscount({
         discountList: mergedDiscountList,
         productList: _toConsumableArray(productList),

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

@@ -299,6 +299,16 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         errorList: any[];
     };
     getTimeSlotByAllResources(resources_code: string): any[];
+    getTimeSlotByAllResourcesForDate({ resources_code, startDate, endDate }: {
+        resources_code: string;
+        startDate: string;
+        endDate: string;
+    }): Promise<{
+        date: string;
+        status: string;
+        week: string;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+    }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
     openProductDetail(productId: number): Promise<void>;
@@ -316,6 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
+        status: keyof TimeStatusMap;
     }[];
     /**
      * 找到多个资源的公共可用时间段
@@ -343,7 +354,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *
@@ -380,3 +391,9 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     */
     getContactInfo(params: any): Promise<any>;
 }
+interface TimeStatusMap {
+    lots_of_space: true;
+    filling_up_fast: true;
+    sold_out: true;
+}
+export {};