@pisell/pisellos 2.1.103 → 2.1.105

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

@@ -55,6 +55,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, [{
@@ -69,6 +70,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)) {
@@ -111,7 +113,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();
           }
@@ -131,7 +133,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,
@@ -139,16 +141,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,
@@ -158,24 +165,33 @@ 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);
-            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/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(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

package/dist/modules/Rules/index.js

@@ -1058,22 +1058,23 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);
             } else {
-              var _ref8, _product$_promotion$f, _product13, _product$origin_total, _product$main_product, _product$main_product2;
+              var _ref8, _product$_promotion$f, _product13, _product$origin_total, _product$price2;
               var total = product.inPromotion ? (_ref8 = (_product$_promotion$f = (_product13 = product) === null || _product13 === void 0 || (_product13 = _product13._promotion) === null || _product13 === void 0 ? void 0 : _product13.finalPrice) !== null && _product$_promotion$f !== void 0 ? _product$_promotion$f : product.origin_total) !== null && _ref8 !== void 0 ? _ref8 : product.total : (_product$origin_total = product.origin_total) !== null && _product$origin_total !== void 0 ? _product$origin_total : product.total;
+              var main_product_selling_price = (_product$price2 = product.price) !== null && _product$price2 !== void 0 ? _product$price2 : product.main_product_selling_price;
               if ((product.discount_list || []).some(function (item) {
                 return item.type === 'promotion';
-              })) {
-                var _product$total;
+              }) || isBoolean(product.vouchersApplicable) && !product.vouchersApplicable) {
+                var _product$total, _product$main_product;
                 total = (_product$total = product.total) !== null && _product$total !== void 0 ? _product$total : product.origin_total;
+                main_product_selling_price = (_product$main_product = product.main_product_selling_price) !== null && _product$main_product !== void 0 ? _product$main_product : main_product_selling_price;
               }
               processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {
-                price: product.price,
-                main_product_selling_price: (_product$main_product = product.main_product_selling_price) !== null && _product$main_product !== void 0 ? _product$main_product : product.price
+                price: product.price
               } : {
                 _id: product._id.split('___')[0] + '___' + index,
                 total: total,
                 price: product.price,
-                main_product_selling_price: (_product$main_product2 = product.main_product_selling_price) !== null && _product$main_product2 !== void 0 ? _product$main_product2 : product.price
+                main_product_selling_price: main_product_selling_price
               }), {}, {
                 discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);

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 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -357,7 +357,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
+    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/dist/solution/Checkout/index.js

@@ -425,7 +425,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               // 可选，附加费均摊舍入金额
               "surcharge_rounding_remainder": item.metadata.surcharge_rounding_remainder
             },
-            product_bundle: item.product_bundle.map(function (bundle) {
+            product_bundle: (item.product_bundle || []).map(function (bundle) {
               return {
                 bundle_id: bundle.bundle_id,
                 bundle_product_id: bundle.bundle_product_id,

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

@@ -45,12 +45,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;
@@ -94,9 +96,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,
@@ -105,15 +110,25 @@ 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);
     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/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(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

package/lib/modules/Rules/index.js

@@ -738,20 +738,21 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             );
           } else {
             let total = product.inPromotion ? ((_u = product == null ? void 0 : product._promotion) == null ? void 0 : _u.finalPrice) ?? product.origin_total ?? product.total : product.origin_total ?? product.total;
-            if ((product.discount_list || []).some((item) => item.type === "promotion")) {
+            let main_product_selling_price = product.price ?? product.main_product_selling_price;
+            if ((product.discount_list || []).some((item) => item.type === "promotion") || (0, import_lodash_es.isBoolean)(product.vouchersApplicable) && !product.vouchersApplicable) {
               total = product.total ?? product.origin_total;
+              main_product_selling_price = product.main_product_selling_price ?? main_product_selling_price;
             }
             processedProductsMap.set(
               product._id,
               [this.hooks.setProduct(originProduct, {
                 ...isManualDiscount ? {
-                  price: product.price,
-                  main_product_selling_price: product.main_product_selling_price ?? product.price
+                  price: product.price
                 } : {
                   _id: product._id.split("___")[0] + "___" + index,
                   total,
                   price: product.price,
-                  main_product_selling_price: product.main_product_selling_price ?? product.price
+                  main_product_selling_price
                 },
                 discount_list: this.filterDiscountListByType(product.discount_list, "promotion")
               })]

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 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -357,7 +357,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
+    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/lib/solution/Checkout/index.js

@@ -244,7 +244,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
             // 可选，附加费均摊舍入金额
             "surcharge_rounding_remainder": item.metadata.surcharge_rounding_remainder
           },
-          product_bundle: item.product_bundle.map((bundle) => {
+          product_bundle: (item.product_bundle || []).map((bundle) => {
             return {
               bundle_id: bundle.bundle_id,
               bundle_product_id: bundle.bundle_product_id,

package/package.json

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