@pisell/pisellos 2.1.90 → 2.1.92

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

@@ -25,6 +25,7 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
         request_timezone: string;
     }): Promise<Discount[]>;
     batchSearch(code: string, customerId?: number): Promise<Discount[]>;
+    batchSearchByProductIds(productIds: number[]): Promise<any>;
     filterEnabledDiscountList(discountList: Discount[]): Discount[];
     private checkUsageCreditsLimit;
     uniqueByProductId(discountList: Discount[]): Discount[];

package/dist/modules/Discount/index.js

@@ -208,6 +208,35 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
       }
       return batchSearch;
     }()
+  }, {
+    key: "batchSearchByProductIds",
+    value: function () {
+      var _batchSearchByProductIds = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(productIds) {
+        var result;
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
+            case 0:
+              _context6.next = 2;
+              return this.request.get("/machinecode/batch-search", {
+                ids: productIds,
+                translate_flag: 1,
+                tags: ['good_pass', 'product_discount_card'],
+                relation_product: 1
+              });
+            case 2:
+              result = _context6.sent;
+              return _context6.abrupt("return", (result === null || result === void 0 ? void 0 : result.data) || []);
+            case 4:
+            case "end":
+              return _context6.stop();
+          }
+        }, _callee6, this);
+      }));
+      function batchSearchByProductIds(_x8) {
+        return _batchSearchByProductIds.apply(this, arguments);
+      }
+      return batchSearchByProductIds;
+    }()
   }, {
     key: "filterEnabledDiscountList",
     value: function filterEnabledDiscountList(discountList) {
@@ -309,21 +338,21 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "destroy",
     value: function () {
-      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
               this.store.discountList = [];
               this.core.effects.offByModuleDestroy(this.name);
-              _context6.next = 4;
+              _context7.next = 4;
               return this.core.effects.emit("".concat(this.name, ":onDestroy"), {});
             case 4:
               console.log('[Discount] 已销毁');
             case 5:
             case "end":
-              return _context6.stop();
+              return _context7.stop();
           }
-        }, _callee6, this);
+        }, _callee7, this);
       }));
       function destroy() {
         return _destroy.apply(this, arguments);
@@ -333,18 +362,18 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "clear",
     value: function () {
-      var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+      var _clear = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
               this.store.discountList = [];
               this.store.originalDiscountList = [];
               console.log('[Discount] clear');
             case 3:
             case "end":
-              return _context7.stop();
+              return _context8.stop();
           }
-        }, _callee7, this);
+        }, _callee8, this);
       }));
       function clear() {
         return _clear.apply(this, arguments);

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

@@ -122,6 +122,7 @@ export interface Discount {
     num?: number;
     start_date?: string;
     start_time?: string;
+    discount_rule_uncheck_flag?: boolean;
 }
 export interface DiscountState {
     discountList: Discount[];

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

@@ -283,13 +283,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         productList = _ref2.productList,
         holders = _ref2.holders,
         isFormSubject = _ref2.isFormSubject;
-      // 识别出来是不是在编辑的界面里又新增了商品
-      // 这种情况下，如果有可用的优惠券，也会自动勾选上
-      var isEditModeAddNewProduct = productList.find(function (n) {
-        return n.booking_id;
-      }) && productList.find(function (n) {
-        return !n.booking_id;
-      });
       var editModeDiscount = [];
       var addModeDiscount = [];
       discountList.forEach(function (discount) {
@@ -340,7 +333,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             _id: product._id,
             parentId: product._id,
             quantity: product.quantity,
-            num: product.num
+            num: product.num,
+            booking_id: product.booking_id
           });
 
           // 2. 展开 bundle 子商品
@@ -364,7 +358,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 origin_total: new Decimal(bundleItem.price || 0).mul(bundleItem.num || 1).toNumber(),
                 original_price: bundleItem.original_price,
                 // 继承主商品属性
-                booking_id: product.booking_id,
+                booking_id: bundleItem.booking_id,
                 discount_list: bundleItem.discount_list || []
               });
             });
@@ -502,6 +496,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       // 🔥 扁平化商品列表（包含主商品和bundle子商品）
       var flattenedList = flattenProductsWithBundle(productList);
 
