@pisell/pisellos 0.0.475 → 0.0.477

package/dist/model/strategy/adapter/walletPass/type.d.ts

@@ -41,7 +41,7 @@ export interface Voucher {
         allowCrossProduct: boolean;
         /** 可用商品数量上限 （仅多商品） 默认为0，表示不限制商品数量。 */
         applicableProductLimit: number;
-        /** 单商品可用卡券上限（同一 Wallet Pass 商品生成的卡券对同一商品行最多抵扣次数）。默认为 0，表示不限制。 */
+        /** 单商品可用卡券上限（同一 Wallet Pass 商品生成的卡券对同一商品的每个 unit 最多抵扣次数，总上限 = maxPassesPerItem × quantity）。默认为 0，表示不限制。 */
         maxPassesPerItem: number;
     };
 }
@@ -132,7 +132,7 @@ export interface EvaluatorInput {
         allowCrossProduct: boolean;
         /** 可用商品数量上限 （仅多商品） 默认为0，表示不限制商品数量。 */
         applicableProductLimit: number;
-        /** 单商品可用卡券上限（同一 Wallet Pass 商品生成的卡券对同一商品行最多抵扣次数）。默认为 0，表示不限制。 */
+        /** 单商品可用卡券上限（同一 Wallet Pass 商品生成的卡券对同一商品的每个 unit 最多抵扣次数，总上限 = maxPassesPerItem × quantity）。默认为 0，表示不限制。 */
         maxPassesPerItem: number;
     }>[];
 }

package/dist/model/strategy/adapter/walletPass/utils.js

@@ -135,10 +135,11 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
   };
 
   // 按 maxPassesPerItem 过滤商品：排除已达到单商品可用卡券上限的商品
+  // maxPassesPerItem 是 per-unit 的限制，总上限 = maxPassesPerItem × quantity
   var filterByMaxPassesPerItem = function filterByMaxPassesPerItem(products, usageMap, walletPassProductId, maxPassesPerItem) {
     if (maxPassesPerItem <= 0) return products; // 0 = 不限制
     return products.filter(function (p) {
-      return getItemPassUsage(usageMap, walletPassProductId, p.product_id) < maxPassesPerItem;
+      return getItemPassUsage(usageMap, walletPassProductId, p.product_id) < maxPassesPerItem * getProductQuantity(p);
     });
   };
   // ================================================================
