@pisell/pisellos 0.0.121 → 0.0.123

package/dist/modules/Discount/index.js

@@ -122,7 +122,7 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
               return this.request.post("/order/prepare/config", params);
             case 2:
               prepareConfig = _context3.sent;
-              goodPassList = this.uniqueByProductId(this.filterEnabledDiscountList((prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data = prepareConfig.data) === null || _prepareConfig$data === void 0 ? void 0 : _prepareConfig$data.good_pass_list) || []) || []) || [];
+              goodPassList = this.filterEnabledDiscountList((prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data = prepareConfig.data) === null || _prepareConfig$data === void 0 ? void 0 : _prepareConfig$data.good_pass_list) || []) || [];
               return _context3.abrupt("return", goodPassList);
             case 5:
             case "end":
@@ -153,7 +153,7 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
               });
             case 2:
               result = _context4.sent;
-              resultDiscountList = this.uniqueByProductId(this.filterEnabledDiscountList((result === null || result === void 0 ? void 0 : result.data) || []) || []) || [];
+              resultDiscountList = this.filterEnabledDiscountList((result === null || result === void 0 ? void 0 : result.data) || []) || [];
               return _context4.abrupt("return", resultDiscountList);
             case 5:
             case "end":

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/solution/BookingByStep/index.d.ts

@@ -213,7 +213,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     }): void;
     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
      *

package/dist/solution/BookingByStep/index.js