+      // 识别出来是不是在编辑的界面里又新增了商品
+      // 这种情况下，如果有可用的优惠券，也会自动勾选上
+      var isEditModeAddNewProduct = flattenedList.find(function (n) {
+        return n.booking_id;
+      }) && flattenedList.find(function (n) {
+        return !n.booking_id;
+      });
+
       // 对扁平化后的列表按价格降序排序（用于应用优惠券时优先选择高价商品）
       var sortedFlattenedList = flattenedList.sort(function (a, b) {
         var _ref3, _a$original_price, _ref4, _b$original_price;
@@ -829,7 +831,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 product_id: originProduct.id
               },
               metadata: {
-                num: num
+                num: num,
+                discount_rule_uncheck_flag: discount === null || discount === void 0 ? void 0 : discount.discount_rule_uncheck_flag
               }
             };
             applicableProducts.push(productData);
@@ -1152,7 +1155,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               // 前端使用的num数量，为了计算优惠金额
               _num: isGoodPass ? 1 : product.num,
               metadata: _objectSpread({
-                num: 1
+                num: 1,
+                discount_rule_uncheck_flag: _selectedDiscount === null || _selectedDiscount === void 0 ? void 0 : _selectedDiscount.discount_rule_uncheck_flag
               }, productDiscountDifference !== undefined && {
                 product_discount_difference: productDiscountDifference
               })
@@ -1230,6 +1234,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 metadata: {
                   // 🔥 使用拆分后的唯一 _id
                   custom_product_bundle_map_id: uniqueId,
+                  discount_rule_uncheck_flag: _selectedDiscount2 === null || _selectedDiscount2 === void 0 ? void 0 : _selectedDiscount2.discount_rule_uncheck_flag,
                   num: 1
                 },
                 _num: 1
@@ -1307,6 +1312,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               metadata: _objectSpread({
                 // 🔥 使用唯一的 _id
                 custom_product_bundle_map_id: _uniqueId,
+                discount_rule_uncheck_flag: _selectedDiscount3 === null || _selectedDiscount3 === void 0 ? void 0 : _selectedDiscount3.discount_rule_uncheck_flag,
                 num: product.num || 1
               }, _productDiscountDifference !== undefined && {
                 product_discount_difference: _productDiscountDifference

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

@@ -310,7 +310,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/dist/solution/BookingByStep/index.js

@@ -1818,7 +1818,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 timeSlots: timeSlots,
                 currentCapacity: totalCapacity + (capacity || 0)
               });
