@pisell/pisellos 0.0.239 → 0.0.241

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

@@ -2,6 +2,7 @@ import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
 import { Rules, RulesModuleAPI, DiscountResult } from './types';
 import { Discount } from "../Discount/types";
+import { SetDiscountSelectedParams } from '../../solution/ShopDiscount/types';
 export declare class RulesModule extends BaseModule implements Module, RulesModuleAPI {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -26,6 +27,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
     }, options?: {
         isSelected?: boolean;
         discountId?: number;
+        selectedList?: SetDiscountSelectedParams[];
         scan?: boolean;
     }): DiscountResult;
     destroy(): Promise<void>;

package/dist/modules/Rules/index.js

@@ -324,7 +324,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
       // 然后再处理应用哪些优惠券，此时只考虑filteredDiscountList中的优惠券
       sortedProductList.forEach(function (originProduct, i) {
-        var _product$discount_lis4, _product$discount_lis5, _product$discount_lis7, _product$discount_lis8, _product$discount_lis9, _product$discount_lis10;
+        var _product$discount_lis4, _product$discount_lis5, _product$discount_lis7, _product$discount_lis8, _product$discount_lis9, _product$discount_lis10, _product$discount_lis11;
         var product = _this3.hooks.getProduct(originProduct);
         if (product !== null && product !== void 0 && product.booking_id && (_product$discount_lis4 = product.discount_list) !== null && _product$discount_lis4 !== void 0 && _product$discount_lis4.length && product !== null && product !== void 0 && (_product$discount_lis5 = product.discount_list) !== null && _product$discount_lis5 !== void 0 && _product$discount_lis5.every(function (discount) {
           return discount.id && ['good_pass', 'discount_card', 'product_discount_card'].includes(discount.tag || discount.type);
@@ -378,6 +378,15 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         })) {
           isManualDiscount = false;
         }
+        if (options !== null && options !== void 0 && options.selectedList && (_product$discount_lis11 = product.discount_list) !== null && _product$discount_lis11 !== void 0 && _product$discount_lis11.some(function (item) {
+          var _options$selectedList;
+          return options === null || options === void 0 || (_options$selectedList = options.selectedList) === null || _options$selectedList === void 0 ? void 0 : _options$selectedList.some(function (n) {
+            var _item$discount2;
+            return n.discountId === ((_item$discount2 = item.discount) === null || _item$discount2 === void 0 ? void 0 : _item$discount2.resource_id);
+          });
+        })) {
+          isManualDiscount = false;
+        }
 
         // 如果没有适用的优惠券，或者手动折扣，则不适用优惠券
         // 自定义商品：如果未开启适用折扣卡（product.vouchersApplicable），则不适用优惠券
@@ -435,7 +444,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }));
         }
         for (var _i = 0; _i < splitCount; _i++) {
-          var _product$discount_lis11, _originProduct$_produ;
+          var _product$discount_lis12, _originProduct$_produ;
           // 如果用过折扣卡，也就不存在拆分的情况了，这里直接使用上面计算出来的折扣卡
           var _selectedDiscount = selectedDiscountCard || applicableDiscounts[_i];
           // 标记优惠券为已使用
@@ -447,7 +456,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // 优先从 origin_total拿，可能会拿不到（比如用户端预约在没有配置 original_price 的情况下）
           var productOriginTotal = product.origin_total || product.total || 0;
           // 如果当前 product 有 discount_list，则先从 origin_total 拿
-          if ((_product$discount_lis11 = product.discount_list) !== null && _product$discount_lis11 !== void 0 && _product$discount_lis11.length && product.origin_total) {
+          if ((_product$discount_lis12 = product.discount_list) !== null && _product$discount_lis12 !== void 0 && _product$discount_lis12.length && product.origin_total) {
             productOriginTotal = product.origin_total;
           }
           // 如果originProduct?._productInit?.original_price为 0，product.origin_total可能为空，此时取 product.total

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

@@ -111,7 +111,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

@@ -1,6 +1,6 @@
 import { Module, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
-import { Customer } from './types';
+import { Customer, SetDiscountSelectedParams } from './types';
 import { Discount } from '../../modules/Discount/types';
 export declare class ShopDiscountImpl extends BaseModule implements Module {
     protected defaultName: string;
@@ -19,17 +19,11 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     private registerDependentModules;
     private registerEventListeners;
     setCustomer(customer: Customer): Promise<void>;
-    calcDiscount(productList: Record<string, any>[], options?: {
-        discountId: number;
-        isSelected: boolean;
-    }): {
+    calcDiscount(productList: Record<string, any>[], options?: SetDiscountSelectedParams): {
         productList: Record<string, any>[];
         discountList: Discount[];
     };
-    setDiscountSelected({ discountId, isSelected, }: {
-        discountId: number;
-        isSelected: boolean;
-    }): {
+    setDiscountSelected(params: SetDiscountSelectedParams): {
         productList: Record<string, any>[];
         discountList: Discount[];
     };

package/dist/solution/ShopDiscount/index.js

@@ -267,19 +267,38 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     // 设置优惠券使用状态
   }, {
     key: "setDiscountSelected",
-    value: function setDiscountSelected(_ref2) {
-      var discountId = _ref2.discountId,
-        isSelected = _ref2.isSelected;
+    value: function setDiscountSelected(params) {
       // 获取当前优惠券列表
       var discountList = this.getDiscountList();
 
+      // 构建选择操作列表
+      var selectionOperations = [];
+
+      // 主要操作
+      selectionOperations.push({
+        discountId: params.discountId,
+        isSelected: params.isSelected
+      });
+
+      // 如果有批量操作列表，添加到操作列表中
+      if (params.selectedList && params.selectedList.length > 0) {
+        selectionOperations.push.apply(selectionOperations, _toConsumableArray(params.selectedList));
+      }
+
+      // 创建选择状态映射（去重处理，后面的操作会覆盖前面的）
+      var selectionMap = new Map();
+      selectionOperations.forEach(function (operation) {
+        selectionMap.set(operation.discountId, operation.isSelected);
+      });
+
       // 找到需要修改状态的优惠券
       var newDiscountList = discountList.map(function (discount) {
-        if (discount.id === discountId) {
+        if (selectionMap.has(discount.id)) {
+          var targetIsSelected = selectionMap.get(discount.id);
           return _objectSpread(_objectSpread({}, discount), {}, {
-            isSelected: isSelected,
+            isSelected: targetIsSelected,
             // 手动设置不使用
-            isManualSelect: !isSelected
+            isManualSelect: !targetIsSelected
           });
         }
         return _objectSpread(_objectSpread({}, discount), {}, {
@@ -289,12 +308,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
 
       // 更新优惠券列表
       this.setDiscountList(newDiscountList);
-
-      // 如果取消选择优惠券，需要重新计算其他可用优惠券
-      return this.calcDiscount(this.store.productList || [], {
-        discountId: discountId,
-        isSelected: isSelected
-      });
+      return this.calcDiscount(this.store.productList || [], params);
     }
   }, {
     key: "setProductList",
@@ -307,7 +321,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "scanCode",
     value: function () {
       var _scanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(code, customerId) {
-        var _this$store$discount3, resultDiscountList, rulesModule, withScanList, _ref3, newProductList, newDiscountList, isAvailable, _this$options$otherPa6;
+        var _this$store$discount3, resultDiscountList, rulesModule, withScanList, _ref2, newProductList, newDiscountList, isAvailable, _this$options$otherPa6;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -351,7 +365,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                   isScan: true
                 });
               });
-              _ref3 = rulesModule.isDiscountListAvailable({
+              _ref2 = rulesModule.isDiscountListAvailable({
                 productList: this.store.productList || [],
                 oldDiscountList: this.getDiscountList(),
                 newDiscountList: withScanList
@@ -359,7 +373,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 isAvailable: false,
                 productList: this.store.productList || [],
                 discountList: this.getDiscountList()
-              }, newProductList = _ref3.productList, newDiscountList = _ref3.discountList, isAvailable = _ref3.isAvailable;
+              }, newProductList = _ref2.productList, newDiscountList = _ref2.discountList, isAvailable = _ref2.isAvailable;
               if (!isAvailable) {
                 _context5.next = 21;
                 break;
@@ -546,7 +560,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "getCustomerWallet",
     value: function () {
       var _getCustomerWallet = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(id) {
-        var result, customer;
+        var _result, customer;
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
@@ -556,12 +570,12 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 with_trashed: 1
               });
             case 3:
-              result = _context7.sent;
-              if (!(result !== null && result !== void 0 && result.data)) {
+              _result = _context7.sent;
+              if (!(_result !== null && _result !== void 0 && _result.data)) {
                 _context7.next = 9;
                 break;
               }
-              customer = Object.assign({}, (_objectDestructuringEmpty(result.data), result.data));
+              customer = Object.assign({}, (_objectDestructuringEmpty(_result.data), _result.data));
               this.setCustomer(customer);
               _context7.next = 9;
               return this.core.effects.emit(ShopDiscountHooks.onScanCustomerChange, customer);
@@ -586,31 +600,32 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "bestDiscount",
     value: function () {
-      var _bestDiscount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+      var _bestDiscount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(cb) {
         var _this$store$productLi;
-        var newDiscountList, result;
+        var newDiscountList, _result2;
         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.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 = 6;
+                _context8.next = 7;
                 break;
               }
-              result = this.calcDiscount(this.store.productList);
-              _context8.next = 6;
-              return this.core.effects.emit(ShopDiscountHooks.onLoadPrepareCalcResult, result);
-            case 6:
-              _context8.next = 8;
+              _result2 = this.calcDiscount(this.store.productList);
+              cb === null || cb === void 0 || cb(_result2);
+              _context8.next = 7;
+              return this.core.effects.emit(ShopDiscountHooks.onLoadPrepareCalcResult, _result2);
+            case 7:
+              _context8.next = 9;
               return this.core.effects.emit(ShopDiscountHooks.onLoadDiscountList, newDiscountList);
-            case 8:
+            case 9:
             case "end":
               return _context8.stop();
           }
         }, _callee8, this);
       }));
-      function bestDiscount() {
+      function bestDiscount(_x8) {
         return _bestDiscount.apply(this, arguments);
       }
       return bestDiscount;
@@ -619,7 +634,7 @@ 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$productLi2, customerId, goodPassList, scanDiscount, scanDiscountIds, newGoodPassList, newDiscountList, result;
+        var _this$getCustomer2, _this$store$discount7, _this$getDiscountList, _this$store$productLi2, customerId, goodPassList, scanDiscount, scanDiscountIds, newGoodPassList, newDiscountList, _result3;
         return _regeneratorRuntime().wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
@@ -652,9 +667,9 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 _context9.next = 15;
                 break;
               }
-              result = this.calcDiscount(this.store.productList);
+              _result3 = this.calcDiscount(this.store.productList);
               _context9.next = 15;
-              return this.core.effects.emit(ShopDiscountHooks.onLoadPrepareCalcResult, result);
+              return this.core.effects.emit(ShopDiscountHooks.onLoadPrepareCalcResult, _result3);
             case 15:
               _context9.next = 17;
               return this.core.effects.emit(ShopDiscountHooks.onLoadDiscountList, newDiscountList);
@@ -671,7 +686,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee9, this, [[0, 19]]);
       }));
-      function loadPrepareConfig(_x8) {
+      function loadPrepareConfig(_x9) {
         return _loadPrepareConfig.apply(this, arguments);
       }
       return loadPrepareConfig;

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

@@ -24,3 +24,11 @@ export interface ShopDiscountState {
     productList: Record<string, any>[];
     originalDiscountList: Discount[];
 }
+export interface SetDiscountSelectedParams {
+    discountId: number;
+    isSelected: boolean;
+    selectedList?: {
+        discountId: number;
+        isSelected: boolean;
+    }[];
+}

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

@@ -2,6 +2,7 @@ import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
 import { Rules, RulesModuleAPI, DiscountResult } from './types';
 import { Discount } from "../Discount/types";
+import { SetDiscountSelectedParams } from '../../solution/ShopDiscount/types';
 export declare class RulesModule extends BaseModule implements Module, RulesModuleAPI {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -26,6 +27,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
     }, options?: {
         isSelected?: boolean;
         discountId?: number;
+        selectedList?: SetDiscountSelectedParams[];
         scan?: boolean;
     }): DiscountResult;
     destroy(): Promise<void>;

package/lib/modules/Rules/index.js

@@ -212,7 +212,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     });
     console.log(sortedProductList, "sortedProductListsortedProductList");
     sortedProductList.forEach((originProduct, i) => {
-      var _a, _b, _c, _d, _e, _f, _g, _h;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i;
       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]);
@@ -247,6 +247,15 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       }))) {
         isManualDiscount = false;
       }