@@ -238,7 +238,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               return this.request.post("/product/query", {
                 open_quotation: 1,
                 open_bundle: 0,
-                extension_type: ['product_appointment', 'appointment_ticket', 'session_product', 'session_ticket', 'normal'],
+                exclude_extension_type: ['product_party', 'product_event', 'product_series_event', 'product_package_ticket', 'ticket', 'event_item'],
                 with: ['category', 'collection', 'resourceRelation'],
                 status: 'published',
                 num: 500,
@@ -2403,7 +2403,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getTimeslotBySchedule",
     value: function getTimeslotBySchedule(_ref12) {
-      var _this$store$currentPr2;
+      var _this$store$currentPr2, _targetProductData$pr;
       var date = _ref12.date,
         scheduleIds = _ref12.scheduleIds,
         resources = _ref12.resources,
@@ -2442,6 +2442,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         return 0;
       });
 
+      // 找到当前商品下第一个启用的资源id
+      var firstEnabledResourceId = targetProductData === null || targetProductData === void 0 || (_targetProductData$pr = targetProductData.product_resource) === null || _targetProductData$pr === void 0 || (_targetProductData$pr = _targetProductData$pr.resources) === null || _targetProductData$pr === void 0 || (_targetProductData$pr = _targetProductData$pr.find(function (n) {
+        return n.status === 1;
+      })) === null || _targetProductData$pr === void 0 ? void 0 : _targetProductData$pr.id;
+
       // 计算每个日程切片下日程可用的资源的容量总和
       var formatScheduleTimeSlots = scheduleTimeSlots.map(function (item) {
         // 用来计算资源的可使用情况，针对单个schedule 时间片
@@ -2489,7 +2494,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           // 在已经选定时间的情况下，只要canUseTime如果有一个 false 那就不可用
           if (!currentResourcesTimeSlotCanUsedArr.some(function (n) {
             return n === false;
-          })) {
+          })
+          // 只统计第一种资源的容量和 left
+          && m.form_id === firstEnabledResourceId) {
             if (currentResourcesCount >= count) {
               count = currentResourcesCount;
             }
@@ -2881,7 +2888,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var _getAvailableDateForSessionOptimize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30() {
         var _this$store$currentPr3, _this$store$currentPr4, _this$store$currentPr5, _tempProducts, _this$store$currentPr6;
         var params,
-          cache,
           startDate,
           endDate,
           tempProducts,
@@ -2889,6 +2895,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           filteredSchedule,
           tempResourceIds,
           res,
+          cache,
           dates,
           currentDate,
           firstAvailableDate,
@@ -2901,21 +2908,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context32.prev = _context32.next) {
             case 0:
               params = _args32.length > 0 && _args32[0] !== undefined ? _args32[0] : {};
-              // 先去读缓存结果，因为正常 UI 调用的是 7 天，而下面我会直接计算 30 天（最少也是 14 天），所以先去读缓存结果，如果缓存结果存在，则直接返回
-              cache = (_this$store$currentPr3 = this.store.currentProduct) === null || _this$store$currentPr3 === void 0 ? void 0 : _this$store$currentPr3.getOtherParams()['timeSlotBySchedule'];
-              if (!cache) {
-                _context32.next = 5;
-                break;
-              }
-              if (!(dayjs(params.startDate).isSameOrAfter(dayjs(cache.startDate), 'day') && dayjs(params.endDate).isSameOrBefore(dayjs(cache.endDate), 'day'))) {
-                _context32.next = 5;
-                break;
-              }
-              return _context32.abrupt("return", {
-                dateList: cache.dateList,
-                firstAvailableDate: cache.firstAvailableDate
-              });
-            case 5:
               // 开始日期如果小于今天，直接以今天当做开始日期
               startDate = params.startDate, endDate = params.endDate; // 前端传递的 startDate，可能是今天之前的，如果 startDate 小于今天 且 endDate 小于或等于今天，需要把 startDate 置为今天
               if (dayjs(startDate).isBefore(dayjs(), 'day') && (dayjs(endDate).isAfter(dayjs(), 'day') || dayjs(endDate).isSame(dayjs(), 'day'))) {
@@ -2924,11 +2916,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               // 不管前端传什么 endDate 默认查一个月的，以今天为开始日期。用于找到一个月内最近可用的日期
               endDate = dayjs().add(1, 'month').format('YYYY-MM-DD');
               // 如果当前打开了某个的商品详情弹窗，则应该默认用这个商品
-              tempProducts = (_this$store$currentPr4 = this.store.currentProduct) === null || _this$store$currentPr4 === void 0 ? void 0 : _this$store$currentPr4.getData();
-              schedule = (_this$store$currentPr5 = this.store.currentProduct) === null || _this$store$currentPr5 === void 0 ? void 0 : _this$store$currentPr5.getOtherParams()['schedule'];
+              tempProducts = (_this$store$currentPr3 = this.store.currentProduct) === null || _this$store$currentPr3 === void 0 ? void 0 : _this$store$currentPr3.getData();
+              schedule = (_this$store$currentPr4 = this.store.currentProduct) === null || _this$store$currentPr4 === void 0 ? void 0 : _this$store$currentPr4.getOtherParams()['schedule'];
               filteredSchedule = filterScheduleByDateRange(schedule, startDate || '', endDate || ''); // 1.后端返回的数据，确定资源在每一天的可用和使用情况
               tempResourceIds = getResourcesIdsByProduct(tempProducts);
-              _context32.next = 14;
+              _context32.next = 10;
               return this.store.date.fetchResourceDates({
                 query: {
                   start_date: startDate || '',
@@ -2936,8 +2928,25 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   resource_ids: tempResourceIds
                 }
               });
-            case 14:
+            case 10:
               res = _context32.sent;
+              // 先去读缓存结果，因为正常 UI 调用的是 7 天，而下面我会直接计算 30 天（最少也是 14 天），所以先去读缓存结果，如果缓存结果存在，则直接返回
+              // TODO 优化关于为什么要放在接口后，因为在获取时间切片的时候还需要读一次接口数据，其实可以直接从这个结果里拿了，需要优化
+              cache = (_this$store$currentPr5 = this.store.currentProduct) === null || _this$store$currentPr5 === void 0 ? void 0 : _this$store$currentPr5.getOtherParams()['timeSlotBySchedule'];
+              if (!cache) {
+                _context32.next = 16;
+                break;
+              }
+              if (!(dayjs(params.startDate).isSameOrAfter(dayjs(cache.startDate), 'day') && dayjs(params.endDate).isSameOrBefore(dayjs(cache.endDate), 'day'))) {
+                _context32.next = 16;
+                break;
+              }
+              this.store.date.setDateList(cache.dateList);
+              return _context32.abrupt("return", {
+                dateList: cache.dateList,
+                firstAvailableDate: cache.firstAvailableDate
+              });
+            case 16:
               // 2. 商品 schedule 数据，确定日程在每一天的时间片
               // 3. 把后端返回的和 schedule 的数据进行合并，确定每一天的可用和使用情况
               dates = [];
@@ -2946,7 +2955,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               openResources = ((_tempProducts = tempProducts) === null || _tempProducts === void 0 || (_tempProducts = _tempProducts.product_resource) === null || _tempProducts === void 0 || (_tempProducts = _tempProducts.resources) === null || _tempProducts === void 0 ? void 0 : _tempProducts.filter(function (m) {
                 return m.status === 1;
               })) || []; // res.data 返回的一定是启用商品的资源列表，不需要再过滤了
-              allProductResources = sortCombinedResources(res.data);
+              allProductResources = sortCombinedResources(res.data); // allProductResources 需要根据商品里的资源的单个预约多个预约补充resourceType
+              allProductResources.forEach(function (m) {
+                var _tempProducts2;
+                var resource = (_tempProducts2 = tempProducts) === null || _tempProducts2 === void 0 || (_tempProducts2 = _tempProducts2.product_resource) === null || _tempProducts2 === void 0 || (_tempProducts2 = _tempProducts2.resources) === null || _tempProducts2 === void 0 ? void 0 : _tempProducts2.find(function (n) {
+                  return n.id === m.form_id;
+                });
+                if (resource) {
+                  m.resourceType = resource.type;
+                }
+              });
               targetSchedules = this.store.schedule.getScheduleListByIds(tempProducts['schedule.ids']);
               _loop3 = /*#__PURE__*/_regeneratorRuntime().mark(function _loop3() {
                 var currentDateStr, status, _checkSessionProductL, latestStartDate, earliestEndDate, scheduleByDate, minTimeMaxTime, scheduleTimeSlots, timesSlotCanUse;
@@ -3003,7 +3021,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                                 return;
                               }
                               var targetCanUseTimes = mTimes.some(function (childTiem) {
-                                var _tempProducts2;
+                                var _tempProducts3;
                                 // 挨个去匹配某个工作时间段结合当前日程时间，资源能不能用，有多少容量能用
                                 var res = getIsUsableByTimeItem({
                                   timeSlice: {
@@ -3016,7 +3034,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                                   resource: m,
                                   currentCount: 1,
                                   resourcesUseableMap: resourcesUseableMap,
-                                  cut_off_time: (_tempProducts2 = tempProducts) === null || _tempProducts2 === void 0 ? void 0 : _tempProducts2.cut_off_time
+                                  cut_off_time: (_tempProducts3 = tempProducts) === null || _tempProducts3 === void 0 ? void 0 : _tempProducts3.cut_off_time
                                 });
                                 if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== 'capacityOnly') {
                                   resourcesUseableMap[m.id] = res.usable;
@@ -3055,22 +3073,22 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   }
                 }, _loop3);
               });
-            case 22:
+            case 24:
               if (!(dayjs(currentDate).isBefore(dayjs(endDate), 'day') || dayjs(currentDate).isSame(dayjs(endDate), 'day'))) {
-                _context32.next = 28;
+                _context32.next = 30;
                 break;
               }
-              return _context32.delegateYield(_loop3(), "t0", 24);
-            case 24:
+              return _context32.delegateYield(_loop3(), "t0", 26);
+            case 26:
               if (!_context32.t0) {
-                _context32.next = 26;
+                _context32.next = 28;
                 break;
               }
-              return _context32.abrupt("break", 28);
-            case 26:
-              _context32.next = 22;
-              break;
+              return _context32.abrupt("break", 30);
             case 28:
+              _context32.next = 24;
+              break;
+            case 30:
               // 最终把资源数据也加到日期内
               dates = handleAvailableDateByResource(res.data, dates);
               this.store.date.setDateList(dates);
@@ -3086,7 +3104,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 dateList: dates,
                 firstAvailableDate: firstAvailableDate
               });
-            case 32:
+            case 34:
             case "end":
               return _context32.stop();
           }