-              if (canUseTime && !n.onlyComputed && currentResourceIdleTime > targetResourceTime) {
+              if (canUseTime && !n.onlyComputed && currentResourceIdleTime > targetResourceTime && n.capacity >= (capacity || 0)) {
                 targetResource = n;
                 targetResourceTime = currentResourceIdleTime;
                 return 1; // break
@@ -2213,6 +2213,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       // 计算容量的辅助函数
       var calculateCapacityFromCartItems = function calculateCapacityFromCartItems(items) {
         var _items$0$_resourceOri;
+        if (items.length === 0) return 0;
         // 还需要增加一个判断，maxCapacity 必须是我单个人里选择的资源只有同一种的情况下才可以累加，否则单个账号都是 1
         var firstResource = (_items$0$_resourceOri = items[0]._resourceOrigin) === null || _items$0$_resourceOri === void 0 ? void 0 : _items$0$_resourceOri[0].id;
         var sameResourceLength = items.filter(function (item) {
@@ -2387,6 +2388,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               // 计算容量的辅助函数
               calculateCapacityFromCartItems = function calculateCapacityFromCartItems(items) {
                 var _items$0$_resourceOri2;
+                if (items.length === 0) return 0;
                 // 还需要增加一个判断，maxCapacity 必须是我单个人里选择的资源只有同一种的情况下才可以累加，否则单个账号都是 1
                 var firstResource = (_items$0$_resourceOri2 = items[0]._resourceOrigin) === null || _items$0$_resourceOri2 === void 0 ? void 0 : _items$0$_resourceOri2[0].id;
                 var sameResourceLength = items.filter(function (item) {

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

@@ -349,7 +349,8 @@ export var getResourcesByProduct = function getResourcesByProduct(resourcesMap,
           return dayjs(current.end_at).isAfter(dayjs(latest.end_at)) ? current : latest;
         }, d.times[0]);
         // TODO,在这拉时间切片出来，如果可用 timeSlots.length > 1 才可以被选择
-        return dayjs(latestTime.end_at).isAfter(dayjs());
+        // 当前资源的配置容量需要大于当前需求的 capacity
+        return dayjs(latestTime.end_at).isAfter(dayjs()) && d.capacity >= capacity;
       });
       item.form_id = form_id;
       acc.push(item);

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

@@ -115,7 +115,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

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

@@ -38,6 +38,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
         discountList: Discount[];
     };
     setProductList(productList: Record<string, any>[]): void;
+    batchSearchByProductIds(productIds: number[]): Promise<Discount[]>;
     scanCode(code: string, customerId?: number): Promise<{
         isAvailable: boolean;
         productList: Record<string, any>[];

package/dist/solution/ShopDiscount/index.js

@@ -384,34 +384,72 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     value: function setProductList(productList) {
       this.store.productList = productList;
     }
-
-    // 扫码输入code
   }, {
-    key: "scanCode",
+    key: "batchSearchByProductIds",
     value: function () {
-      var _scanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(code, customerId) {
-        var _this$store$discount3, _this$store$bookingSu2, resultDiscountList, rulesModule, withScanList, currentSelectedDiscountList, _ref2, newProductList, newDiscountList, isAvailable, unavailableReason, _this$options$otherPa6;
+      var _batchSearchByProductIds = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(productIds) {
+        var _this$store$discount3;
+        var resultDiscountList, currentDiscountList, newDiscountList;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              _context5.prev = 0;
-              _context5.next = 3;
-              return (_this$store$discount3 = this.store.discount) === null || _this$store$discount3 === void 0 ? void 0 : _this$store$discount3.batchSearch(code, customerId);
-            case 3:
+              _context5.next = 2;
+              return (_this$store$discount3 = this.store.discount) === null || _this$store$discount3 === void 0 ? void 0 : _this$store$discount3.batchSearchByProductIds(productIds);
+            case 2:
               _context5.t0 = _context5.sent;
               if (_context5.t0) {
-                _context5.next = 6;
+                _context5.next = 5;
                 break;
               }
               _context5.t0 = [];
-            case 6:
+            case 5:
               resultDiscountList = _context5.t0;
+              resultDiscountList = resultDiscountList.map(function (item) {
+                return _objectSpread(_objectSpread({}, item), {}, {
+                  discount_rule_uncheck_flag: true
+                });
+              });
+              currentDiscountList = this.getDiscountList() || [];
+              newDiscountList = [].concat(_toConsumableArray(currentDiscountList), _toConsumableArray(resultDiscountList));
+              this.setDiscountList(newDiscountList);
+              return _context5.abrupt("return", newDiscountList);
+            case 11:
+            case "end":
+              return _context5.stop();
+          }
+        }, _callee5, this);
+      }));
+      function batchSearchByProductIds(_x4) {
+        return _batchSearchByProductIds.apply(this, arguments);
+      }
+      return batchSearchByProductIds;
+    }() // 扫码输入code
+  }, {
+    key: "scanCode",
+    value: function () {
+      var _scanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(code, customerId) {
+        var _this$store$discount4, _this$store$bookingSu2, resultDiscountList, rulesModule, withScanList, currentSelectedDiscountList, _ref2, newProductList, newDiscountList, isAvailable, unavailableReason, _this$options$otherPa6;
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
+            case 0:
+              _context6.prev = 0;
+              _context6.next = 3;
+              return (_this$store$discount4 = this.store.discount) === null || _this$store$discount4 === void 0 ? void 0 : _this$store$discount4.batchSearch(code, customerId);
+            case 3:
+              _context6.t0 = _context6.sent;
+              if (_context6.t0) {
+                _context6.next = 6;
+                break;
+              }
+              _context6.t0 = [];
+            case 6:
+              resultDiscountList = _context6.t0;
               rulesModule = this.store.rules;
               if (rulesModule) {
-                _context5.next = 10;
+                _context6.next = 10;
                 break;
               }
-              return _context5.abrupt("return", {
+              return _context6.abrupt("return", {
                 type: "clientCalc",
                 isAvailable: false,
                 productList: this.store.productList || [],
@@ -420,10 +458,10 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 10:
               if (resultDiscountList.length) {
-                _context5.next = 12;
+                _context6.next = 12;
                 break;
               }
-              return _context5.abrupt("return", {
+              return _context6.abrupt("return", {
                 type: "server",
                 isAvailable: false,
                 productList: this.store.productList || [],
@@ -443,10 +481,10 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                   return m.id === n.id;
                 });
               }))) {
-                _context5.next = 16;
+                _context6.next = 16;
                 break;
               }
-              return _context5.abrupt("return", {
+              return _context6.abrupt("return", {
                 type: "clientCalc",
                 isAvailable: true,
                 productList: this.store.productList || [],
@@ -465,20 +503,20 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 discountList: this.getDiscountList()
               }, newProductList = _ref2.productList, newDiscountList = _ref2.discountList, isAvailable = _ref2.isAvailable, unavailableReason = _ref2.unavailableReason;
               if (!isAvailable) {
-                _context5.next = 24;
+                _context6.next = 24;
                 break;
               }
               this.setDiscountList(newDiscountList || []);
               this.store.originalDiscountList = 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 = 24;
+                _context6.next = 24;
                 break;
               }
-              _context5.next = 24;
+              _context6.next = 24;
               return this.getCustomerWallet(resultDiscountList[0].customer_id);
             case 24:
-              return _context5.abrupt("return", {
+              return _context6.abrupt("return", {
                 type: "clientCalc",
                 isAvailable: isAvailable || false,
                 productList: newProductList || this.store.productList || [],
@@ -486,10 +524,10 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 unavailableReason: unavailableReason
               });
             case 27:
-              _context5.prev = 27;
-              _context5.t1 = _context5["catch"](0);
-              console.error('[ShopDiscount] 扫码出错:', _context5.t1);
-              return _context5.abrupt("return", {
+              _context6.prev = 27;
+              _context6.t1 = _context6["catch"](0);
+              console.error('[ShopDiscount] 扫码出错:', _context6.t1);
+              return _context6.abrupt("return", {
                 type: "clientCalc",
                 isAvailable: false,
                 productList: this.store.productList || [],
@@ -498,11 +536,11 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 31:
             case "end":
-              return _context5.stop();
+              return _context6.stop();
           }
-        }, _callee5, this, [[0, 27]]);
+        }, _callee6, this, [[0, 27]]);
       }));
-      function scanCode(_x4, _x5) {
+      function scanCode(_x5, _x6) {
         return _scanCode.apply(this, arguments);
       }
       return scanCode;
@@ -510,8 +548,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "calcDiscountApplicableProductTotalPrice",
     value: function calcDiscountApplicableProductTotalPrice(discount) {
-      var _this$store$discount4;
-      return (_this$store$discount4 = this.store.discount) === null || _this$store$discount4 === void 0 ? void 0 : _this$store$discount4.calcDiscountApplicableProductTotalPrice(discount);
+      var _this$store$discount5;
+      return (_this$store$discount5 = this.store.discount) === null || _this$store$discount5 === void 0 ? void 0 : _this$store$discount5.calcDiscountApplicableProductTotalPrice(discount);
     }
 
     // =========== 私有辅助方法 ===========
@@ -535,19 +573,19 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "emitDiscountListChange",
     value: function () {
-      var _emitDiscountListChange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(discountList) {
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+      var _emitDiscountListChange = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(discountList) {
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              _context6.next = 2;
+              _context7.next = 2;
               return this.core.effects.emit("".concat(this.name, ":onDiscountListChange"), discountList);
             case 2:
             case "end":
-              return _context6.stop();
+              return _context7.stop();
           }
-        }, _callee6, this);
+        }, _callee7, this);
       }));
-      function emitDiscountListChange(_x6) {
+      function emitDiscountListChange(_x7) {
         return _emitDiscountListChange.apply(this, arguments);
       }
       return emitDiscountListChange;
@@ -556,7 +594,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "setDiscountList",
     value: function setDiscountList(discountList) {
       var _this3 = this,
-        _this$store$discount5;
+        _this$store$discount6;
       var productList = this.store.productList || [];
       var editModeDiscountList = [];
       productList.forEach(function (item) {
@@ -639,7 +677,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
           item.isDisabledForProductUsed = false;
         }
       });
-      (_this$store$discount5 = this.store.discount) === null || _this$store$discount5 === void 0 || _this$store$discount5.setDiscountList(newDiscountList);
+      (_this$store$discount6 = this.store.discount) === null || _this$store$discount6 === void 0 || _this$store$discount6.setDiscountList(newDiscountList);
       this.emitDiscountListChange(newDiscountList);
       return newDiscountList;
     }
@@ -648,48 +686,48 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getDiscountList",
     value: function getDiscountList() {
-      var _this$store$discount6;
-      return ((_this$store$discount6 = this.store.discount) === null || _this$store$discount6 === void 0 ? void 0 : _this$store$discount6.getDiscountList()) || [];
+      var _this$store$discount7;
+      return ((_this$store$discount7 = this.store.discount) === null || _this$store$discount7 === void 0 ? void 0 : _this$store$discount7.getDiscountList()) || [];
     }
 
     // 获取客户钱包信息
   }, {
     key: "getCustomerWallet",
     value: function () {
-      var _getCustomerWallet = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(id) {
+      var _getCustomerWallet = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(id) {
         var _result, customer;
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
-              _context7.prev = 0;
-              _context7.next = 3;
+              _context8.prev = 0;
+              _context8.next = 3;
               return this.request.get("/customer/info/".concat(id), {
                 with_trashed: 1
               });
             case 3:
-              _result = _context7.sent;
+              _result = _context8.sent;
               if (!(_result !== null && _result !== void 0 && _result.data)) {
-                _context7.next = 9;
+                _context8.next = 9;
                 break;
               }
               customer = Object.assign({}, (_objectDestructuringEmpty(_result.data), _result.data));
               this.setCustomer(customer);
-              _context7.next = 9;
+              _context8.next = 9;
               return this.core.effects.emit("".concat(this.name, ":onScanCustomerChange"), customer);
             case 9:
-              _context7.next = 14;
+              _context8.next = 14;
               break;
             case 11:
-              _context7.prev = 11;
-              _context7.t0 = _context7["catch"](0);
-              console.error('[ShopDiscount] 获取客户钱包信息出错:', _context7.t0);
+              _context8.prev = 11;
+              _context8.t0 = _context8["catch"](0);
+              console.error('[ShopDiscount] 获取客户钱包信息出错:', _context8.t0);
             case 14:
             case "end":
-              return _context7.stop();
+              return _context8.stop();
           }
-        }, _callee7, this, [[0, 11]]);
+        }, _callee8, this, [[0, 11]]);
       }));
