@pisell/pisellos 0.0.22 → 0.0.24

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

@@ -23,7 +23,7 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
     filterEnabledDiscountList(discountList: Discount[]): Discount[];
     uniqueByProductId(discountList: Discount[]): Discount[];
     filterDiscountListByProductIds(discountList: Discount[], productIds: number[]): Discount[];
-    calcDiscountApplicableProductTotalPrice(discount: Discount): number;
+    calcDiscountApplicableProductTotalPrice(discount: Discount): number | undefined;
     destroy(): Promise<void>;
     clear(): Promise<void>;
     storeChange(): void;

package/dist/modules/Discount/index.js

@@ -193,13 +193,15 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "calcDiscountApplicableProductTotalPrice",
     value: function calcDiscountApplicableProductTotalPrice(discount) {
+      if (discount !== null && discount !== void 0 && discount.savedAmount) {
+        return (discount === null || discount === void 0 ? void 0 : discount.savedAmount) || 0;
+      }
       if (discount.appliedProductDetails) {
         return discount.appliedProductDetails.reduce(function (total, product) {
           var price = Number(product === null || product === void 0 ? void 0 : product.amount) || 0;
           return total + price;
         }, 0);
       }
-      return (discount === null || discount === void 0 ? void 0 : discount.savedAmount) || 0;
     }
   }, {
     key: "destroy",

package/dist/modules/Rules/index.js

@@ -205,10 +205,19 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       sortedProductList.forEach(function (originProduct) {
         var product = _this3.hooks.getProduct(originProduct);
         addModeDiscount.forEach(function (discount) {
+          var _product$discount_lis, _product$discount_lis2;
           var limitedData = discount === null || discount === void 0 ? void 0 : discount.limited_relation_product_data;
 
+          // 是符合折扣的商品
+          var isLimitedProduct = limitedData.type === "product_all" || limitedData.product_ids && limitedData.product_ids.includes(product.id);
+
+          // 编辑的商品 使用了优惠券不可用
+          var isAvailableProduct = !(product !== null && product !== void 0 && product.booking_id && product !== null && product !== void 0 && (_product$discount_lis = product.discount_list) !== null && _product$discount_lis !== void 0 && _product$discount_lis.length && product !== null && product !== void 0 && (_product$discount_lis2 = product.discount_list) !== null && _product$discount_lis2 !== void 0 && _product$discount_lis2.every(function (discount) {
+            return discount.id;
+          }));
+
           // 判断优惠券是否适用于该商品
-          if (!(product !== null && product !== void 0 && product.booking_id) && (limitedData.type === "product_all" || limitedData.product_ids && limitedData.product_ids.includes(product.id))) {
+          if (isAvailableProduct && isLimitedProduct) {
             var _discountApplicabilit;
             // 记录此优惠券适用的商品
             (_discountApplicabilit = discountApplicability.get(discount.id)) === null || _discountApplicabilit === void 0 || _discountApplicabilit.push(product.id);
@@ -231,9 +240,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
       // 然后再处理应用哪些优惠券，此时只考虑filteredDiscountList中的优惠券
       sortedProductList.forEach(function (originProduct) {
-        var _product$discount_lis;
+        var _product$discount_lis3, _product$discount_lis4, _product$discount_lis5;
         var product = _this3.hooks.getProduct(originProduct);
-        if (product !== null && product !== void 0 && product.booking_id) {
+        if (product !== null && product !== void 0 && product.booking_id && (_product$discount_lis3 = product.discount_list) !== null && _product$discount_lis3 !== void 0 && _product$discount_lis3.length && product !== null && product !== void 0 && (_product$discount_lis4 = product.discount_list) !== null && _product$discount_lis4 !== void 0 && _product$discount_lis4.every(function (discount) {
+          return discount.id;
+        })) {
           processedProductsMap.set(product._id, originProduct);
           return;
         }
@@ -257,7 +268,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         var selectedDiscount = applicableDiscounts[0];
 
         // 如果是手动折扣，则不适用优惠券
-        var isManualDiscount = typeof product.isManualDiscount === "boolean" ? product.isManualDiscount : product.total != product.origin_total && !((_product$discount_lis = product.discount_list) !== null && _product$discount_lis !== void 0 && _product$discount_lis.length);
+        var isManualDiscount = typeof product.isManualDiscount === "boolean" ? product.isManualDiscount : product.total != product.origin_total && !((_product$discount_lis5 = product.discount_list) !== null && _product$discount_lis5 !== void 0 && _product$discount_lis5.length);
 
         // 勾选时覆盖手动折扣
         if (options !== null && options !== void 0 && options.discountId && (options === null || options === void 0 ? void 0 : options.discountId) === (selectedDiscount === null || selectedDiscount === void 0 ? void 0 : selectedDiscount.id)) {
@@ -274,6 +285,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           })));
           return;
         }
+        if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === 'undefined') {
+          return;
+        }
 
         // 标记优惠券为已使用
         usedDiscounts.set(selectedDiscount.id, true);
@@ -331,7 +345,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         // 如果此优惠券被明确设置为不选中，保持其状态，但正确设置isAvailable
         if (typeof discount.isSelected === "boolean" && discount.isSelected === false && discount.isManualSelect) {
           return _objectSpread(_objectSpread({}, discount), {}, {
-            isUsed: false,
             isSelected: false,
             isAvailable: isAvailable,
             // 正确设置可用性
@@ -344,7 +357,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         }
         if (usedDiscounts.get(discount.id)) {
           return _objectSpread(_objectSpread({}, discount), {}, {
-            isUsed: true,
             isSelected: true,
             // 标记为可用，因为它已被应用
             isAvailable: true,
@@ -359,7 +371,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         var isSelected = typeof discount.isSelected === "boolean" ? discount.isSelected : undefined;
 
         // 如果是可用的 并且没有手动标记 则设置为选中
-        if (isAvailable && !discount.isManualSelect) {
+        if (isAvailable && appliedProductDetails.length && !discount.isManualSelect) {
           isSelected = true;
         } else if (!appliedProductDetails.length) {
           isSelected = false;

package/dist/solution/BookingByStep/index.js

@@ -177,6 +177,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 open_quotation: 1,
                 open_bundle: 1,
                 extension_type: ["product_appointment", "appointment_ticket"],
+                with: ["category", "collection"],
                 status: "published",
                 num: 500,
                 skip: 1,
@@ -1022,6 +1023,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             }
           } else {
             var _productResources$fin;
+            debugger;
             // 如果没有传递 timeSlots，代表是第一种资源，则直接拿商品的 duration，到资源列表里找一个公共可用的
             var productResources = getResourcesByProduct(resourcesMap, item, allCartItems);
             // 自动选择 productResources 中对应 resources_code 的资源
@@ -1042,6 +1044,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           }
         });
       });
+      debugger;
       return {
         errorList: errorList
       };
@@ -1084,6 +1087,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           duration = accountDuration;
         }
       });
+      debugger;
       var timeSlots = getTimeSlicesByResources({
         resourceIds: resourceIds,
         resourcesMap: resourcesMap,

package/dist/solution/ShopDiscount/index.js

@@ -235,6 +235,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "calcDiscount",
     value: function calcDiscount(productList, options) {
+      this.store.productList = productList;
       var rulesModule = this.core.getModule("".concat(this.name, "_rules"));
       if (!rulesModule) {
         return {
@@ -252,7 +253,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
         newProductList = _ref.productList,
         newDiscountList = _ref.discountList;
       if (newDiscountList) {
-        this.setDiscountList(newDiscountList);
+        newDiscountList = this.setDiscountList(newDiscountList);
       }
       return {
         productList: newProductList || productList,
@@ -275,8 +276,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
           return _objectSpread(_objectSpread({}, discount), {}, {
             isSelected: isSelected,
             // 手动设置不使用
-            isManualSelect: !isSelected,
-            isUsed: isSelected
+            isManualSelect: !isSelected
           });
         }
         return discount;
@@ -423,47 +423,39 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     }() // 设置优惠券列表
   }, {
     key: "setDiscountList",
-    value: function () {
-      var _setDiscountList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(discountList) {
-        var _this$store$discount5;
-        var productList, editModeDiscountList, newDiscountList;
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
-            case 0:
-              productList = this.store.productList || [];
-              editModeDiscountList = [];
-              productList.forEach(function (item) {
-                if (item.booking_id) {
-                  editModeDiscountList.push.apply(editModeDiscountList, _toConsumableArray((item.discount_list || []).map(function (item) {
-                    return _objectSpread(_objectSpread({}, item), {}, {
-                      isEditMode: true,
-                      limited_relation_product_data: {},
-                      savedAmount: item.amount,
-                      isAvailable: true,
-                      id: item.discount.resource_id,
-                      format_title: item.discount.title,
-                      isDisabled: true,
-                      isSelected: true,
-                      product_id: item.discount.product_id
-                    });
-                  })));
-                }
-              });
-              newDiscountList = uniqueById([].concat(editModeDiscountList, _toConsumableArray(discountList)), "product_id");
-              (_this$store$discount5 = this.store.discount) === null || _this$store$discount5 === void 0 || _this$store$discount5.setDiscountList(newDiscountList);
-              _context7.next = 7;
-              return this.emitDiscountListChange(newDiscountList);
-            case 7:
-            case "end":
-              return _context7.stop();
-          }
-        }, _callee7, this);
-      }));
-      function setDiscountList(_x6) {
-        return _setDiscountList.apply(this, arguments);
-      }
-      return setDiscountList;
-    }() // 获取优惠券列表
+    value: function setDiscountList(discountList) {
+      var _this$store$discount5;
+      var productList = this.store.productList || [];
+      var editModeDiscountList = [];
+      productList.forEach(function (item) {
+        if (item.booking_id) {
+          (item.discount_list || []).forEach(function (discount) {
+            if (discount.id) {
+              var _discount$discount, _discount$discount2, _discount$discount3;
+              editModeDiscountList.push(_objectSpread(_objectSpread({}, discount), {}, {
+                isEditMode: true,
+                limited_relation_product_data: {},
+                savedAmount: discount.amount,
+                isAvailable: true,
+                id: ((_discount$discount = discount.discount) === null || _discount$discount === void 0 ? void 0 : _discount$discount.resource_id) || discount.id,
+                format_title: ((_discount$discount2 = discount.discount) === null || _discount$discount2 === void 0 ? void 0 : _discount$discount2.title) || discount.format_title,
+                isDisabled: true,
+                isSelected: true,
+                product_id: ((_discount$discount3 = discount.discount) === null || _discount$discount3 === void 0 ? void 0 : _discount$discount3.product_id) || discount.product_id
+              }));
+            }
+          });
+        }
+      });
+      var newDiscountList = uniqueById([].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;
+    }
+
+    // 获取优惠券列表
   }, {
     key: "getDiscountList",
     value: function getDiscountList() {
@@ -475,35 +467,35 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getCustomerWallet",
     value: function () {
-      var _getCustomerWallet = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(id) {
+      var _getCustomerWallet = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(id) {
         var result, _result$data, wallet_pass_list, customer;
-        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              _context8.prev = 0;
-              _context8.next = 3;
+              _context7.prev = 0;
+              _context7.next = 3;
               return this.request.get("/customer/info/wallet/".concat(id), {
                 wallet_pass_tags: ["good_pass"]
               });
             case 3:
-              result = _context8.sent;
+              result = _context7.sent;
               if (result !== null && result !== void 0 && result.data) {
                 _result$data = result.data, wallet_pass_list = _result$data.wallet_pass_list, customer = _objectWithoutProperties(_result$data, _excluded);
                 this.setCustomer(customer);
               }
-              _context8.next = 10;
+              _context7.next = 10;
               break;
             case 7:
-              _context8.prev = 7;
-              _context8.t0 = _context8["catch"](0);
-              console.error("[ShopDiscount] 获取客户钱包信息出错:", _context8.t0);
+              _context7.prev = 7;
+              _context7.t0 = _context7["catch"](0);
+              console.error("[ShopDiscount] 获取客户钱包信息出错:", _context7.t0);
             case 10:
             case "end":
-              return _context8.stop();
+              return _context7.stop();
           }
-        }, _callee8, this, [[0, 7]]);
+        }, _callee7, this, [[0, 7]]);
       }));