package/dist/solution/ShopDiscount/index.js

@@ -30,7 +30,6 @@ import { BaseModule } from "../../modules/BaseModule";
 import { ShopDiscountHooks } from "./types";
 import { DiscountModule } from "../../modules/Discount";
 import { RulesModule } from "../../modules/Rules";
-import { uniqueById } from "./utils";
 export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   _inherits(ShopDiscountImpl, _BaseModule);
   var _super = _createSuper(ShopDiscountImpl);
@@ -278,7 +277,9 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
             isManualSelect: !isSelected
           });
         }
-        return discount;
+        return _objectSpread(_objectSpread({}, discount), {}, {
+          isManualSelect: !(discount !== null && discount !== void 0 && discount.isSelected)
+        });
       });
 
       // 更新优惠券列表
@@ -451,9 +452,9 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
           });
         }
       });
-      var newDiscountList = uniqueById([].concat(editModeDiscountList, _toConsumableArray(discountList.filter(function (item) {
+      var newDiscountList = [].concat(editModeDiscountList, _toConsumableArray(discountList.filter(function (item) {
         return !item.isDisabled;
-      }))), 'product_id');
+      })));
       (_this$store$discount5 = this.store.discount) === null || _this$store$discount5 === void 0 || _this$store$discount5.setDiscountList(newDiscountList);
       this.emitDiscountListChange(newDiscountList);
       return newDiscountList;