-      function getCustomerWallet(_x7) {
+      function getCustomerWallet(_x8) {
         return _getCustomerWallet.apply(this, arguments);
       }
       return getCustomerWallet;
@@ -697,32 +735,32 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "bestDiscount",
     value: function () {
-      var _bestDiscount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(cb) {
+      var _bestDiscount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(cb) {
         var _this$store$productLi;
         var newDiscountList, _result2;
-        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
               newDiscountList = this.store.originalDiscountList;
               this.setDiscountList(newDiscountList);
               if (!((_this$store$productLi = this.store.productList) !== null && _this$store$productLi !== void 0 && _this$store$productLi.length)) {
-                _context8.next = 7;
+                _context9.next = 7;
                 break;
               }
               _result2 = this.calcDiscount(this.store.productList);
               cb === null || cb === void 0 || cb(_result2);
-              _context8.next = 7;
+              _context9.next = 7;
               return this.core.effects.emit("".concat(this.name, ":onLoadPrepareCalcResult"), _result2);
             case 7:
-              _context8.next = 9;
+              _context9.next = 9;
               return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), newDiscountList);
             case 9:
             case "end":
-              return _context8.stop();
+              return _context9.stop();
           }
-        }, _callee8, this);
+        }, _callee9, this);
       }));
-      function bestDiscount(_x8) {
+      function bestDiscount(_x9) {
         return _bestDiscount.apply(this, arguments);
       }
       return bestDiscount;
@@ -730,17 +768,17 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "loadPrepareConfig",
     value: function () {
-      var _loadPrepareConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(params) {
-        var _this$getCustomer2, _this$store$discount7, _this$getDiscountList, _this$store$discount8, _this$store$productLi2, customerId, goodPassList, scanDiscount, scanDiscountIds, newGoodPassList, newDiscountList, filteredDiscountList, _result3;
-        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+      var _loadPrepareConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(params) {
+        var _this$getCustomer2, _this$store$discount8, _this$getDiscountList, _this$store$discount9, _this$store$productLi2, customerId, goodPassList, scanDiscount, scanDiscountIds, newGoodPassList, newDiscountList, filteredDiscountList, _result3;
+        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
-              _context9.prev = 0;
+              _context10.prev = 0;
               customerId = params.customerId || ((_this$getCustomer2 = this.getCustomer()) === null || _this$getCustomer2 === void 0 ? void 0 : _this$getCustomer2.id); // if (customerId === 1 || !customerId) {
               //   return
               // }
-              _context9.next = 4;
-              return (_this$store$discount7 = this.store.discount) === null || _this$store$discount7 === void 0 ? void 0 : _this$store$discount7.loadPrepareConfig({
+              _context10.next = 4;
+              return (_this$store$discount8 = this.store.discount) === null || _this$store$discount8 === void 0 ? void 0 : _this$store$discount8.loadPrepareConfig({
                 customer_id: customerId,
                 action: 'create',
                 with_good_pass: 1,
@@ -749,7 +787,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 request_timezone: Intl.DateTimeFormat().resolvedOptions().timeZone
               });
             case 4:
-              goodPassList = _context9.sent;
+              goodPassList = _context10.sent;
               scanDiscount = (_this$getDiscountList = this.getDiscountList()) === null || _this$getDiscountList === void 0 ? void 0 : _this$getDiscountList.filter(function (item) {
                 return item.isScan;
               }); // goodPassList 里可能有 scanDiscount 重合的部分，goodPassList 需要剔除
@@ -761,37 +799,37 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               });
               newDiscountList = [].concat(_toConsumableArray(scanDiscount), _toConsumableArray(newGoodPassList || [])); // 存储原始优惠券列表
               this.store.originalDiscountList = newDiscountList;
-              _context9.next = 12;
-              return (_this$store$discount8 = this.store.discount) === null || _this$store$discount8 === void 0 ? void 0 : _this$store$discount8.setOriginalDiscountList(newDiscountList);
+              _context10.next = 12;
+              return (_this$store$discount9 = this.store.discount) === null || _this$store$discount9 === void 0 ? void 0 : _this$store$discount9.setOriginalDiscountList(newDiscountList);
             case 12:
               // 根据当前预约时间过滤优惠券列表
               filteredDiscountList = this.filterDiscountListByBookingTime(newDiscountList, this.store.currentBookingTime);
               this.store.filteredDiscountList = filteredDiscountList;
               this.setDiscountList(filteredDiscountList || []);
               if (!((_this$store$productLi2 = this.store.productList) !== null && _this$store$productLi2 !== void 0 && _this$store$productLi2.length)) {
-                _context9.next = 19;
+                _context10.next = 19;
                 break;
               }
               _result3 = this.calcDiscount(this.store.productList);
-              _context9.next = 19;
+              _context10.next = 19;
               return this.core.effects.emit("".concat(this.name, ":onLoadPrepareCalcResult"), _result3);
             case 19:
-              _context9.next = 21;
+              _context10.next = 21;
               return this.core.effects.emit("".concat(this.name, ":onLoadDiscountList"), filteredDiscountList);
             case 21:
-              _context9.next = 26;
+              _context10.next = 26;
               break;
             case 23:
-              _context9.prev = 23;
-              _context9.t0 = _context9["catch"](0);
-              console.error('[ShopDiscount] 加载准备配置出错:', _context9.t0);
+              _context10.prev = 23;
+              _context10.t0 = _context10["catch"](0);
+              console.error('[ShopDiscount] 加载准备配置出错:', _context10.t0);
             case 26:
             case "end":
-              return _context9.stop();
+              return _context10.stop();
           }
-        }, _callee9, this, [[0, 23]]);
+        }, _callee10, this, [[0, 23]]);
       }));