-      function getCustomerWallet(_x7) {
+      function getCustomerWallet(_x6) {
         return _getCustomerWallet.apply(this, arguments);
       }
       return getCustomerWallet;
@@ -511,52 +503,48 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "loadPrepareConfig",
     value: function () {
-      var _loadPrepareConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(params) {
+      var _loadPrepareConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(params) {
         var _this$getCustomer2, _this$store$discount7, _this$store$productLi, customerId, goodPassList, result;
-        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
-              _context9.prev = 0;
-              customerId = params.customerId || ((_this$getCustomer2 = this.getCustomer()) === null || _this$getCustomer2 === void 0 ? void 0 : _this$getCustomer2.id);
-              if (!(customerId === 1 || !customerId)) {
-                _context9.next = 4;
-                break;
-              }
-              return _context9.abrupt("return");
-            case 4:
-              _context9.next = 6;
+              _context8.prev = 0;
+              customerId = params.customerId || ((_this$getCustomer2 = this.getCustomer()) === null || _this$getCustomer2 === void 0 ? void 0 : _this$getCustomer2.id); // if (customerId === 1 || !customerId) {
+              //   return
+              // }
+              _context8.next = 4;
               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
               });
-            case 6:
-              goodPassList = _context9.sent;
+            case 4:
+              goodPassList = _context8.sent;
               this.setDiscountList(goodPassList || []);
               if (!((_this$store$productLi = this.store.productList) !== null && _this$store$productLi !== void 0 && _this$store$productLi.length)) {
-                _context9.next = 12;
+                _context8.next = 10;
                 break;
               }
               result = this.calcDiscount(this.store.productList);
-              _context9.next = 12;
+              _context8.next = 10;
               return this.core.effects.emit(ShopDiscountHooks.onLoadPrepareCalcResult, result);
-            case 12:
-              _context9.next = 14;
+            case 10:
+              _context8.next = 12;
               return this.core.effects.emit(ShopDiscountHooks.onLoadDiscountList, goodPassList);
-            case 14:
-              _context9.next = 19;
+            case 12:
+              _context8.next = 17;
               break;
-            case 16:
-              _context9.prev = 16;
-              _context9.t0 = _context9["catch"](0);
-              console.error("[ShopDiscount] 加载准备配置出错:", _context9.t0);
-            case 19:
+            case 14:
+              _context8.prev = 14;
+              _context8.t0 = _context8["catch"](0);
+              console.error("[ShopDiscount] 加载准备配置出错:", _context8.t0);
+            case 17:
             case "end":
-              return _context9.stop();
+              return _context8.stop();
           }
-        }, _callee9, this, [[0, 16]]);
+        }, _callee8, this, [[0, 14]]);
       }));
