@pisell/pisellos 0.0.68 → 0.0.70

package/dist/modules/Date/index.js

@@ -144,6 +144,8 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
                 end_date: end_date,
                 resource_ids: resource_ids,
                 front_end_cache_id: this.cacheId
+              }, {
+                useCache: true
               });
             case 11:
               res = _context3.sent;

package/dist/modules/Rules/index.js

@@ -277,34 +277,35 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         }
 
         // 如果没有适用的优惠券，或者手动折扣，则不适用优惠券
-        if (applicableDiscounts.length === 0 || isManualDiscount) {}
-        if (product.isClient) {
-          processedProductsMap.set(product._id, _this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {} : {
-            origin_total: getProductOriginTotalPrice({
-              product: {
-                original_price: product.original_price
-              },
-              bundle: product.bundle,
-              options: product.options
-            }),
-            total: getProductTotalPrice({
-              product: {
-                price: product.price
-              },
-              bundle: product.bundle,
-              options: product.options
-            }),
-            price: product.price
-          }), {}, {
-            discount_list: []
-          })));
-        } else {
-          processedProductsMap.set(product._id, _this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {} : {
-            total: product.origin_total || product.total,
-            price: product.price
-          }), {}, {
-            discount_list: []
-          })));
+        if (applicableDiscounts.length === 0 || isManualDiscount) {
+          if (product.isClient) {
+            processedProductsMap.set(product._id, _this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {} : {
+              origin_total: getProductOriginTotalPrice({
+                product: {
+                  original_price: product.original_price
+                },
+                bundle: product.bundle,
+                options: product.options
+              }),
+              total: getProductTotalPrice({
+                product: {
+                  price: product.price
+                },
+                bundle: product.bundle,
+                options: product.options
+              }),
+              price: product.price
+            }), {}, {
+              discount_list: []
+            })));
+          } else {
+            processedProductsMap.set(product._id, _this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {} : {
+              total: product.origin_total || product.total,
+              price: product.price
+            }), {}, {
+              discount_list: []
+            })));
+          }
           return;
         }
         if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === 'undefined') {

package/dist/solution/BookingByStep/index.js

@@ -1216,6 +1216,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               return canUseTime;
             });
           });
+        } else {
+          productResources.forEach(function (item) {
+            // 如果资源的 capacity 已经小于了当前需要的 capacity ，则需要把资源给过滤掉
+            item.renderList = item.renderList.filter(function (n) {
+              var recordCount = n.capacity || 0;
+              return recordCount >= currentCapacity;
+            });
+          });
         }
         arr.push({
           id: cartItem.id,
@@ -1510,6 +1518,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             _resources.forEach(function (n) {
               var _n$renderList;
               if ((_n$renderList = n.renderList) !== null && _n$renderList !== void 0 && _n$renderList.length) {
+                // 过滤掉 capacity 小于 currentCapacity 的资源
+                n.renderList = n.renderList.filter(function (m) {
+                  var recordCount = m.capacity || 0;
+                  return recordCount >= currentCapacity;
+                });
                 currentResourcesRenderList.push.apply(currentResourcesRenderList, _toConsumableArray(n.renderList || []));
               }
             });

package/dist/solution/ShopDiscount/index.js

@@ -483,21 +483,26 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               });
             case 3:
               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);
+              if (!(result !== null && result !== void 0 && result.data)) {
+                _context7.next = 9;
+                break;
               }
-              _context7.next = 10;
+              _result$data = result.data, wallet_pass_list = _result$data.wallet_pass_list, customer = _objectWithoutProperties(_result$data, _excluded);
+              this.setCustomer(customer);
+              _context7.next = 9;
+              return this.core.effects.emit(ShopDiscountHooks.onScanCustomerChange, customer);
+            case 9:
+              _context7.next = 14;
               break;
-            case 7:
-              _context7.prev = 7;
+            case 11:
+              _context7.prev = 11;
               _context7.t0 = _context7["catch"](0);
               console.error('[ShopDiscount] 获取客户钱包信息出错:', _context7.t0);
-            case 10:
+            case 14:
             case "end":
               return _context7.stop();
           }