+      if ((options == null ? void 0 : options.selectedList) && ((_g = product.discount_list) == null ? void 0 : _g.some((item) => {
+        var _a2;
+        return (_a2 = options == null ? void 0 : options.selectedList) == null ? void 0 : _a2.some((n) => {
+          var _a3;
+          return n.discountId === ((_a3 = item.discount) == null ? void 0 : _a3.resource_id);
+        });
+      }))) {
+        isManualDiscount = false;
+      }
       if (applicableDiscounts.length === 0 || isManualDiscount || (0, import_lodash_es.isBoolean)(product.vouchersApplicable) && !product.vouchersApplicable) {
         if (product.isClient) {
           processedProductsMap.set(
@@ -307,10 +316,10 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         usedDiscounts.set(selectedDiscount2.id, true);
         const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
         let productOriginTotal = product.origin_total || product.total || 0;
-        if (((_g = product.discount_list) == null ? void 0 : _g.length) && product.origin_total) {
+        if (((_h = product.discount_list) == null ? void 0 : _h.length) && product.origin_total) {
           productOriginTotal = product.origin_total;
         }
-        if (Number(((_h = originProduct == null ? void 0 : originProduct._productInit) == null ? void 0 : _h.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
+        if (Number(((_i = originProduct == null ? void 0 : originProduct._productInit) == null ? void 0 : _i.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
           productOriginTotal = product.total;
         }
         const targetProductTotal = selectedDiscount2.tag === "good_pass" ? new import_decimal.default(productOriginTotal).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(productOriginTotal)).toNumber();

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

@@ -111,7 +111,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

@@ -1,6 +1,6 @@
 import { Module, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
-import { Customer } from './types';
+import { Customer, SetDiscountSelectedParams } from './types';
 import { Discount } from '../../modules/Discount/types';
 export declare class ShopDiscountImpl extends BaseModule implements Module {
     protected defaultName: string;
@@ -19,17 +19,11 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     private registerDependentModules;
     private registerEventListeners;
     setCustomer(customer: Customer): Promise<void>;
-    calcDiscount(productList: Record<string, any>[], options?: {
-        discountId: number;
-        isSelected: boolean;
-    }): {
+    calcDiscount(productList: Record<string, any>[], options?: SetDiscountSelectedParams): {
         productList: Record<string, any>[];
         discountList: Discount[];
     };
-    setDiscountSelected({ discountId, isSelected, }: {
-        discountId: number;
-        isSelected: boolean;
-    }): {
+    setDiscountSelected(params: SetDiscountSelectedParams): {
         productList: Record<string, any>[];
         discountList: Discount[];
     };

package/lib/solution/ShopDiscount/index.js

@@ -174,27 +174,34 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     };
   }
   // 设置优惠券使用状态
-  setDiscountSelected({
-    discountId,
-    isSelected
-  }) {
+  setDiscountSelected(params) {
     const discountList = this.getDiscountList();
+    const selectionOperations = [];
+    selectionOperations.push({
+      discountId: params.discountId,
+      isSelected: params.isSelected
+    });
+    if (params.selectedList && params.selectedList.length > 0) {
+      selectionOperations.push(...params.selectedList);
+    }
+    const selectionMap = /* @__PURE__ */ new Map();
+    selectionOperations.forEach((operation) => {
+      selectionMap.set(operation.discountId, operation.isSelected);
+    });
     const newDiscountList = discountList.map((discount) => {
-      if (discount.id === discountId) {
+      if (selectionMap.has(discount.id)) {
+        const targetIsSelected = selectionMap.get(discount.id);
         return {
           ...discount,
-          isSelected,
+          isSelected: targetIsSelected,
           // 手动设置不使用
-          isManualSelect: !isSelected
+          isManualSelect: !targetIsSelected
         };
       }
       return { ...discount, isManualSelect: !(discount == null ? void 0 : discount.isSelected) };
     });
     this.setDiscountList(newDiscountList);
-    return this.calcDiscount(this.store.productList || [], {
-      discountId,
-      isSelected
-    });
+    return this.calcDiscount(this.store.productList || [], params);
   }
   setProductList(productList) {
     this.store.productList = productList;
@@ -390,12 +397,13 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       console.error("[ShopDiscount] 获取客户钱包信息出错:", error);
     }
   }
-  async bestDiscount() {
+  async bestDiscount(cb) {
     var _a;
     const newDiscountList = this.store.originalDiscountList;
     this.setDiscountList(newDiscountList);
     if ((_a = this.store.productList) == null ? void 0 : _a.length) {
       const result = this.calcDiscount(this.store.productList);
+      cb == null ? void 0 : cb(result);
       await this.core.effects.emit(
         import_types.ShopDiscountHooks.onLoadPrepareCalcResult,
         result

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

@@ -24,3 +24,11 @@ export interface ShopDiscountState {
     productList: Record<string, any>[];
     originalDiscountList: Discount[];
 }
+export interface SetDiscountSelectedParams {
+    discountId: number;
+    isSelected: boolean;
+    selectedList?: {
+        discountId: number;
+        isSelected: boolean;
+    }[];
+}

package/package.json

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