@@ -287,7 +288,7 @@ export function processVouchers(applicableVouchers, orderTotalAmount, products)
       var availableAfterPassLimit = getApplicableProducts(voucher, productsData).filter(function (p) {
         return p[amountField].greaterThan(0);
       }).filter(function (p) {
-        return getItemPassUsage(itemPassUsage, product_id, p.product_id) < maxPassesPerItem;
+        return getItemPassUsage(itemPassUsage, product_id, p.product_id) < maxPassesPerItem * getProductQuantity(p);
       });
       if (availableAfterPassLimit.length === 0) {
         return {
@@ -627,7 +628,7 @@ export function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmo
   var filterByMaxPassesPerItem = function filterByMaxPassesPerItem(products, walletPassProductId, maxPassesPerItem) {
     if (maxPassesPerItem <= 0) return products; // 0 = 不限制
     return products.filter(function (p) {
-      return getItemPassUsage(walletPassProductId, p.product_id) < maxPassesPerItem;
+      return getItemPassUsage(walletPassProductId, p.product_id) < maxPassesPerItem * getProductQuantity(p);
     });
   };
 

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

@@ -9,6 +9,7 @@ export declare class CustomerModule extends BaseModule implements Module, Custom
     private cacheId;
     private openCache;
     private fatherModule;
+    private otherParams;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     /**

package/dist/modules/Customer/index.js

@@ -56,6 +56,7 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "cacheId", void 0);
     _defineProperty(_assertThisInitialized(_this), "openCache", false);
     _defineProperty(_assertThisInitialized(_this), "fatherModule", void 0);
+    _defineProperty(_assertThisInitialized(_this), "otherParams", {});
     return _this;
   }
   _createClass(CustomerModule, [{
@@ -70,6 +71,7 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
               this.core = core;
               this.store = options === null || options === void 0 ? void 0 : options.store;
               this.request = this.core.getPlugin('request');
+              this.otherParams = (options === null || options === void 0 ? void 0 : options.otherParams) || {};
 
               // 初始化状态
               if (Array.isArray(options === null || options === void 0 || (_options$initialState = options.initialState) === null || _options$initialState === void 0 ? void 0 : _options$initialState.customerList)) {
@@ -112,7 +114,7 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
               if (options !== null && options !== void 0 && (_options$otherParams2 = options.otherParams) !== null && _options$otherParams2 !== void 0 && _options$otherParams2.fatherModule) {
                 this.fatherModule = options.otherParams.fatherModule;
               }
-            case 13:
+            case 14:
             case "end":
               return _context.stop();
           }
@@ -132,7 +134,7 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
     key: "fetchCustomerListData",
     value: (function () {
       var _fetchCustomerListData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-        var _res$data, _res$data2;
+        var _this$otherParams, _res$data, _this$otherParams2, _customerList2, _res$data2;
         var params,
           url,
           _params$skip,
@@ -140,16 +142,21 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
           _params$num,
           num,
           search,
-          otherParams,
+          _otherParams,
           queryParams,
           res,
+          _customerList,
+          _customerList3,
           _args2 = arguments;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               params = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : {};
-              url = '/customer/select-list';
-              _params$skip = params.skip, skip = _params$skip === void 0 ? 1 : _params$skip, _params$num = params.num, num = _params$num === void 0 ? DEFAULT_PAGE_SIZE : _params$num, search = params.search, otherParams = _objectWithoutProperties(params, _excluded);
+              url = '/customer/select-list'; // 如果是加盟子店铺，则使用加盟商的客户列表接口
+              if ((_this$otherParams = this.otherParams) !== null && _this$otherParams !== void 0 && _this$otherParams.isFranchisee) {
+                url = '/franchisee/customer/select-list';
+              }
+              _params$skip = params.skip, skip = _params$skip === void 0 ? 1 : _params$skip, _params$num = params.num, num = _params$num === void 0 ? DEFAULT_PAGE_SIZE : _params$num, search = params.search, _otherParams = _objectWithoutProperties(params, _excluded);
               queryParams = _objectSpread(_objectSpread({
                 skip: skip,
                 num: num,
@@ -159,29 +166,38 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
                 search_wallet_pass_flag: 1
               }, search && {
                 search: search
-              }), otherParams);
-              _context2.next = 6;
+              }), _otherParams);
+              _context2.next = 7;
               return this.request.get(url, queryParams, {
                 cache: {
                   mode: RequestModeENUM.REMOTE_LOCAL,
                   type: "indexDB"
                 }
               });
-            case 6:
+            case 7:
               res = _context2.sent;
               if (!((res === null || res === void 0 ? void 0 : res.code) !== 200)) {
-                _context2.next = 9;
+                _context2.next = 10;
                 break;
               }
               throw new Error(res === null || res === void 0 ? void 0 : res.message);
-            case 9:
+            case 10:
+              // 如果是加盟子店铺，查询的接口返回的数据都是总店的客户数据，需要加上标识
+              _customerList = (res === null || res === void 0 || (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list) || [];
+              if ((_this$otherParams2 = this.otherParams) !== null && _this$otherParams2 !== void 0 && _this$otherParams2.isFranchisee && ((_customerList2 = _customerList) === null || _customerList2 === void 0 ? void 0 : _customerList2.length) > 0) {
+                _customerList = (_customerList3 = _customerList) === null || _customerList3 === void 0 ? void 0 : _customerList3.map(function (item) {
+                  return _objectSpread(_objectSpread({}, item || {}), {}, {
+                    is_franchisor_customer: 1 // 标识是总店的客户
+                  });
+                });
+              }
               return _context2.abrupt("return", {
-                customerList: (res === null || res === void 0 || (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list) || [],
+                customerList: _customerList,
                 total: (res === null || res === void 0 || (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.count) || 0,
                 page: skip,
                 pageSize: num
               });
-            case 10:
+            case 13:
             case "end":
               return _context2.stop();
           }

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

@@ -31,8 +31,8 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         productList: any[];
         unavailableReason?: UnavailableReason;
     };
-    private getUnavailableReason;
     filterDiscountListByType(discountList: Discount[], type: string): Discount[];
+    private getUnavailableReason;
     calcDiscount({ discountList, productList, orderTotalAmount, holders, isFormSubject, }: {
         discountList: Discount[];
         productList: any[];

package/dist/modules/Rules/index.js

@@ -212,6 +212,13 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         unavailableReason: unavailableReason
       };
     }
+  }, {
+    key: "filterDiscountListByType",
+    value: function filterDiscountListByType(discountList, type) {
+      return (discountList || []).filter(function (item) {
+        return item.type === type || item.tag === type;
+      });
+    }
 
     // 获取券不可用的原因
   }, {
@@ -286,13 +293,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       }
       return UnavailableReason.Unknown;
     }
-  }, {
-    key: "filterDiscountListByType",
-    value: function filterDiscountListByType(discountList, type) {
-      return (discountList || []).filter(function (item) {
-        return item.type === type || item.tag === type;
-      });
-    }
   }, {
     key: "calcDiscount",
     value: function calcDiscount(_ref2, options) {
@@ -1766,7 +1766,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             processedItems.push(_objectSpread(_objectSpread({}, flatItem), {}, {
               total: _targetProductTotal,
               price: new Decimal(_productOriginTotal || 0).minus(fixedAmountPerItem).toNumber(),
-              discount_list: [_discountDetail2],
+              discount_list: _this3.filterDiscountListByType(flatItem.discount_list, 'promotion').concat([_discountDetail2]),
               processed: true
             }));
           }

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

@@ -311,7 +311,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 | 2 | 1 | 3 | 5 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

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

package/lib/model/strategy/adapter/walletPass/type.d.ts

@@ -41,7 +41,7 @@ export interface Voucher {
         allowCrossProduct: boolean;
         /** 可用商品数量上限 （仅多商品） 默认为0，表示不限制商品数量。 */
         applicableProductLimit: number;
-        /** 单商品可用卡券上限（同一 Wallet Pass 商品生成的卡券对同一商品行最多抵扣次数）。默认为 0，表示不限制。 */
+        /** 单商品可用卡券上限（同一 Wallet Pass 商品生成的卡券对同一商品的每个 unit 最多抵扣次数，总上限 = maxPassesPerItem × quantity）。默认为 0，表示不限制。 */
         maxPassesPerItem: number;
     };
 }