package/lib/modules/Discount/index.js

@@ -73,10 +73,8 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
       `/order/prepare/config`,
       params
     );
-    const goodPassList = this.uniqueByProductId(
-      this.filterEnabledDiscountList(
-        ((_a = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _a.good_pass_list) || []
-      ) || []
+    const goodPassList = this.filterEnabledDiscountList(
+      ((_a = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _a.good_pass_list) || []
     ) || [];
     return goodPassList;
   }
@@ -88,9 +86,7 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
       available: 1,
       relation_product: 1
     });
-    const resultDiscountList = this.uniqueByProductId(
-      this.filterEnabledDiscountList((result == null ? void 0 : result.data) || []) || []
-    ) || [];
+    const resultDiscountList = this.filterEnabledDiscountList((result == null ? void 0 : result.data) || []) || [];
     return resultDiscountList;
   }
   filterEnabledDiscountList(discountList) {

package/lib/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/lib/solution/BookingByStep/index.d.ts

@@ -213,7 +213,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     }): void;
     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
      *

package/lib/solution/BookingByStep/index.js

@@ -180,12 +180,13 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       {
         open_quotation: 1,
         open_bundle: 0,
-        extension_type: [
-          "product_appointment",
-          "appointment_ticket",
-          "session_product",
-          "session_ticket",
-          "normal"
+        exclude_extension_type: [
+          "product_party",
+          "product_event",
+          "product_series_event",
+          "product_package_ticket",
+          "ticket",
+          "event_item"
         ],
         with: ["category", "collection", "resourceRelation"],
         status: "published",
@@ -1651,7 +1652,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     resources,
     product
   }) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e, _f;
     const targetProduct = this.store.currentProduct;
     const targetProductData = product || (targetProduct == null ? void 0 : targetProduct.getData());
     let targetSchedules = [];
@@ -1685,15 +1686,16 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const scheduleTimeSlots = (0, import_utils2.getAllSortedDateRanges)(minTimeMaxTime);
     let allProductResources = productResources.flatMap((n) => n.renderList);
     allProductResources.sort((a, b) => {
-      var _a2, _b2, _c2, _d;
+      var _a2, _b2, _c2, _d2;
       const aIsCombined = ((_b2 = (_a2 = a.metadata) == null ? void 0 : _a2.combined_resource) == null ? void 0 : _b2.status) === 1;
-      const bIsCombined = ((_d = (_c2 = b.metadata) == null ? void 0 : _c2.combined_resource) == null ? void 0 : _d.status) === 1;
+      const bIsCombined = ((_d2 = (_c2 = b.metadata) == null ? void 0 : _c2.combined_resource) == null ? void 0 : _d2.status) === 1;
       if (aIsCombined && !bIsCombined)
         return 1;
       if (!aIsCombined && bIsCombined)
         return -1;
       return 0;
     });
+    const firstEnabledResourceId = (_f = (_e = (_d = targetProductData == null ? void 0 : targetProductData.product_resource) == null ? void 0 : _d.resources) == null ? void 0 : _e.find((n) => n.status === 1)) == null ? void 0 : _f.id;
     const formatScheduleTimeSlots = scheduleTimeSlots.map((item) => {
       const resourcesUseableMap = {};
       let count = 0;
@@ -1729,7 +1731,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           }
           currentResourcesTimeSlotCanUsedArr.push(res.usable);
         });