-      function loadPrepareConfig(_x9) {
+      function loadPrepareConfig(_x10) {
         return _loadPrepareConfig.apply(this, arguments);
       }
       return loadPrepareConfig;

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

@@ -25,6 +25,7 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
         request_timezone: string;
     }): Promise<Discount[]>;
     batchSearch(code: string, customerId?: number): Promise<Discount[]>;
+    batchSearchByProductIds(productIds: number[]): Promise<any>;
     filterEnabledDiscountList(discountList: Discount[]): Discount[];
     private checkUsageCreditsLimit;
     uniqueByProductId(discountList: Discount[]): Discount[];

package/lib/modules/Discount/index.js

@@ -117,6 +117,15 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
     const resultDiscountList = this.filterEnabledDiscountList((result == null ? void 0 : result.data) || []) || [];
     return resultDiscountList;
   }
+  async batchSearchByProductIds(productIds) {
+    const result = await this.request.get(`/machinecode/batch-search`, {
+      ids: productIds,
+      translate_flag: 1,
+      tags: ["good_pass", "product_discount_card"],
+      relation_product: 1
+    });
+    return (result == null ? void 0 : result.data) || [];
+  }
   filterEnabledDiscountList(discountList) {
     return discountList.filter(
       (discount) => discount.limit_status === "enable" && new import_decimal.default((discount == null ? void 0 : discount.par_value) || 0).minus(new import_decimal.default((discount == null ? void 0 : discount.used_par_value) || 0)).greaterThan(0) && this.checkUsageCreditsLimit(discount)

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

@@ -122,6 +122,7 @@ export interface Discount {
     num?: number;
     start_date?: string;
     start_time?: string;
+    discount_rule_uncheck_flag?: boolean;
 }
 export interface DiscountState {
     discountList: Discount[];

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/modules/Rules/index.js

@@ -182,7 +182,6 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     holders,
     isFormSubject
   }, options) {
-    const isEditModeAddNewProduct = productList.find((n) => n.booking_id) && productList.find((n) => !n.booking_id);
     const editModeDiscount = [];
     const addModeDiscount = [];
     discountList.forEach((discount) => {
@@ -222,7 +221,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           _id: product._id,
           parentId: product._id,
           quantity: product.quantity,
-          num: product.num
+          num: product.num,
+          booking_id: product.booking_id
         });
         if (product.bundle && Array.isArray(product.bundle) && product.bundle.length > 0) {
           product.bundle.forEach((bundleItem, bundleIndex) => {
@@ -244,7 +244,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               origin_total: new import_decimal.default(bundleItem.price || 0).mul(bundleItem.num || 1).toNumber(),
               original_price: bundleItem.original_price,
               // 继承主商品属性
-              booking_id: product.booking_id,
+              booking_id: bundleItem.booking_id,
               discount_list: bundleItem.discount_list || []
             });
           });
@@ -334,6 +334,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       return compareByExpireTime(a, b);
     });
     const flattenedList = flattenProductsWithBundle(productList);