@@ -132,7 +132,7 @@ export interface EvaluatorInput {
         allowCrossProduct: boolean;
         /** 可用商品数量上限 （仅多商品） 默认为0，表示不限制商品数量。 */
         applicableProductLimit: number;
-        /** 单商品可用卡券上限（同一 Wallet Pass 商品生成的卡券对同一商品行最多抵扣次数）。默认为 0，表示不限制。 */
+        /** 单商品可用卡券上限（同一 Wallet Pass 商品生成的卡券对同一商品的每个 unit 最多抵扣次数，总上限 = maxPassesPerItem × quantity）。默认为 0，表示不限制。 */
         maxPassesPerItem: number;
     }>[];
 }

package/lib/model/strategy/adapter/walletPass/utils.js

@@ -105,7 +105,7 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
     if (maxPassesPerItem <= 0)
       return products2;
     return products2.filter(
-      (p) => getItemPassUsage(usageMap, walletPassProductId, p.product_id) < maxPassesPerItem
+      (p) => getItemPassUsage(usageMap, walletPassProductId, p.product_id) < maxPassesPerItem * getProductQuantity(p)
     );
   };
   const calculateAvailableMaxAmount = (voucher, productsData, itemPassUsage) => {
@@ -184,7 +184,7 @@ function processVouchers(applicableVouchers, orderTotalAmount, products) {
     if (maxPassesPerItem > 0 && itemPassUsage) {
       const deductTaxAndFee = (config == null ? void 0 : config.deductTaxAndFee) ?? true;
       const amountField = deductTaxAndFee ? "remainingAmountWithTax" : "remainingAmountPure";
-      const availableAfterPassLimit = getApplicableProducts(voucher, productsData).filter((p) => p[amountField].greaterThan(0)).filter((p) => getItemPassUsage(itemPassUsage, product_id, p.product_id) < maxPassesPerItem);
+      const availableAfterPassLimit = getApplicableProducts(voucher, productsData).filter((p) => p[amountField].greaterThan(0)).filter((p) => getItemPassUsage(itemPassUsage, product_id, p.product_id) < maxPassesPerItem * getProductQuantity(p));
       if (availableAfterPassLimit.length === 0) {
         return { isAvailable: false, reasonCode: "max_passes_per_item_reached" };
       }
@@ -404,7 +404,7 @@ function recalculateVouchers(allVouchers, selectedVouchers, orderTotalAmount, pr
     if (maxPassesPerItem <= 0)
       return products2;
     return products2.filter(
-      (p) => getItemPassUsage(walletPassProductId, p.product_id) < maxPassesPerItem
+      (p) => getItemPassUsage(walletPassProductId, p.product_id) < maxPassesPerItem * getProductQuantity(p)
     );
   };
   selectedVouchers.forEach((selectedVoucher) => {

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

@@ -9,6 +9,7 @@ export declare class CustomerModule extends BaseModule implements Module, Custom
     private cacheId;
     private openCache;
     private fatherModule;
+    private otherParams;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     /**

package/lib/modules/Customer/index.js

@@ -46,12 +46,14 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
       searchParams: {}
     };
     this.openCache = false;
+    this.otherParams = {};
   }
   async initialize(core, options) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     this.core = core;
     this.store = options == null ? void 0 : options.store;
     this.request = this.core.getPlugin("request");
+    this.otherParams = (options == null ? void 0 : options.otherParams) || {};
     if (Array.isArray((_a = options == null ? void 0 : options.initialState) == null ? void 0 : _a.customerList)) {
       const customerList = (0, import_lodash_es.cloneDeep)(options.initialState.customerList || []);
       this.store.customerList = customerList;
@@ -95,9 +97,12 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
    * @returns API响应数据
    */
   async fetchCustomerListData(params = {}) {
-    var _a, _b;
-    const url = "/customer/select-list";
-    const { skip = 1, num = import_constants.DEFAULT_PAGE_SIZE, search, ...otherParams } = params;
+    var _a, _b, _c, _d;
+    let url = "/customer/select-list";
+    if ((_a = this.otherParams) == null ? void 0 : _a.isFranchisee) {
+      url = "/franchisee/customer/select-list";
+    }
+    const { skip = 1, num = import_constants.DEFAULT_PAGE_SIZE, search, ..._otherParams } = params;
     const queryParams = {
       skip,
       num,
@@ -106,7 +111,7 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
       search_wallet_flag: 1,
       search_wallet_pass_flag: 1,
       ...search && { search },
-      ...otherParams
+      ..._otherParams
     };
     const res = await this.request.get(url, queryParams, {
       cache: {
@@ -117,9 +122,19 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
     if ((res == null ? void 0 : res.code) !== 200) {
       throw new Error(res == null ? void 0 : res.message);
     }
+    let _customerList = ((_b = res == null ? void 0 : res.data) == null ? void 0 : _b.list) || [];
+    if (((_c = this.otherParams) == null ? void 0 : _c.isFranchisee) && (_customerList == null ? void 0 : _customerList.length) > 0) {
+      _customerList = _customerList == null ? void 0 : _customerList.map((item) => {
+        return {
+          ...item || {},
+          is_franchisor_customer: 1
+          // 标识是总店的客户
+        };
+      });
+    }
     return {
-      customerList: ((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.list) || [],
-      total: ((_b = res == null ? void 0 : res.data) == null ? void 0 : _b.count) || 0,
+      customerList: _customerList,
+      total: ((_d = res == null ? void 0 : res.data) == null ? void 0 : _d.count) || 0,
       page: skip,
       pageSize: num
     };

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

@@ -31,8 +31,8 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         productList: any[];
         unavailableReason?: UnavailableReason;
     };
-    private getUnavailableReason;
     filterDiscountListByType(discountList: Discount[], type: string): Discount[];
+    private getUnavailableReason;
     calcDiscount({ discountList, productList, orderTotalAmount, holders, isFormSubject, }: {
         discountList: Discount[];
         productList: any[];

package/lib/modules/Rules/index.js

@@ -154,6 +154,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       unavailableReason
     };
   }
+  filterDiscountListByType(discountList, type) {
+    return (discountList || []).filter((item) => item.type === type || item.tag === type);
+  }
   // 获取券不可用的原因
   getUnavailableReason(discountList, productList) {
     var _a;
@@ -186,9 +189,6 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     }
     return import_types.UnavailableReason.Unknown;
   }
-  filterDiscountListByType(discountList, type) {
-    return (discountList || []).filter((item) => item.type === type || item.tag === type);
-  }
   calcDiscount({
     discountList,
     productList,
@@ -1391,7 +1391,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             ...flatItem,
             total: targetProductTotal,
             price: new import_decimal.default(productOriginTotal || 0).minus(fixedAmountPerItem).toNumber(),
-            discount_list: [discountDetail],
+            discount_list: this.filterDiscountListByType(flatItem.discount_list, "promotion").concat([discountDetail]),
             processed: true
           });
         }

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

@@ -311,7 +311,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 | 2 | 1 | 3 | 5 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.0.475",
+  "version": "0.0.477",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -23,7 +23,8 @@
     "docs": "typedoc --out docs src/index.ts",
     "sync": "node sync.js",
     "prepublishOnly": "npm run build",
-    "deploy": "npm run build && npm run changeset && npm run version && npm run release"
+    "deploy": "npm run build && npm run changeset && npm run version && npm run release",
+    "deploy:ci": "npm run build && npm run version && changeset publish --registry=https://registry.npmjs.com/ && npm run sync"
   },
   "repository": {
     "type": "git",