-        }, _callee7, this, [[0, 7]]);
+        }, _callee7, this, [[0, 11]]);
       }));
       function getCustomerWallet(_x6) {
         return _getCustomerWallet.apply(this, arguments);

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

@@ -5,6 +5,7 @@ export declare enum ShopDiscountHooks {
     onDestroy = "shopDiscount:onDestroy",
     onLoadDiscountList = "shopDiscount:onLoadDiscountList",
     onCustomerChange = "shopDiscount:onCustomerChange",
+    onScanCustomerChange = "shopDiscount:onScanCustomerChange",
     onDiscountListChange = "shopDiscount:onDiscountListChange",
     onRulesListChange = "shopDiscount:onRulesListChange",
     onLoadPrepareCalcResult = "shopDiscount:onLoadPrepareCalcResult"

package/dist/solution/ShopDiscount/types.js

@@ -3,6 +3,7 @@ export var ShopDiscountHooks = /*#__PURE__*/function (ShopDiscountHooks) {
   ShopDiscountHooks["onDestroy"] = "shopDiscount:onDestroy";
   ShopDiscountHooks["onLoadDiscountList"] = "shopDiscount:onLoadDiscountList";
   ShopDiscountHooks["onCustomerChange"] = "shopDiscount:onCustomerChange";
+  ShopDiscountHooks["onScanCustomerChange"] = "shopDiscount:onScanCustomerChange";
   ShopDiscountHooks["onDiscountListChange"] = "shopDiscount:onDiscountListChange";
   ShopDiscountHooks["onRulesListChange"] = "shopDiscount:onRulesListChange";
   ShopDiscountHooks["onLoadPrepareCalcResult"] = "shopDiscount:onLoadPrepareCalcResult";

package/lib/modules/Date/index.js

@@ -83,6 +83,8 @@ var DateModule = class extends import_BaseModule.BaseModule {
         end_date,
         resource_ids,
         front_end_cache_id: this.cacheId
+      }, {
+        useCache: true
       });
       if (!((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.length)) {
         return (0, import_utils.disableAllDates)(dates);

package/lib/modules/Rules/index.js

@@ -175,42 +175,42 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         isManualDiscount = false;
       }
       if (applicableDiscounts.length === 0 || isManualDiscount) {
-      }
-      if (product.isClient) {
-        processedProductsMap.set(
-          product._id,
-          this.hooks.setProduct(originProduct, {
-            ...isManualDiscount ? {} : {
-              origin_total: (0, import_utils2.getProductOriginTotalPrice)({
-                product: {
-                  original_price: product.original_price
-                },
-                bundle: product.bundle,
-                options: product.options
-              }),
-              total: (0, import_utils2.getProductTotalPrice)({
-                product: {
-                  price: product.price
-                },
-                bundle: product.bundle,
-                options: product.options
-              }),
-              price: product.price
-            },
-            discount_list: []
-          })
-        );
-      } else {
-        processedProductsMap.set(
-          product._id,
-          this.hooks.setProduct(originProduct, {
-            ...isManualDiscount ? {} : {
-              total: product.origin_total || product.total,
-              price: product.price
-            },
-            discount_list: []
-          })
-        );
+        if (product.isClient) {
+          processedProductsMap.set(
+            product._id,
+            this.hooks.setProduct(originProduct, {
+              ...isManualDiscount ? {} : {
+                origin_total: (0, import_utils2.getProductOriginTotalPrice)({
+                  product: {
+                    original_price: product.original_price
+                  },
+                  bundle: product.bundle,
+                  options: product.options
+                }),
+                total: (0, import_utils2.getProductTotalPrice)({
+                  product: {
+                    price: product.price
+                  },
+                  bundle: product.bundle,
+                  options: product.options
+                }),
+                price: product.price
+              },
+              discount_list: []
+            })
+          );
+        } else {
+          processedProductsMap.set(
+            product._id,
+            this.hooks.setProduct(originProduct, {
+              ...isManualDiscount ? {} : {
+                total: product.origin_total || product.total,
+                price: product.price
+              },
+              discount_list: []
+            })
+          );
+        }
         return;
       }
       if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === "undefined") {

package/lib/solution/BookingByStep/index.js

@@ -667,6 +667,13 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             return canUseTime;
           });
         });
+      } else {
+        productResources.forEach((item) => {
+          item.renderList = item.renderList.filter((n) => {
+            const recordCount = n.capacity || 0;
+            return recordCount >= currentCapacity;
+          });
+        });
       }
       arr.push({
         id: cartItem.id,
@@ -918,6 +925,10 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           resources2.forEach((n) => {
             var _a3;
             if ((_a3 = n.renderList) == null ? void 0 : _a3.length) {
+              n.renderList = n.renderList.filter((m) => {
+                const recordCount = m.capacity || 0;
+                return recordCount >= currentCapacity;
+              });
               currentResourcesRenderList.push(...n.renderList || []);
             }
           });

package/lib/solution/ShopDiscount/index.js

@@ -313,6 +313,10 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       if (result == null ? void 0 : result.data) {
         const { wallet_pass_list, ...customer } = result.data;
         this.setCustomer(customer);
+        await this.core.effects.emit(
+          import_types.ShopDiscountHooks.onScanCustomerChange,
+          customer
+        );
       }
     } catch (error) {
       console.error("[ShopDiscount] 获取客户钱包信息出错:", error);

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

@@ -5,6 +5,7 @@ export declare enum ShopDiscountHooks {
     onDestroy = "shopDiscount:onDestroy",
     onLoadDiscountList = "shopDiscount:onLoadDiscountList",
     onCustomerChange = "shopDiscount:onCustomerChange",
+    onScanCustomerChange = "shopDiscount:onScanCustomerChange",
     onDiscountListChange = "shopDiscount:onDiscountListChange",
     onRulesListChange = "shopDiscount:onRulesListChange",
     onLoadPrepareCalcResult = "shopDiscount:onLoadPrepareCalcResult"

package/lib/solution/ShopDiscount/types.js

@@ -27,6 +27,7 @@ var ShopDiscountHooks = /* @__PURE__ */ ((ShopDiscountHooks2) => {
   ShopDiscountHooks2["onDestroy"] = "shopDiscount:onDestroy";
   ShopDiscountHooks2["onLoadDiscountList"] = "shopDiscount:onLoadDiscountList";
   ShopDiscountHooks2["onCustomerChange"] = "shopDiscount:onCustomerChange";
+  ShopDiscountHooks2["onScanCustomerChange"] = "shopDiscount:onScanCustomerChange";
   ShopDiscountHooks2["onDiscountListChange"] = "shopDiscount:onDiscountListChange";
   ShopDiscountHooks2["onRulesListChange"] = "shopDiscount:onRulesListChange";
   ShopDiscountHooks2["onLoadPrepareCalcResult"] = "shopDiscount:onLoadPrepareCalcResult";

package/package.json

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