-      function loadPrepareConfig(_x8) {
+      function loadPrepareConfig(_x7) {
         return _loadPrepareConfig.apply(this, arguments);
       }
       return loadPrepareConfig;

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

@@ -23,7 +23,7 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
     filterEnabledDiscountList(discountList: Discount[]): Discount[];
     uniqueByProductId(discountList: Discount[]): Discount[];
     filterDiscountListByProductIds(discountList: Discount[], productIds: number[]): Discount[];
-    calcDiscountApplicableProductTotalPrice(discount: Discount): number;
+    calcDiscountApplicableProductTotalPrice(discount: Discount): number | undefined;
     destroy(): Promise<void>;
     clear(): Promise<void>;
     storeChange(): void;

package/lib/modules/Discount/index.js

@@ -107,13 +107,15 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
     });
   }
   calcDiscountApplicableProductTotalPrice(discount) {
+    if (discount == null ? void 0 : discount.savedAmount) {
+      return (discount == null ? void 0 : discount.savedAmount) || 0;
+    }
     if (discount.appliedProductDetails) {
       return discount.appliedProductDetails.reduce((total, product) => {
         const price = Number(product == null ? void 0 : product.amount) || 0;
         return total + price;
       }, 0);
     }
-    return (discount == null ? void 0 : discount.savedAmount) || 0;
   }
   async destroy() {
     this.store.discountList = [];

package/lib/modules/Rules/index.js

@@ -130,10 +130,12 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     sortedProductList.forEach((originProduct) => {
       const product = this.hooks.getProduct(originProduct);
       addModeDiscount.forEach((discount) => {
-        var _a;
+        var _a, _b, _c;
         const limitedData = discount == null ? void 0 : discount.limited_relation_product_data;
-        if (!(product == null ? void 0 : product.booking_id) && (limitedData.type === "product_all" || limitedData.product_ids && limitedData.product_ids.includes(product.id))) {
-          (_a = discountApplicability.get(discount.id)) == null ? void 0 : _a.push(product.id);
+        const isLimitedProduct = limitedData.type === "product_all" || limitedData.product_ids && limitedData.product_ids.includes(product.id);
+        const isAvailableProduct = !((product == null ? void 0 : product.booking_id) && ((_a = product == null ? void 0 : product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount2) => discount2.id)));
+        if (isAvailableProduct && isLimitedProduct) {
+          (_c = discountApplicability.get(discount.id)) == null ? void 0 : _c.push(product.id);
           const applicableProducts = discountApplicableProducts.get(discount.id) || [];
           applicableProducts.push({
             amount: product.price,
@@ -149,9 +151,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       });
     });
     sortedProductList.forEach((originProduct) => {
-      var _a;
+      var _a, _b, _c;
       const product = this.hooks.getProduct(originProduct);
-      if (product == null ? void 0 : product.booking_id) {
+      if ((product == null ? void 0 : product.booking_id) && ((_a = product.discount_list) == null ? void 0 : _a.length) && ((_b = product == null ? void 0 : product.discount_list) == null ? void 0 : _b.every((discount) => discount.id))) {
         processedProductsMap.set(product._id, originProduct);
         return;
       }
@@ -167,7 +169,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         return false;
       });
       const selectedDiscount = applicableDiscounts[0];
-      let isManualDiscount = typeof product.isManualDiscount === "boolean" ? product.isManualDiscount : product.total != product.origin_total && !((_a = product.discount_list) == null ? void 0 : _a.length);
+      let isManualDiscount = typeof product.isManualDiscount === "boolean" ? product.isManualDiscount : product.total != product.origin_total && !((_c = product.discount_list) == null ? void 0 : _c.length);
       if ((options == null ? void 0 : options.discountId) && (options == null ? void 0 : options.discountId) === (selectedDiscount == null ? void 0 : selectedDiscount.id)) {
         isManualDiscount = false;
       }
@@ -184,6 +186,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         );
         return;
       }
+      if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === "undefined") {
+        return;
+      }
       usedDiscounts.set(selectedDiscount.id, true);
       const appliedProducts = appliedDiscountProducts.get(selectedDiscount.id) || [];
       const discountDetail = {
@@ -225,7 +230,6 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       if (typeof discount.isSelected === "boolean" && discount.isSelected === false && discount.isManualSelect) {
         return {
           ...discount,
-          isUsed: false,
           isSelected: false,
           isAvailable,
           // 正确设置可用性
@@ -239,7 +243,6 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       if (usedDiscounts.get(discount.id)) {
         return {
           ...discount,
-          isUsed: true,
           isSelected: true,
           // 标记为可用，因为它已被应用
           isAvailable: true,
@@ -252,7 +255,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         };
       }
       let isSelected = typeof discount.isSelected === "boolean" ? discount.isSelected : void 0;
-      if (isAvailable && !discount.isManualSelect) {
+      if (isAvailable && appliedProductDetails.length && !discount.isManualSelect) {
         isSelected = true;
       } else if (!appliedProductDetails.length) {
         isSelected = false;

package/lib/solution/BookingByStep/index.js

@@ -134,6 +134,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       open_quotation: 1,
       open_bundle: 1,
       extension_type: ["product_appointment", "appointment_ticket"],
+      with: ["category", "collection"],
       status: "published",
       num: 500,
       skip: 1,
@@ -571,6 +572,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             errorList.push(item._id);
           }
         } else {
+          debugger;
           const productResources = (0, import_resources.getResourcesByProduct)(resourcesMap, item, allCartItems);
           const targetRenderList = (_a = productResources.find((n) => n.code === resources_code)) == null ? void 0 : _a.renderList;
           if (targetRenderList && targetRenderList.length > 0) {
@@ -589,6 +591,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         }
       });
     });
+    debugger;
     return { errorList };
   }
   // 从购物车中获取已经分配好第一步资源的所有时间片
@@ -621,6 +624,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         duration = accountDuration;
       }
     });
