@pisell/pisellos 2.1.104 → 2.1.105

package/dist/index.d.ts

@@ -6,7 +6,6 @@ export * from './types';
 export * from './modules';
 export * from './plugins';
 export * from './solution';
-export * from './model';
 export { PisellOSCore } from './core';
 import PisellOSCore from './core';
 export default PisellOSCore;

package/dist/index.js

@@ -8,7 +8,6 @@ export * from "./types";
 export * from "./modules";
 export * from "./plugins";
 export * from "./solution";
-export * from "./model";
 
 // 导出核心实现
 export { PisellOSCore } from "./core";

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

@@ -75,8 +75,6 @@ export interface CartItem {
     summaryTotal?: number | string;
     /** 商品原价总价，排除原始价格为0的场景 */
     origin_total?: number | string;
-    /** 基于 origin_total 乘以 商品数量的价格 */
-    summaryOriginTotal?: number | string;
     /** 商品数量 */
     num?: number;
     /** 商品图片 */

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

@@ -58,7 +58,6 @@ export var formatProductToCartItem = function formatProductToCartItem(params) {
     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;
     cartItem.name = product === null || product === void 0 ? void 0 : product.title;
@@ -84,15 +83,6 @@ export var formatProductToCartItem = function formatProductToCartItem(params) {
       num: num,
       discounts: discounts
     });
-    // 不包含折扣卡商品券的总价
-    var origin_total = getProductTotalPrice({
-      product: cartItem._productInit || cartItem._productOrigin,
-      bundle: bundle,
-      options: options,
-      num: num,
-      discounts: []
-    });
-    cartItem.summaryOriginTotal = (origin_total || 0) * (num || 1);
     cartItem.image = product === null || product === void 0 ? void 0 : product.cover;
     cartItem.like_status = 'common';
     cartItem.duration = product === null || product === void 0 ? void 0 : product.duration;
@@ -213,7 +203,6 @@ export var getProductTotalPrice = function getProductTotalPrice(params) {
         amount: currentValue.amount,
         tag: currentValue.type,
         par_value: currentValue.discount.percent,
-        config: currentValue.config,
         metadata: {
           discount_card_type: currentValue === null || currentValue === void 0 || (_currentValue$discoun = currentValue.discount) === null || _currentValue$discoun === void 0 ? void 0 : _currentValue$discoun.discount_card_type
         }

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/Discount/types.d.ts

@@ -25,8 +25,6 @@ interface Limitedrelationproductdata {
     product_ids: number[];
     product_collection_id: number[];
     package_sub_item_usage_rules?: PackageSubItemUsageRules;
-    filter: 0 | 1;
-    exclude_product_ids: number[];
 }
 interface ApplicableProductDetails {
     amount: string;
@@ -83,7 +81,6 @@ export interface Discount {
     balance: string;
     format_title: Formattitle;
     metadata?: {
-        num?: number;
         discount_card_type?: 'fixed_amount' | 'percent';
         custom_product_bundle_map_id?: string;
         validity_type?: "custom_schedule_validity" | "fixed_validity";
@@ -108,19 +105,6 @@ export interface Discount {
     isSelected?: boolean;
     isAvailable?: boolean;
     isUsed?: boolean;
-    config?: {
-        isAvailable?: boolean;
-        /** 最大抵扣金额 */
-        maxDeductionAmount?: number;
-        /** 每单最多使用张数 */
-        maxUsagePerOrder?: number;
-        /** 是否抵扣税费与附加费 */
-        deductTaxAndFee?: boolean;
-        /** 适用粒度（多商品共用） */
-        allowCrossProduct?: boolean;
-        /** 可用商品数量上限 */
-        applicableProductLimit?: number;
-    };
     applicableProductIds?: number[];
     applicableProductDetails: ApplicableProductDetails[];
     appliedProductDetails: ApplicableProductDetails[];

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

@@ -1,5 +1,5 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
-import { RequestPlugin, WindowPlugin } from '../../plugins';
+import { RequestPlugin } from '../../plugins';
 import { BaseModule } from '../BaseModule';
 import { PaymentModuleAPI, PaymentMethod, PaymentOrder, PaymentItem, PaymentItemInput, PaymentUpdateFields, PushOrderParams, CashPayment, EftposPayment, WalletPassPayment, RoundingRule, RoundingInterval, RoundingResult } from './types';
 export * from './types';
@@ -21,7 +21,6 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
     request: RequestPlugin;
     private app;
     private store;
-    window: WindowPlugin;
     private dbManager;
     private logger;
     protected otherParams: any;

package/dist/modules/Payment/index.js

@@ -81,8 +81,6 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "app", void 0);
     // App instance
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
-    _defineProperty(_assertThisInitialized(_this), "window", void 0);
-    // WindowPlugin 实例
     _defineProperty(_assertThisInitialized(_this), "dbManager", void 0);
     // IndexDBManager 实例
     _defineProperty(_assertThisInitialized(_this), "logger", void 0);
@@ -112,27 +110,26 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               // 获取依赖的插件
               this.request = core.getPlugin('request');
               appPlugin = core.getPlugin('app');
-              this.window = core.getPlugin('window');
               if (this.request) {
-                _context.next = 8;
+                _context.next = 7;
                 break;
               }
               throw new Error('支付模块需要 request 插件支持');
-            case 8:
+            case 7:
               if (appPlugin) {
-                _context.next = 10;
+                _context.next = 9;
                 break;
               }
               throw new Error('支付模块需要 app 插件支持');
-            case 10:
+            case 9:
               this.app = appPlugin.getApp();
               this.dbManager = this.app.dbManager;
               this.logger = this.app.logger;
 
               // 确保支付模块所需的对象存储已创建
-              _context.next = 15;
+              _context.next = 14;
               return this.ensurePaymentTables();
-            case 15:
+            case 14:
               this.registerNetworkHandlers();
 
               // // 预连接数据库
@@ -140,7 +137,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
 
               console.log('[PaymentModule] 初始化完成');
               this.logInfo('PaymentModule initialized successfully');
-            case 18:
+            case 17:
             case "end":
               return _context.stop();
           }

package/dist/modules/Payment/utils.js

@@ -1,8 +1,5 @@
 // 获取walletPass可用最大金额
 export var getAvailableMaxAmount = function getAvailableMaxAmount(data) {
-  if (typeof data._available_max_amount === 'number') {
-    return data._available_max_amount;
-  }
   return data.tag !== 'point_card' ? data.available_max_amount : data === null || data === void 0 ? void 0 : data.recommended_usage_amount;
 };
 

package/dist/modules/Payment/walletpass.d.ts

@@ -9,7 +9,6 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
     private userIdentificationCodes;
     private searchResults;
     private walletParams;
-    private walletInitData;
     constructor(paymentModule: PaymentModule);
     /**
      * 发送事件的辅助方法
@@ -38,14 +37,7 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
     initializeWalletDataFromBusinessAsync(businessData: WalletInitBusinessData): Promise<{
         walletRecommendList: WalletRecommendItem[];
         userIdentificationCodes: UserIdentificationCodeItem[];
-        transformList: any[];
-        noApplicableVoucher: any[];
-        products: any[];
     }>;
-    /**
-     * 获取订单基础详情
-     */
-    getOrderBasicDetailAsync(orderId: string): Promise<any>;
     /**
      * 初始化钱包数据
      * 先获取推荐列表，再获取用户识别码列表（顺序执行）
@@ -53,9 +45,6 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
     initializeWalletDataAsync(baseParams: WalletDeductionRecommendParams): Promise<{
         walletRecommendList: WalletRecommendItem[];
         userIdentificationCodes: UserIdentificationCodeItem[];
-        transformList: any[];
-        noApplicableVoucher: any[];
-        products: any[];
     }>;
     getWalletPassRecommendListAsync(params: WalletDeductionRecommendParams): Promise<WalletRecommendItem[]>;
     formatWalletPassList2PreparePayments(list: WalletRecommendItem[]): {
@@ -103,18 +92,6 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
      * 清除搜索结果缓存
      */
     clearSearchResults(): void;
-    /**
-     * 获取存储的钱包初始化数据
-     */
-    getStoredWalletInitData(): {
-        transformList: any[];
-        noApplicableVoucher: any[];
-        products: any[];
-    } | null;
-    /**
-     * 清除存储的钱包初始化数据
-     */
-    clearStoredWalletInitData(): void;
     /**
      * 清除所有缓存数据
      */