-        if (!currentResourcesTimeSlotCanUsedArr.some((n) => n === false)) {
+        if (!currentResourcesTimeSlotCanUsedArr.some((n) => n === false) && m.form_id === firstEnabledResourceId) {
           if (currentResourcesCount >= count) {
             count = currentResourcesCount;
           }
@@ -2032,23 +2034,14 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   async getAvailableDateForSessionOptimize(params = {}) {
     var _a, _b, _c, _d, _e, _f;
-    const cache = (_a = this.store.currentProduct) == null ? void 0 : _a.getOtherParams()["timeSlotBySchedule"];
-    if (cache) {
-      if ((0, import_dayjs.default)(params.startDate).isSameOrAfter((0, import_dayjs.default)(cache.startDate), "day") && (0, import_dayjs.default)(params.endDate).isSameOrBefore((0, import_dayjs.default)(cache.endDate), "day")) {
-        return {
-          dateList: cache.dateList,
-          firstAvailableDate: cache.firstAvailableDate
-        };
-      }
-    }
     let { startDate, endDate } = params;
     if ((0, import_dayjs.default)(startDate).isBefore((0, import_dayjs.default)(), "day") && ((0, import_dayjs.default)(endDate).isAfter((0, import_dayjs.default)(), "day") || (0, import_dayjs.default)(endDate).isSame((0, import_dayjs.default)(), "day"))) {
       startDate = (0, import_dayjs.default)().format("YYYY-MM-DD");
     }
     endDate = (0, import_dayjs.default)().add(1, "month").format("YYYY-MM-DD");
     let tempProducts;
-    tempProducts = (_b = this.store.currentProduct) == null ? void 0 : _b.getData();
-    const schedule = (_c = this.store.currentProduct) == null ? void 0 : _c.getOtherParams()["schedule"];
+    tempProducts = (_a = this.store.currentProduct) == null ? void 0 : _a.getData();
+    const schedule = (_b = this.store.currentProduct) == null ? void 0 : _b.getOtherParams()["schedule"];
     const filteredSchedule = (0, import_resources.filterScheduleByDateRange)(
       schedule,
       startDate || "",
@@ -2062,6 +2055,16 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         resource_ids: tempResourceIds
       }
     });
+    const cache = (_c = this.store.currentProduct) == null ? void 0 : _c.getOtherParams()["timeSlotBySchedule"];
+    if (cache) {
+      if ((0, import_dayjs.default)(params.startDate).isSameOrAfter((0, import_dayjs.default)(cache.startDate), "day") && (0, import_dayjs.default)(params.endDate).isSameOrBefore((0, import_dayjs.default)(cache.endDate), "day")) {
+        this.store.date.setDateList(cache.dateList);
+        return {
+          dateList: cache.dateList,
+          firstAvailableDate: cache.firstAvailableDate
+        };
+      }
+    }
     let dates = [];
     let currentDate = (0, import_dayjs.default)(startDate);
     let firstAvailableDate = "";
@@ -2069,6 +2072,15 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       (m) => m.status === 1
     )) || [];
     const allProductResources = (0, import_resources.sortCombinedResources)(res.data);
+    allProductResources.forEach((m) => {
+      var _a2, _b2;
+      const resource = (_b2 = (_a2 = tempProducts == null ? void 0 : tempProducts.product_resource) == null ? void 0 : _a2.resources) == null ? void 0 : _b2.find(
+        (n) => n.id === m.form_id
+      );
+      if (resource) {
+        m.resourceType = resource.type;
+      }
+    });
     const targetSchedules = this.store.schedule.getScheduleListByIds(
       tempProducts["schedule.ids"]
     );

package/lib/solution/ShopDiscount/index.js

@@ -27,7 +27,6 @@ var import_BaseModule = require("../../modules/BaseModule");
 var import_types = require("./types");
 var import_Discount = require("../../modules/Discount");
 var import_Rules = require("../../modules/Rules");
-var import_utils = require("./utils");
 var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -173,7 +172,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
           isManualSelect: !isSelected
         };
       }
-      return discount;
+      return { ...discount, isManualSelect: !(discount == null ? void 0 : discount.isSelected) };
     });
     this.setDiscountList(newDiscountList);
     return this.calcDiscount(this.store.productList || [], {
@@ -288,13 +287,10 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         });
       }
     });
-    const newDiscountList = (0, import_utils.uniqueById)(
-      [
-        ...editModeDiscountList,
-        ...discountList.filter((item) => !item.isDisabled)
-      ],
-      "product_id"
-    );
+    const newDiscountList = [
+      ...editModeDiscountList,
+      ...discountList.filter((item) => !item.isDisabled)
+    ];
     (_a = this.store.discount) == null ? void 0 : _a.setDiscountList(newDiscountList);
     this.emitDiscountListChange(newDiscountList);
     return newDiscountList;

package/package.json

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