+    debugger;
     const timeSlots = (0, import_resources.getTimeSlicesByResources)({
       resourceIds,
       resourcesMap,

package/lib/solution/ShopDiscount/index.js

@@ -138,11 +138,12 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   }
   // 计算优惠券
   calcDiscount(productList, options) {
+    this.store.productList = productList;
     const rulesModule = this.core.getModule(`${this.name}_rules`);
     if (!rulesModule) {
       return { productList, discountList: this.getDiscountList() };
     }
-    const { productList: newProductList, discountList: newDiscountList } = rulesModule.calcDiscount(
+    let { productList: newProductList, discountList: newDiscountList } = rulesModule.calcDiscount(
       {
         productList,
         discountList: this.getDiscountList()
@@ -150,7 +151,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       options
     ) || { productList, discountList: this.getDiscountList() };
     if (newDiscountList) {
-      this.setDiscountList(newDiscountList);
+      newDiscountList = this.setDiscountList(newDiscountList);
     }
     return {
       productList: newProductList || productList,
@@ -169,8 +170,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
           ...discount,
           isSelected,
           // 手动设置不使用
-          isManualSelect: !isSelected,
-          isUsed: isSelected
+          isManualSelect: !isSelected
         };
       }
       return discount;
@@ -257,31 +257,35 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     );
   }
   // 设置优惠券列表
-  async setDiscountList(discountList) {
+  setDiscountList(discountList) {
     var _a;
     const productList = this.store.productList || [];
     const editModeDiscountList = [];
     productList.forEach((item) => {
       if (item.booking_id) {
-        editModeDiscountList.push(...(item.discount_list || []).map((item2) => {
-          return {
-            ...item2,
-            isEditMode: true,
-            limited_relation_product_data: {},
-            savedAmount: item2.amount,
-            isAvailable: true,
-            id: item2.discount.resource_id,
-            format_title: item2.discount.title,
-            isDisabled: true,
-            isSelected: true,
-            product_id: item2.discount.product_id
-          };
-        }));
+        (item.discount_list || []).forEach((discount) => {
+          var _a2, _b, _c;
+          if (discount.id) {
+            editModeDiscountList.push({
+              ...discount,
+              isEditMode: true,
+              limited_relation_product_data: {},
+              savedAmount: discount.amount,
+              isAvailable: true,
+              id: ((_a2 = discount.discount) == null ? void 0 : _a2.resource_id) || discount.id,
+              format_title: ((_b = discount.discount) == null ? void 0 : _b.title) || discount.format_title,
+              isDisabled: true,
+              isSelected: true,
+              product_id: ((_c = discount.discount) == null ? void 0 : _c.product_id) || discount.product_id
+            });
+          }
+        });
       }
     });
-    const newDiscountList = (0, import_utils.uniqueById)([...editModeDiscountList, ...discountList], "product_id");
+    const newDiscountList = (0, import_utils.uniqueById)([...editModeDiscountList, ...discountList.filter((item) => !item.isDisabled)], "product_id");
     (_a = this.store.discount) == null ? void 0 : _a.setDiscountList(newDiscountList);
-    await this.emitDiscountListChange(newDiscountList);
+    this.emitDiscountListChange(newDiscountList);
+    return newDiscountList;
   }
   // 获取优惠券列表
   getDiscountList() {
@@ -307,9 +311,6 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     var _a, _b, _c;
     try {
       const customerId = params.customerId || ((_a = this.getCustomer()) == null ? void 0 : _a.id);
-      if (customerId === 1 || !customerId) {
-        return;
-      }
       const goodPassList = await ((_b = this.store.discount) == null ? void 0 : _b.loadPrepareConfig({
         customer_id: customerId,
         action: "create",

package/package.json

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