+    const isEditModeAddNewProduct = flattenedList.find((n) => n.booking_id) && flattenedList.find((n) => !n.booking_id);
     const sortedFlattenedList = flattenedList.sort((a, b) => {
       var _a, _b;
       const priceA = new import_decimal.default(
@@ -555,7 +556,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               product_id: originProduct.id
             },
             metadata: {
-              num
+              num,
+              discount_rule_uncheck_flag: discount == null ? void 0 : discount.discount_rule_uncheck_flag
             }
           };
           applicableProducts.push(productData);
@@ -818,6 +820,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             _num: isGoodPass ? 1 : product.num,
             metadata: {
               num: 1,
+              discount_rule_uncheck_flag: selectedDiscount2 == null ? void 0 : selectedDiscount2.discount_rule_uncheck_flag,
               // 🔥 order_level 分摊差值
               ...productDiscountDifference !== void 0 && { product_discount_difference: productDiscountDifference }
             }
@@ -885,6 +888,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               metadata: {
                 // 🔥 使用拆分后的唯一 _id
                 custom_product_bundle_map_id: uniqueId,
+                discount_rule_uncheck_flag: selectedDiscount2 == null ? void 0 : selectedDiscount2.discount_rule_uncheck_flag,
                 num: 1
               },
               _num: 1
@@ -957,6 +961,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             metadata: {
               // 🔥 使用唯一的 _id
               custom_product_bundle_map_id: uniqueId,
+              discount_rule_uncheck_flag: selectedDiscount2 == null ? void 0 : selectedDiscount2.discount_rule_uncheck_flag,
               num: product.num || 1,
               // 🔥 order_level 分摊差值
               ...productDiscountDifference !== void 0 && { product_discount_difference: productDiscountDifference }

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

@@ -310,7 +310,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/BookingByStep/index.js

@@ -1181,7 +1181,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           timeSlots,
           currentCapacity: totalCapacity + (capacity || 0)
         });
