@pisell/pisellos 1.0.15 → 1.0.17

package/dist/modules/AccountList/index.js

@@ -303,7 +303,7 @@ export var AccountListModule = /*#__PURE__*/function (_BaseModule) {
     key: "removeAccount",
     value: function () {
       var _removeAccount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(id) {
-        var index;
+        var _this$getActiveAccoun, index;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
@@ -324,26 +324,31 @@ export var AccountListModule = /*#__PURE__*/function (_BaseModule) {
               this.store.accountList = this.store.accountList.filter(function (account) {
                 return account.id !== id;
               });
-              _context6.next = 11;
+
+              // 检测 如果被删除的是活跃账号，则默认把第一个账号设置为 activeAccount
+              if (((_this$getActiveAccoun = this.getActiveAccount()) === null || _this$getActiveAccoun === void 0 ? void 0 : _this$getActiveAccoun.getId()) === id) {
+                this.setActiveAccount(this.store.accounts[0].getId());
+              }
+              _context6.next = 12;
               return this.core.effects.emit(AccountListHooks.OnAccountListUpdate, this.store);
-            case 11:
-              _context6.next = 18;
+            case 12:
+              _context6.next = 19;
               break;
-            case 13:
-              _context6.prev = 13;
+            case 14:
+              _context6.prev = 14;
               _context6.t0 = _context6["catch"](0);
               this.store.error = _context6.t0 instanceof Error ? _context6.t0.message : 'Failed to remove account';
-              _context6.next = 18;
+              _context6.next = 19;
               return this.core.effects.emit(AccountListHooks.OnAccountListError, this.store.error);
-            case 18:
-              _context6.prev = 18;
+            case 19:
+              _context6.prev = 19;
               this.store.isLoading = false;
-              return _context6.finish(18);
-            case 21:
+              return _context6.finish(19);
+            case 22:
             case "end":
               return _context6.stop();
           }
-        }, _callee6, this, [[0, 13, 18, 21]]);
+        }, _callee6, this, [[0, 14, 19, 22]]);
       }));
       function removeAccount(_x9) {
         return _removeAccount.apply(this, arguments);

package/dist/modules/Cart/index.js

@@ -256,7 +256,8 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
           bundle: bundle,
           options: options,
           product_variant_id: newProduct.product_variant_id,
-          quantity: quantity
+          quantity: quantity,
+          discounts: discounts
         });
       }
       if (discounts) {

package/dist/modules/Cart/utils/cartProduct.d.ts

@@ -20,6 +20,7 @@ export declare const formatProductToCartItem: (params: {
     options?: any;
     product_variant_id?: number;
     quantity?: number;
+    discounts?: any[];
 }) => CartItem;
 export declare const formatProductToCartItemOrigin: (params: {
     cartItem: CartItem;
@@ -40,6 +41,7 @@ export declare const getProductTotalPrice: (params: {
     bundle?: any;
     options?: any;
     num?: number;
+    discounts?: any[];
 }) => number;
 /**
  * 获取商品原始总价

package/dist/modules/Cart/utils/cartProduct.js

@@ -48,7 +48,8 @@ export var formatProductToCartItem = function formatProductToCartItem(params) {
     options = params.options,
     product_variant_id = params.product_variant_id,
     _params$quantity = params.quantity,
-    quantity = _params$quantity === void 0 ? 1 : _params$quantity;
+    quantity = _params$quantity === void 0 ? 1 : _params$quantity,
+    discounts = params.discounts;
   var num = quantity; // 当前按照单个商品加入购物车
   if (product) {
     cartItem.id = product === null || product === void 0 ? void 0 : product.id;
@@ -59,7 +60,8 @@ export var formatProductToCartItem = function formatProductToCartItem(params) {
       product: product,
       bundle: bundle,
       options: options,
-      num: num
+      num: num,
+      discounts: discounts
     });
     cartItem.summaryTotal = cartItem.total * (num || 1);
     cartItem.origin_total = getProductOriginTotalPrice({
@@ -161,7 +163,8 @@ export var formatProductToCartItemOrigin = function formatProductToCartItemOrigi
 export var getProductTotalPrice = function getProductTotalPrice(params) {
   var product = params.product,
     bundle = params.bundle,
-    options = params.options;
+    options = params.options,
+    discounts = params.discounts;
   // const num = params.num || 1;
   var price = Number(product.price);
   if (bundle !== null && bundle !== void 0 && bundle.length) {
@@ -176,6 +179,18 @@ export var getProductTotalPrice = function getProductTotalPrice(params) {
       return accumulator + Number(currentValue.price) * Number(currentValue.num);
     }, price);
   }
+
+  // 如果商品有折扣，则计算折扣
+  if (discounts !== null && discounts !== void 0 && discounts.length) {
+    discounts.forEach(function (currentValue) {
+      // 不是商品券则代表折扣卡，计算打折后的价格
+      // 一个商品折扣卡只能存在于一张
+      if (currentValue.type !== 'good_pass') {
+        var discountPrice = new Decimal(100).minus(currentValue.discount.percent || 0).div(100).mul(new Decimal(price || 0)).toFixed(2);
+        price = Number(discountPrice);
+      }
+    });
+  }
   return price;
 };
 

package/dist/modules/Discount/index.js

@@ -129,10 +129,9 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
               return this.request.post("/order/prepare/config", params);
             case 2:
               prepareConfig = _context3.sent;
-              goodPassList = this.filterEnabledDiscountList([].concat(_toConsumableArray((prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data = prepareConfig.data) === null || _prepareConfig$data === void 0 ? void 0 : _prepareConfig$data.good_pass_list) || []), _toConsumableArray((prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data2 = prepareConfig.data) === null || _prepareConfig$data2 === void 0 ? void 0 : _prepareConfig$data2.discount_card_list) || []))) || [];
-              this.setDiscountList(goodPassList);
+              goodPassList = this.filterEnabledDiscountList([].concat(_toConsumableArray((prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data = prepareConfig.data) === null || _prepareConfig$data === void 0 ? void 0 : _prepareConfig$data.good_pass_list) || []), _toConsumableArray((prepareConfig === null || prepareConfig === void 0 || (_prepareConfig$data2 = prepareConfig.data) === null || _prepareConfig$data2 === void 0 ? void 0 : _prepareConfig$data2.discount_card_list) || []))) || []; // this.setDiscountList(goodPassList);
               return _context3.abrupt("return", goodPassList);
-            case 6:
+            case 5:
             case "end":
               return _context3.stop();
           }

package/dist/modules/Rules/index.js

@@ -119,8 +119,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         };
       }
 
-      // 合并新旧折扣列表，并计算折扣结果
-      var mergedDiscountList = uniqueById(uniqueById([].concat(_toConsumableArray(oldDiscountList), _toConsumableArray(newDiscountList))), 'product_id');
+      // 合并新旧折扣列表，并计算折扣结果,注意，如果旧折扣里有 isEditMode 为 true 的优惠券，则不合并
+      var filteredOldDiscountList = oldDiscountList.filter(function (discount) {
+        return !discount.isEditMode && discount.tag !== 'good_pass';
+      });
+      var mergedDiscountList = uniqueById(uniqueById([].concat(_toConsumableArray(filteredOldDiscountList), _toConsumableArray(newDiscountList))), 'product_id');
       var result = this.calcDiscount({
         discountList: mergedDiscountList,
         productList: _toConsumableArray(productList)
@@ -412,44 +415,37 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             _id: product._id.split('___')[0]
           }));
         }
-        var _loop = function _loop() {
-          var selectedDiscount = applicableDiscounts[_i];
+        for (var _i = 0; _i < splitCount; _i++) {
+          var _selectedDiscount = applicableDiscounts[_i];
           // 标记优惠券为已使用
-          usedDiscounts.set(selectedDiscount.id, true);
+          usedDiscounts.set(_selectedDiscount.id, true);
 
           // 记录实际应用了优惠券的商品信息
-          var appliedProducts = appliedDiscountProducts.get(selectedDiscount.id) || [];
-          var targetProductPrice = selectedDiscount.tag === 'good_pass' ? '0' : new Decimal(100).minus(selectedDiscount.par_value || 0).div(100).mul(new Decimal(product.price || 0)).toFixed(2);
+          var appliedProducts = appliedDiscountProducts.get(_selectedDiscount.id) || [];
+
+          // 计算使用折扣卡/商品券以后，单个商品的总 total
+          var targetProductTotal = _selectedDiscount.tag === 'good_pass' ? new Decimal(product.origin_total || 0).minus(new Decimal(product.price || 0)).toNumber() : new Decimal(100).minus(_selectedDiscount.par_value || 0).div(100).mul(new Decimal(product.origin_total || 0)).toNumber();
           var discountDetail = {
-            amount: selectedDiscount.tag === 'product_discount_card' ? new Decimal(product.price || 0).minus(new Decimal(targetProductPrice)).toNumber() : product.price,
-            type: selectedDiscount.tag === 'product_discount_card' ? 'discount_card' : selectedDiscount.tag,
+            amount: new Decimal(product.origin_total || 0).minus(new Decimal(targetProductTotal)).toNumber(),
+            type: _selectedDiscount.tag === 'product_discount_card' ? 'discount_card' : _selectedDiscount.tag,
             discount: {
-              resource_id: selectedDiscount.id,
-              title: selectedDiscount.format_title,
+              resource_id: _selectedDiscount.id,
+              title: _selectedDiscount.format_title,
               original_amount: product.origin_total,
               product_id: originProduct.id,
-              percent: selectedDiscount.par_value
+              percent: _selectedDiscount.par_value
             },
             num: product.num || 1
           };
           appliedProducts.push(discountDetail);
-          appliedDiscountProducts.set(selectedDiscount.id, appliedProducts);
+          appliedDiscountProducts.set(_selectedDiscount.id, appliedProducts);
 
           // 记录应用了优惠券的商品
           // 后续更新价格改为 getProductTotalPrice getProductOriginTotalPrice逻辑
           if (product.isClient) {
-            var _originProduct$_produ;
-            var variant = (_originProduct$_produ = originProduct._productOrigin.variant) === null || _originProduct$_produ === void 0 ? void 0 : _originProduct$_produ.map(function (n) {
-              if (n.id === originProduct._productOrigin.product_variant_id) {
-                n.original_price = originProduct._productInit.price;
-                var _targetProductPrice = selectedDiscount.tag === 'good_pass' ? '0' : new Decimal(100).minus(selectedDiscount.par_value || 0).div(100).mul(new Decimal(originProduct._productInit.price || 0)).toFixed(2);
-                n.price = _targetProductPrice;
-              }
-              return n;
-            });
             arr.push(_this3.hooks.setProduct(originProduct, {
               discount_list: [discountDetail],
-              price: new Decimal(targetProductPrice).toNumber(),
+              price: _selectedDiscount.tag === 'good_pass' ? 0 : product.price,
               quantity: isNeedSplit ? 1 : product.quantity,
               origin_total: getProductOriginTotalPrice({
                 product: {
@@ -458,29 +454,19 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 bundle: product.bundle,
                 options: product.options
               }),
-              variant: variant,
-              original_price: new Decimal(product.price).toNumber(),
-              total: getProductTotalPrice({
-                product: {
-                  price: targetProductPrice
-                },
-                bundle: product.bundle,
-                options: product.options
-              })
+              original_price: new Decimal(product.price || 0).toNumber(),
+              total: targetProductTotal
             }));
           } else {
             arr.push(_this3.hooks.setProduct(originProduct, {
               discount_list: [discountDetail],
-              _id: product._id.split('___')[0] + "___" + selectedDiscount.id,
-              price: new Decimal(targetProductPrice).toNumber(),
+              _id: product._id.split('___')[0] + "___" + _selectedDiscount.id,
+              price: _selectedDiscount.tag === 'good_pass' ? 0 : product.price,
               quantity: isNeedSplit ? 1 : product.quantity,
-              total: new Decimal(product.origin_total || product.total || 0).minus(new Decimal(product.price || 0).minus(new Decimal(targetProductPrice))).toNumber(),
+              total: targetProductTotal,
               origin_total: product.origin_total || product.total
             }));
           }
-        };
-        for (var _i = 0; _i < splitCount; _i++) {
-          _loop();
         }
         console.log(arr, 'arrarrarr');
         processedProductsMap.set(product._id, arr);
@@ -555,6 +541,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         if (usedDiscounts.get(discount.id)) {
           return _objectSpread(_objectSpread({}, discount), {}, {
             isSelected: true,
+            isManualSelect: options !== null && options !== void 0 && options.scan ? false : discount.isManualSelect,
             // 标记为可用，因为它已被应用
             isAvailable: true,
             // 记录适用的商品IDs
@@ -577,6 +564,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // 如果有适用的商品，标记为可用
           isAvailable: isAvailable,
           isSelected: isSelected,
+          // 如果是扫码进来的，要手动设置为手动选择：false
+          isManualSelect: options !== null && options !== void 0 && options.scan ? false : discount.isManualSelect,
           // 记录适用的商品IDs
           applicableProductIds: applicableProducts,
           // 添加可抵扣的商品详情

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

@@ -47,7 +47,7 @@ export interface RulesParamsHooks {
         total?: number;
         discount_list: any[];
         origin_total?: number;
-        price?: number;
+        price?: string | number;
         variant?: any[];
         original_price?: number;
         quantity?: number;

package/dist/solution/BookingByStep/index.js

@@ -1410,17 +1410,27 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           resources.push.apply(resources, _toConsumableArray(_this10.store.date.getResourcesListByDate(n.date) || []));
         });
       }
+      var cartItems = this.store.cart.getItems().filter(function (n) {
+        return !isNormalProduct(n._productOrigin);
+      });
+
       // 如果此时 resources 为空，视作购物车里已经有了 dateRange 数据，此时 dateList 里明确就是那一天的数据
       if (!resources.length) {
-        var dateList = this.store.date.getDateList();
-        dateList.forEach(function (n) {
-          if (n.resource) resources.push.apply(resources, _toConsumableArray(n.resource));
+        // 如果此时购物车里已经有了开始时间，则直接取那天的数据即可
+        var firstDateCartItem = cartItems === null || cartItems === void 0 ? void 0 : cartItems.find(function (n) {
+          return n.start_date;
         });
+        if (firstDateCartItem !== null && firstDateCartItem !== void 0 && firstDateCartItem.start_date) {
+          var dateResources = this.store.date.getResourcesListByDate(firstDateCartItem.start_date);
+          resources.push.apply(resources, _toConsumableArray(dateResources || []));
+        } else {
+          var dateList = this.store.date.getDateList();
+          dateList.forEach(function (n) {
+            if (n.resource) resources.push.apply(resources, _toConsumableArray(n.resource));
+          });
+        }
       }
       var resourcesMap = getResourcesMap(cloneDeep(resources));
-      var cartItems = this.store.cart.getItems().filter(function (n) {
-        return !isNormalProduct(n._productOrigin);
-      });
       var arr = [];
       cartItems.forEach(function (cartItem) {
         var _cartItem$_productOri;

package/dist/solution/ShopDiscount/index.js

@@ -574,7 +574,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadPrepareConfig",
     value: function () {
       var _loadPrepareConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(params) {
-        var _this$getCustomer2, _this$store$discount7, _this$getDiscountList, _this$store$productLi, customerId, goodPassList, scanDiscount, newDiscountList, result;
+        var _this$getCustomer2, _this$store$discount7, _this$getDiscountList, _this$store$productLi, customerId, goodPassList, scanDiscount, scanDiscountIds, newGoodPassList, newDiscountList, result;
         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
@@ -593,31 +593,37 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
               goodPassList = _context8.sent;
               scanDiscount = (_this$getDiscountList = this.getDiscountList()) === null || _this$getDiscountList === void 0 ? void 0 : _this$getDiscountList.filter(function (item) {
                 return item.isScan;
+              }); // goodPassList 里可能有 scanDiscount 重合的部分，goodPassList 需要剔除
+              scanDiscountIds = scanDiscount.map(function (n) {
+                return n.id;
               });
-              newDiscountList = [].concat(_toConsumableArray(scanDiscount), _toConsumableArray(goodPassList || []));
+              newGoodPassList = goodPassList === null || goodPassList === void 0 ? void 0 : goodPassList.filter(function (n) {
+                return !scanDiscountIds.includes(n.id);
+              });
+              newDiscountList = [].concat(_toConsumableArray(scanDiscount), _toConsumableArray(newGoodPassList || []));
               this.setDiscountList(newDiscountList || []);
               if (!((_this$store$productLi = this.store.productList) !== null && _this$store$productLi !== void 0 && _this$store$productLi.length)) {
-                _context8.next = 12;
+                _context8.next = 14;
                 break;
               }
               result = this.calcDiscount(this.store.productList);
-              _context8.next = 12;
-              return this.core.effects.emit(ShopDiscountHooks.onLoadPrepareCalcResult, result);
-            case 12:
               _context8.next = 14;
-              return this.core.effects.emit(ShopDiscountHooks.onLoadDiscountList, newDiscountList);
+              return this.core.effects.emit(ShopDiscountHooks.onLoadPrepareCalcResult, result);
             case 14:
-              _context8.next = 19;
-              break;
+              _context8.next = 16;
+              return this.core.effects.emit(ShopDiscountHooks.onLoadDiscountList, newDiscountList);
             case 16:
-              _context8.prev = 16;
+              _context8.next = 21;
+              break;
+            case 18:
+              _context8.prev = 18;
               _context8.t0 = _context8["catch"](0);
               console.error('[ShopDiscount] 加载准备配置出错:', _context8.t0);
-            case 19:
+            case 21:
             case "end":
               return _context8.stop();
           }
-        }, _callee8, this, [[0, 16]]);
+        }, _callee8, this, [[0, 18]]);
       }));
       function loadPrepareConfig(_x7) {
         return _loadPrepareConfig.apply(this, arguments);

package/lib/modules/AccountList/index.js

@@ -179,6 +179,7 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
     });
   }
   async removeAccount(id) {
+    var _a;
     try {
       this.store.isLoading = true;
       this.store.error = null;
@@ -194,6 +195,9 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
       this.store.accountList = this.store.accountList.filter(
         (account) => account.id !== id
       );
+      if (((_a = this.getActiveAccount()) == null ? void 0 : _a.getId()) === id) {
+        this.setActiveAccount(this.store.accounts[0].getId());
+      }
       await this.core.effects.emit(
         import_types.AccountListHooks.OnAccountListUpdate,
         this.store

package/lib/modules/Cart/index.js

@@ -158,7 +158,8 @@ var CartModule = class extends import_BaseModule.BaseModule {
         bundle,
         options,
         product_variant_id: newProduct.product_variant_id,
-        quantity
+        quantity,
+        discounts
       });
     }
     if (discounts) {

package/lib/modules/Cart/utils/cartProduct.d.ts

@@ -20,6 +20,7 @@ export declare const formatProductToCartItem: (params: {
     options?: any;
     product_variant_id?: number;
     quantity?: number;
+    discounts?: any[];
 }) => CartItem;
 export declare const formatProductToCartItemOrigin: (params: {
     cartItem: CartItem;
@@ -40,6 +41,7 @@ export declare const getProductTotalPrice: (params: {
     bundle?: any;
     options?: any;
     num?: number;
+    discounts?: any[];
 }) => number;
 /**
  * 获取商品原始总价

package/lib/modules/Cart/utils/cartProduct.js

@@ -65,7 +65,8 @@ var formatProductToCartItem = (params) => {
     bundle,
     options,
     product_variant_id,
-    quantity = 1
+    quantity = 1,
+    discounts
   } = params;
   const num = quantity;
   if (product) {
@@ -73,7 +74,7 @@ var formatProductToCartItem = (params) => {
     cartItem.name = product == null ? void 0 : product.title;
     cartItem.price = product == null ? void 0 : product.price;
     cartItem.num = num;
-    cartItem.total = getProductTotalPrice({ product, bundle, options, num });
+    cartItem.total = getProductTotalPrice({ product, bundle, options, num, discounts });
     cartItem.summaryTotal = cartItem.total * (num || 1);
     cartItem.origin_total = getProductOriginTotalPrice({
       product,
@@ -163,7 +164,7 @@ var formatProductToCartItemOrigin = (params) => {
   return origin;
 };
 var getProductTotalPrice = (params) => {
-  const { product, bundle, options } = params;
+  const { product, bundle, options, discounts } = params;
   let price = Number(product.price);
   if (bundle == null ? void 0 : bundle.length) {
     price = bundle.reduce((accumulator, currentValue) => {
@@ -175,6 +176,14 @@ var getProductTotalPrice = (params) => {
       return accumulator + Number(currentValue.price) * Number(currentValue.num);
     }, price);
   }
+  if (discounts == null ? void 0 : discounts.length) {
+    discounts.forEach((currentValue) => {
+      if (currentValue.type !== "good_pass") {
+        const discountPrice = new import_decimal.default(100).minus(currentValue.discount.percent || 0).div(100).mul(new import_decimal.default(price || 0)).toFixed(2);
+        price = Number(discountPrice);
+      }
+    });
+  }
   return price;
 };
 var getProductOriginTotalPrice = (params) => {

package/lib/modules/Discount/index.js

@@ -87,7 +87,6 @@ var DiscountModule = class extends import_BaseModule.BaseModule {
     const goodPassList = this.filterEnabledDiscountList(
       [...((_a = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _a.good_pass_list) || [], ...((_b = prepareConfig == null ? void 0 : prepareConfig.data) == null ? void 0 : _b.discount_card_list) || []]
     ) || [];
-    this.setDiscountList(goodPassList);
     return goodPassList;
   }
   async batchSearch(code) {

package/lib/modules/Rules/index.js

@@ -79,8 +79,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         productList
       };
     }
+    const filteredOldDiscountList = oldDiscountList.filter((discount) => !discount.isEditMode && discount.tag !== "good_pass");
     const mergedDiscountList = (0, import_utils.uniqueById)((0, import_utils.uniqueById)([
-      ...oldDiscountList,
+      ...filteredOldDiscountList,
       ...newDiscountList
     ]), "product_id");
     const result = this.calcDiscount({
@@ -205,7 +206,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     });
     console.log(sortedProductList, "sortedProductListsortedProductList");
     sortedProductList.forEach((originProduct, i) => {
-      var _a, _b, _c, _d, _e, _f;
+      var _a, _b, _c, _d, _e;
       const product = this.hooks.getProduct(originProduct);
       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 && ["good_pass", "discount_card", "product_discount_card"].includes(discount.tag || discount.type)))) {
         processedProductsMap.set(product._id, [originProduct]);
@@ -292,9 +293,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         const selectedDiscount2 = applicableDiscounts[i2];
         usedDiscounts.set(selectedDiscount2.id, true);
         const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
-        const targetProductPrice = selectedDiscount2.tag === "good_pass" ? "0" : new import_decimal.default(100).minus(selectedDiscount2.par_value || 0).div(100).mul(new import_decimal.default(product.price || 0)).toFixed(2);
+        const targetProductTotal = selectedDiscount2.tag === "good_pass" ? new import_decimal.default(product.origin_total || 0).minus(new import_decimal.default(product.price || 0)).toNumber() : new import_decimal.default(100).minus(selectedDiscount2.par_value || 0).div(100).mul(new import_decimal.default(product.origin_total || 0)).toNumber();
         const discountDetail = {
-          amount: selectedDiscount2.tag === "product_discount_card" ? new import_decimal.default(product.price || 0).minus(new import_decimal.default(targetProductPrice)).toNumber() : product.price,
+          amount: new import_decimal.default(product.origin_total || 0).minus(new import_decimal.default(targetProductTotal)).toNumber(),
           type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : selectedDiscount2.tag,
           discount: {
             resource_id: selectedDiscount2.id,
@@ -308,17 +309,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         appliedProducts.push(discountDetail);
         appliedDiscountProducts.set(selectedDiscount2.id, appliedProducts);
         if (product.isClient) {
-          const variant = (_f = originProduct._productOrigin.variant) == null ? void 0 : _f.map((n) => {
-            if (n.id === originProduct._productOrigin.product_variant_id) {
-              n.original_price = originProduct._productInit.price;
-              const targetProductPrice2 = selectedDiscount2.tag === "good_pass" ? "0" : new import_decimal.default(100).minus(selectedDiscount2.par_value || 0).div(100).mul(new import_decimal.default(originProduct._productInit.price || 0)).toFixed(2);
-              n.price = targetProductPrice2;
-            }
-            return n;
-          });
           arr.push(this.hooks.setProduct(originProduct, {
             discount_list: [discountDetail],
-            price: new import_decimal.default(targetProductPrice).toNumber(),
+            price: selectedDiscount2.tag === "good_pass" ? 0 : product.price,
             quantity: isNeedSplit ? 1 : product.quantity,
             origin_total: (0, import_utils2.getProductOriginTotalPrice)({
               product: {
@@ -327,23 +320,16 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               bundle: product.bundle,
               options: product.options
             }),
-            variant,
-            original_price: new import_decimal.default(product.price).toNumber(),
-            total: (0, import_utils2.getProductTotalPrice)({
-              product: {
-                price: targetProductPrice
-              },
-              bundle: product.bundle,
-              options: product.options
-            })
+            original_price: new import_decimal.default(product.price || 0).toNumber(),
+            total: targetProductTotal
           }));
         } else {
           arr.push(this.hooks.setProduct(originProduct, {
             discount_list: [discountDetail],
             _id: product._id.split("___")[0] + "___" + selectedDiscount2.id,
-            price: new import_decimal.default(targetProductPrice).toNumber(),
+            price: selectedDiscount2.tag === "good_pass" ? 0 : product.price,
             quantity: isNeedSplit ? 1 : product.quantity,
-            total: new import_decimal.default(product.origin_total || product.total || 0).minus(new import_decimal.default(product.price || 0).minus(new import_decimal.default(targetProductPrice))).toNumber(),
+            total: targetProductTotal,
             origin_total: product.origin_total || product.total
           }));
         }
@@ -410,6 +396,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         return {
           ...discount,
           isSelected: true,
+          isManualSelect: (options == null ? void 0 : options.scan) ? false : discount.isManualSelect,
           // 标记为可用，因为它已被应用
           isAvailable: true,
           // 记录适用的商品IDs
@@ -431,6 +418,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         // 如果有适用的商品，标记为可用
         isAvailable,
         isSelected,
+        // 如果是扫码进来的，要手动设置为手动选择：false
+        isManualSelect: (options == null ? void 0 : options.scan) ? false : discount.isManualSelect,
         // 记录适用的商品IDs
         applicableProductIds: applicableProducts,
         // 添加可抵扣的商品详情

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

@@ -47,7 +47,7 @@ export interface RulesParamsHooks {
         total?: number;
         discount_list: any[];
         origin_total?: number;
-        price?: number;
+        price?: string | number;
         variant?: any[];
         original_price?: number;
         quantity?: number;

package/lib/solution/BookingByStep/index.js

@@ -820,15 +820,21 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         resources.push(...this.store.date.getResourcesListByDate(n.date) || []);
       });
     }
+    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
     if (!resources.length) {
-      const dateList = this.store.date.getDateList();
-      dateList.forEach((n) => {
-        if (n.resource)
-          resources.push(...n.resource);
-      });
+      const firstDateCartItem = cartItems == null ? void 0 : cartItems.find((n) => n.start_date);
+      if (firstDateCartItem == null ? void 0 : firstDateCartItem.start_date) {
+        const dateResources = this.store.date.getResourcesListByDate(firstDateCartItem.start_date);
+        resources.push(...dateResources || []);
+      } else {
+        const dateList = this.store.date.getDateList();
+        dateList.forEach((n) => {
+          if (n.resource)
+            resources.push(...n.resource);
+        });
+      }
     }
     const resourcesMap = (0, import_utils.getResourcesMap)((0, import_lodash_es.cloneDeep)(resources));
-    const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
     const arr = [];
     cartItems.forEach((cartItem) => {
       var _a, _b, _c, _d, _e, _f;

package/lib/solution/ShopDiscount/index.js

@@ -398,7 +398,9 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       const scanDiscount = (_c = this.getDiscountList()) == null ? void 0 : _c.filter(
         (item) => item.isScan
       );
-      const newDiscountList = [...scanDiscount, ...goodPassList || []];
+      const scanDiscountIds = scanDiscount.map((n) => n.id);
+      const newGoodPassList = goodPassList == null ? void 0 : goodPassList.filter((n) => !scanDiscountIds.includes(n.id));
+      const newDiscountList = [...scanDiscount, ...newGoodPassList || []];
       this.setDiscountList(newDiscountList || []);
       if ((_d = this.store.productList) == null ? void 0 : _d.length) {
         const result = this.calcDiscount(this.store.productList);

package/package.json

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