@pisell/pisellos 0.0.567 → 0.0.569

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

@@ -104,7 +104,7 @@ export interface PaymentItem {
     /** 支付类型type，跟支付列表上对应的支付方式保持一致 */
     type: string;
     /** 代金券、充值卡、积分卡等wallet pass id */
-    voucher_id?: string;
+    voucher_id?: string | number;
     /** 拓展参数字段 */
     metadata?: {
         /** 钱箱 ID */
@@ -131,6 +131,8 @@ export interface PaymentItem {
     origin_amount?: string;
     /** 订单支付类型 */
     order_payment_type?: 'normal' | 'deposit';
+    /** 支付时间 (格式: YYYY-MM-DD HH:mm:ss) */
+    payment_time?: string;
     /** 本支付项是否已成功同步到后端 */
     isSynced?: boolean;
     /** 最近一次同步失败信息（存在则代表同步失败过） */
@@ -231,13 +233,19 @@ export interface PaymentItemInput {
     /** 支付类型，跟支付列表上对应的支付方式保持一致 */
     code: string;
     /** 支付类型id，跟支付列表上对应的支付方式保持一致 */
-    custom_payment_id: number;
+    custom_payment_id?: string | number;
+    /** 兼容旧调用方传入的支付方式 id */
+    id?: string | number;
     /** 支付类型名称，跟支付列表上对应的支付方式保持一致 */
     name: string;
     /** 支付类型type，跟支付列表上对应的支付方式保持一致 */
     type: string;
     /** 代金券、充值卡、积分卡等wallet pass id */
-    voucher_id?: string;
+    voucher_id?: string | number;
+    /** Wallet Pass 使用单位配置 */
+    wallet_pass_usage_unit?: unknown;
+    /** Wallet Pass 本次使用值 */
+    wallet_pass_use_value?: string | number | null;
     /** 三方支付手续费 */
     service_charge?: {
         percentage?: string;
@@ -264,10 +272,6 @@ export interface PaymentItemInput {
     created_at?: string;
     /** 支付项更新时间 (格式: YYYY-MM-DD HH:mm:ss, 可选，不传则自动生成) */
     updated_at?: string;
-    /** 钱包支付使用金额 */
-    wallet_pass_use_value?: any;
-    /** 钱包支付使用单位 */
-    wallet_pass_usage_unit?: any;
 }
 /**
  * 推送支付项参数
@@ -351,6 +355,18 @@ export interface EftposPayment {
 /**
  * 钱包支付接口
  */
+export interface WalletInitializationResult {
+    walletRecommendList: WalletRecommendItem[];
+    userIdentificationCodes: UserIdentificationCodeItem[];
+    transformList: any[];
+    noApplicableVoucher: any[];
+    products: any[];
+}
+export interface WalletStoredInitData {
+    transformList: any[];
+    noApplicableVoucher: any[];
+    products: any[];
+}
 export interface WalletPassPayment {
     /** 生成钱包API默认参数 */
     generateWalletParams: (businessData: WalletInitBusinessData) => WalletDeductionRecommendParams;
@@ -359,21 +375,25 @@ export interface WalletPassPayment {
     /** 清理已存储的钱包参数 */
     clearStoredWalletParams: () => void;
     /** 初始化钱包数据（从业务数据开始，内部生成参数） */
-    initializeWalletDataFromBusinessAsync: (businessData: WalletInitBusinessData) => Promise<{
-        walletRecommendList: WalletRecommendItem[];
-        userIdentificationCodes: UserIdentificationCodeItem[];
-    }>;
+    initializeWalletDataFromBusinessAsync: (businessData: WalletInitBusinessData) => Promise<WalletInitializationResult>;
     /** 初始化钱包数据（先获取推荐列表，再获取用户识别码列表） */
-    initializeWalletDataAsync: (baseParams: WalletDeductionRecommendParams) => Promise<{
-        walletRecommendList: WalletRecommendItem[];
-        userIdentificationCodes: UserIdentificationCodeItem[];
-    }>;
+    initializeWalletDataAsync: (baseParams: WalletDeductionRecommendParams) => Promise<WalletInitializationResult>;
     /** 获取钱包推荐扣款列表（异步获取并缓存） */
     getWalletPassRecommendListAsync: (params: WalletDeductionRecommendParams) => Promise<WalletRecommendItem[]>;
     /** 查询用户识别码列表（异步获取并缓存） */
     getUserIdentificationCodeListAsync: (params: UserIdentificationCodeParams) => Promise<UserIdentificationCodeItem[]>;
     /** 搜索识别码信息 */
-    searchIdentificationCodeAsync: (params: SearchIdentificationCodeParams) => Promise<SearchIdentificationCodeResult>;
+    searchIdentificationCodeAsync: (params: SearchIdentificationCodeParams, config?: {
+        noCache?: boolean;
+    }) => Promise<SearchIdentificationCodeResult>;
+    /** 将推荐钱包列表转换为 prepare_payments */
+    formatWalletPassList2PreparePayments: (list: WalletRecommendItem[]) => {
+        voucher_id: number;
+        amount: number;
+        tag: string;
+        wallet_pass_usage_unit?: unknown;
+        wallet_pass_use_value?: string | number | null;
+    }[];
     /** 获取缓存的搜索结果列表 */
     getSearchResults: () => SearchIdentificationCodeItem[];
     /** 根据识别码查找搜索结果 */
@@ -386,6 +406,10 @@ export interface WalletPassPayment {
     clearWalletRecommendList: () => void;
     /** 清除用户识别码列表 */
     clearUserIdentificationCodes: () => void;
+    /** 获取缓存的钱包初始化数据 */
+    getStoredWalletInitData: () => WalletStoredInitData | null;
+    /** 清除缓存的钱包初始化数据 */
+    clearStoredWalletInitData: () => void;
     /** 清除搜索结果缓存 */
     clearSearchResults: () => void;
     /** 清除所有缓存数据 */

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

@@ -7,8 +7,8 @@ export declare const formatWalletPassList2PreparePayments: (list?: any[]) => {
     voucher_id: any;
     amount: number;
     tag: any;
-    wallet_pass_use_value: any;
     wallet_pass_usage_unit: any;
+    wallet_pass_use_value: any;
 }[];
 /**
  * 对用户识别码列表进行排序

package/dist/modules/Payment/utils.js

@@ -11,15 +11,16 @@ export var getAvailableMaxAmount = function getAvailableMaxAmount(data) {
  * @param list
  */
 export var formatWalletPassList2PreparePayments = function formatWalletPassList2PreparePayments(list) {
-  return (list || []).map(function (item) {
+  var formatted = (list || []).map(function (item) {
     return {
       voucher_id: item.id || 0,
       amount: Number(item.edit_current_amount || getAvailableMaxAmount(item)) || 0,
       tag: item.tag || '',
-      wallet_pass_use_value: item.recommended_usage_par_value,
-      wallet_pass_usage_unit: item.wallet_pass_usage_unit
+      wallet_pass_usage_unit: item.wallet_pass_usage_unit || {},
+      wallet_pass_use_value: item.wallet_pass_use_value || undefined
     };
   });
+  return formatted;
 };
 
 /**

package/dist/modules/Payment/walletpass.js

@@ -283,7 +283,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 filter_prepare_wallet_pass: 1
               }); // 并行获取用户识别码列表和订单详情
               _context3.next = 4;
-              return Promise.all([this.getUserIdentificationCodeListAsync(identificationParams), baseParams.payment_order_id ? this.getOrderBasicDetailAsync(baseParams.payment_order_id) : Promise.resolve(null)]);
+              return Promise.all([this.getUserIdentificationCodeListAsync(identificationParams), baseParams.payment_order_id && typeof baseParams.payment_order_id === 'string' && !baseParams.payment_order_id.startsWith('LOCAL_') ? this.getOrderBasicDetailAsync(baseParams.payment_order_id) : Promise.resolve(null)]);
             case 4:
               _yield$Promise$all = _context3.sent;
               _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 2);
@@ -309,7 +309,6 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 vouchers: allList
               });
               recommended = res.recommended, transformList = res.transformList, noApplicableVoucher = res.noApplicableVoucher, recommendedAmount = res.recommendedAmount;
-              console.log(res, 'resres12');
               this.walletRecommendList = recommended;
 
               // 存储初始化数据到内存中，供 useWalletPass 使用
@@ -329,19 +328,19 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 noApplicableVoucher: noApplicableVoucher,
                 products: products || []
               });
-            case 20:
-              _context3.prev = 20;
+            case 19:
+              _context3.prev = 19;
               _context3.t0 = _context3["catch"](0);
               this.paymentModule.logError('[WalletPass] 初始化钱包数据失败', _context3.t0, {
                 customer_id: baseParams.customer_id,
                 order_expect_amount: baseParams.order_expect_amount
               });
               throw _context3.t0;
-            case 24:
+            case 23:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[0, 20]]);
+        }, _callee3, this, [[0, 19]]);
       }));
       function initializeWalletDataAsync(_x3) {
         return _initializeWalletDataAsync.apply(this, arguments);
@@ -363,10 +362,13 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 sale_channel: params.sale_channel,
                 payment_order_id: (_this$walletParams = this.walletParams) === null || _this$walletParams === void 0 ? void 0 : _this$walletParams.payment_order_id
               });
-              _context4.next = 4;
+              if (typeof params.payment_order_id === 'string' && params.payment_order_id.startsWith('LOCAL_')) {
+                params.payment_order_id = undefined;
+              }
+              _context4.next = 5;
               return this.paymentModule.request.post('/machinecode/prepare/deduction/recommend', params // 将 params 作为请求体数据
               );
-            case 4:
+            case 5:
               response = _context4.sent;
               this.walletRecommendList = (response === null || response === void 0 ? void 0 : response.data) || [];
 
@@ -386,8 +388,8 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 })
               });
               return _context4.abrupt("return", this.walletRecommendList);
-            case 11:
-              _context4.prev = 11;
+            case 12:
+              _context4.prev = 12;
               _context4.t0 = _context4["catch"](0);
               this.paymentModule.logError('[WalletPass] 获取钱包推荐列表失败', _context4.t0, {
                 customer_id: params.customer_id,
@@ -396,11 +398,11 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
               });
               // throw error;
               return _context4.abrupt("return", []);
-            case 15:
+            case 16:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this, [[0, 11]]);
+        }, _callee4, this, [[0, 12]]);
       }));
       function getWalletPassRecommendListAsync(_x4) {
         return _getWalletPassRecommendListAsync.apply(this, arguments);
@@ -416,12 +418,22 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
     key: "getUserIdentificationCodeListAsync",
     value: function () {
       var _getUserIdentificationCodeListAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(params) {
-        var _newParams$prepare_pa, _this$walletParams2, newParams, response, sortedData;
+        var _newParams$products, _newParams$prepare_pa, _this$walletParams2, newParams, response, sortedData;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
               _context5.prev = 0;
               newParams = _objectSpread(_objectSpread({}, this.walletParams), params);
+              if ((_newParams$products = newParams.products) !== null && _newParams$products !== void 0 && _newParams$products.length) {
+                _context5.next = 5;
+                break;
+              }
+              this.paymentModule.logInfo('[WalletPass] 商品列表为空，跳过获取用户识别码列表');
+              return _context5.abrupt("return", []);
+            case 5:
+              if (typeof newParams.payment_order_id === 'string' && newParams.payment_order_id.startsWith('LOCAL_')) {
+                newParams.payment_order_id = undefined;
+              }
               this.paymentModule.logInfo('[WalletPass] 开始获取用户识别码列表', {
                 customer_id: newParams.customer_id,
                 available: newParams.available,
@@ -429,9 +441,9 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 filter_prepare_wallet_pass: newParams.filter_prepare_wallet_pass,
                 payment_order_id: (_this$walletParams2 = this.walletParams) === null || _this$walletParams2 === void 0 ? void 0 : _this$walletParams2.payment_order_id
               });
-              _context5.next = 5;
+              _context5.next = 9;
               return this.paymentModule.request.post('/machinecode/prepare/deduction', newParams);
-            case 5:
+            case 9:
               response = _context5.sent;
               // 对获取到的数据进行排序，将错误码为 500100、500200、500300 的项目排到最后
               sortedData = sortUserIdentificationCodeList((response === null || response === void 0 ? void 0 : response.data) || []);
@@ -452,19 +464,19 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 })
               });
               return _context5.abrupt("return", this.userIdentificationCodes);
-            case 13:
-              _context5.prev = 13;
+            case 17:
+              _context5.prev = 17;
               _context5.t0 = _context5["catch"](0);
               this.paymentModule.logError('[WalletPass] 获取用户识别码列表失败', _context5.t0, {
                 customer_id: params.customer_id,
                 available: params.available
               });
               return _context5.abrupt("return", []);
-            case 17:
+            case 21:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[0, 13]]);
+        }, _callee5, this, [[0, 17]]);
       }));
       function getUserIdentificationCodeListAsync(_x5) {
         return _getUserIdentificationCodeListAsync.apply(this, arguments);
@@ -509,9 +521,8 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 noCache: config.noCache || false
               });
 
-              // 检查识别码是否为9位且前3位为"000"
-              isWalletCode = code.length === 9 && code.startsWith('000'); // 测试环境先使用 WL
-              // const isWalletCode = code.startsWith('WL');
+              // 新钱包规则
+              isWalletCode = code.startsWith('WL') || code.startsWith('200') && code.length === 10;
               if (!isWalletCode) {
                 _context6.next = 14;
                 break;
@@ -566,31 +577,34 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 multiple: searchParams.multiple,
                 payment_order_id: baseWalletParams === null || baseWalletParams === void 0 ? void 0 : baseWalletParams.payment_order_id
               });
+              if (typeof searchParams.payment_order_id === 'string' && searchParams.payment_order_id.startsWith('LOCAL_')) {
+                searchParams.payment_order_id = undefined;
+              }
               if (!(!searchParams.products || ((_ref = searchParams.products || []) === null || _ref === void 0 ? void 0 : _ref.length) === 0)) {
-                _context6.next = 21;
+                _context6.next = 22;
                 break;
               }
               response = {
                 data: []
               };
-              _context6.next = 24;
+              _context6.next = 25;
               break;
-            case 21:
-              _context6.next = 23;
+            case 22:
+              _context6.next = 24;
               return this.paymentModule.request.post('/machinecode/prepare/deduction/search', searchParams);
-            case 23:
-              response = _context6.sent;
             case 24:
+              response = _context6.sent;
+            case 25:
               searchResults = ((_response2 = response) === null || _response2 === void 0 ? void 0 : _response2.data) || [];
               if (!config.noCache) {
-                _context6.next = 27;
+                _context6.next = 28;
                 break;
               }
               return _context6.abrupt("return", {
                 type: 'normalCode',
                 data: searchResults
               });
-            case 27:
+            case 28:
               // 将搜索结果存储到缓存数组中
               if (searchResults.length > 0) {
                 // 避免重复存储相同的识别码
@@ -620,8 +634,8 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 type: 'normalCode',
                 data: searchResults
               });
-            case 33:
-              _context6.prev = 33;
+            case 34:
+              _context6.prev = 34;
               _context6.t0 = _context6["catch"](1);
               this.paymentModule.logError('[WalletPass] 搜索识别码信息失败', _context6.t0, {
                 code: params.code,
@@ -629,11 +643,11 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 order_expect_amount: params.order_expect_amount
               });
               throw _context6.t0;
-            case 37:
+            case 38:
             case "end":
               return _context6.stop();
           }
-        }, _callee6, this, [[1, 33]]);
+        }, _callee6, this, [[1, 34]]);
       }));
       function searchIdentificationCodeAsync(_x6) {
         return _searchIdentificationCodeAsync.apply(this, arguments);

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

@@ -9,6 +9,26 @@ export interface ProductCollection {
     /** 商品集合封面 */
     cover: string;
 }
+/**
+ * 商品 Data Variant 记录，结构与后端 data_variant 表对齐。
+ */
+export interface ProductDataVariant {
+    /** 变体记录 id */
+    id: number;
+    /** 店铺 id */
+    shop_id: number;
+    /** 所属模块，商品场景固定为 product */
+    module: string;
+    /** 模块数据 id，商品场景对应 product.id */
+    module_data_id: number;
+    /** 关联 data_variant_rule.id */
+    data_variant_rule_id: number;
+    /** 命中策略后覆盖到商品上的字段 */
+    data: Record<string, any>;
+    created_at: string | null;
+    updated_at: string | null;
+    deleted_at: string | null;
+}
 /**
  * 商品基本信息接口
  */
@@ -168,6 +188,13 @@ export interface ProductData {
     product_resource?: {
         resources?: ProductResourceItem[];
     };
+    /** 商品级持有人配置，resource_id 对应 holder 表单 id */
+    holder_config?: {
+        status?: string;
+        required?: number | string | boolean;
+        resource_id?: number | string | null;
+        [key: string]: any;
+    };
     /** 组合商品id，动态附加 */
     product_variant_id?: number;
     /** 套餐信息 */
@@ -208,15 +235,10 @@ export interface ProductData {
     bundle_group_count: number;
     /** 选项组数量 */
     option_group_count: number;
+    /** 智能定价变体列表，/product/query with dataVariants 返回 */
+    data_variants?: ProductDataVariant[];
     /** 服务时长 */
     service_times?: any;
-    /** holder 表单配置 */
-    holder_config?: {
-        required?: number;
-        resource_id?: number;
-        status?: string;
-        [key: string]: any;
-    };
 }
 /**
  * 商品媒体信息接口

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

@@ -1,5 +1,6 @@
 import { Module, PisellCore } from '../../types';
 import { BaseModule } from '../BaseModule';
+import { ProductListLoadProductsParams } from './types';
 import { ProductData } from '../Product/types';
 export * from './types';
 export declare class ProductList extends BaseModule implements Module {
@@ -10,20 +11,22 @@ export declare class ProductList extends BaseModule implements Module {
     private otherParams;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: any): Promise<void>;
+    /**
+     * 更新运行态参数，供父级解决方案 setOtherParams 后同步查询上下文。
+     *
+     * @example
+     * productList.updateOtherParams({ channel: 'pos' });
+     */
+    updateOtherParams(params: Record<string, any>): void;
     storeChange(path?: string, value?: any): Promise<void>;
-    loadProducts({ category_ids, product_ids, collection, menu_list_ids, customer_id: paramsCustomerId, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, with_extra, }: {
-        category_ids?: number[];
-        product_ids?: number[];
-        collection?: number | string[];
-        schedule_date?: string;
-        schedule_datetime?: string;
-        cacheId?: string;
-        customer_id?: number;
-        menu_list_ids?: number[];
-        with_count?: string[];
-        with_schedule?: number;
-        with_extra?: string[];
-    }, options?: {
+    /**
+     * 获取加时商品列表。
+     *
+     * @example
+     * const products = await productList.getAddTimeProducts({ schedule_date: '2026-06-16' });
+     */
+    getAddTimeProducts(params?: ProductListLoadProductsParams): Promise<any>;
+    loadProducts({ category_ids, product_ids, collection, menu_list_ids, customer_id: paramsCustomerId, with_count, schedule_datetime, schedule_date, cacheId, with_schedule, extension_type, status, strategy_context, with_extra, }?: ProductListLoadProductsParams, options?: {
         callback?: (result: any) => void;
         subscriberId?: string;
     }): Promise<any>;
@@ -35,6 +38,7 @@ export declare class ProductList extends BaseModule implements Module {
     }): Promise<any>;
     getProducts(): Promise<ProductData[]>;
     getProduct(id: number): Promise<ProductData | undefined>;
+    getProductByIds(ids: number[]): Promise<ProductData[] | undefined>;
     addProduct(products: ProductData[]): Promise<void>;
     selectProducts(products: ProductData[]): Promise<void>;
     /**