-        if (canUseTime && !n.onlyComputed && currentResourceIdleTime > targetResourceTime) {
+        if (canUseTime && !n.onlyComputed && currentResourceIdleTime > targetResourceTime && n.capacity >= (capacity || 0)) {
           targetResource = n;
           targetResourceTime = currentResourceIdleTime;
           break;
@@ -1533,6 +1533,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     }
     const calculateCapacityFromCartItems = (items) => {
       var _a2;
+      if (items.length === 0)
+        return 0;
       const firstResource = (_a2 = items[0]._resourceOrigin) == null ? void 0 : _a2[0].id;
       const sameResourceLength = items.filter((item) => {
         var _a3;
@@ -1666,6 +1668,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     }
     const calculateCapacityFromCartItems = (items) => {
       var _a2;
+      if (items.length === 0)
+        return 0;
       const firstResource = (_a2 = items[0]._resourceOrigin) == null ? void 0 : _a2[0].id;
       const sameResourceLength = items.filter((item) => {
         var _a3;

package/lib/solution/BookingByStep/utils/resources.js

@@ -298,7 +298,7 @@ var getResourcesByProduct = (resourcesMap, resources, selectedResources, capacit
         const latestTime = d.times.reduce((latest, current) => {
           return (0, import_dayjs.default)(current.end_at).isAfter((0, import_dayjs.default)(latest.end_at)) ? current : latest;
         }, d.times[0]);
-        return (0, import_dayjs.default)(latestTime.end_at).isAfter((0, import_dayjs.default)());
+        return (0, import_dayjs.default)(latestTime.end_at).isAfter((0, import_dayjs.default)()) && d.capacity >= capacity;
       });
       item.form_id = form_id;
       acc.push(item);

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

@@ -115,7 +115,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

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

@@ -38,6 +38,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
         discountList: Discount[];
     };
     setProductList(productList: Record<string, any>[]): void;
+    batchSearchByProductIds(productIds: number[]): Promise<Discount[]>;
     scanCode(code: string, customerId?: number): Promise<{
         isAvailable: boolean;
         productList: Record<string, any>[];

package/lib/solution/ShopDiscount/index.js

@@ -259,6 +259,20 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   setProductList(productList) {
     this.store.productList = productList;
   }
+  async batchSearchByProductIds(productIds) {
+    var _a;
+    let resultDiscountList = await ((_a = this.store.discount) == null ? void 0 : _a.batchSearchByProductIds(productIds)) || [];
+    resultDiscountList = resultDiscountList.map((item) => {
+      return {
+        ...item,
+        discount_rule_uncheck_flag: true
+      };
+    });
+    const currentDiscountList = this.getDiscountList() || [];
+    const newDiscountList = [...currentDiscountList, ...resultDiscountList];
+    this.setDiscountList(newDiscountList);
+    return newDiscountList;
+  }
   // 扫码输入code
   async scanCode(code, customerId) {
     var _a, _b, _c;

package/package.json

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