@pisell/pisellos 2.2.133 → 2.2.134

package/dist/modules/Payment/index.js

@@ -76,6 +76,13 @@ function generateRequestUniqueId() {
 
   return "".concat(year).concat(month).concat(day).concat(hour).concat(minute).concat(second).concat(millisecond).concat(randomDigits);
 }
+function normalizeCustomPaymentId(paymentItem) {
+  var _ref, _paymentItem$custom_p;
+  var rawId = (_ref = (_paymentItem$custom_p = paymentItem.custom_payment_id) !== null && _paymentItem$custom_p !== void 0 ? _paymentItem$custom_p : paymentItem.id) !== null && _ref !== void 0 ? _ref : 0;
+  var parsedId = Number(rawId);
+  if (!Number.isFinite(parsedId)) return 0;
+  return parsedId;
+}
 
 /**
  * 支付模块实现
@@ -297,7 +304,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
       var network = this.app.plugins.get('network');
       this.logInfo('Registering network status listener');
       network === null || network === void 0 || network.addListener('networkStatusChange', /*#__PURE__*/function () {
-        var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(status) {
+        var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(status) {
           return _regeneratorRuntime().wrap(function _callee2$(_context2) {
             while (1) switch (_context2.prev = _context2.next) {
               case 0:
@@ -317,7 +324,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
           }, _callee2);
         }));
         return function (_x3) {
-          return _ref.apply(this, arguments);
+          return _ref2.apply(this, arguments);
         };
       }());
     }
@@ -1251,12 +1258,14 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               currentTime = formatDateTime(new Date());
               newPaymentItem = {
                 uuid: paymentUuid,
-                custom_payment_id: paymentItem.custom_payment_id || 0,
+                custom_payment_id: normalizeCustomPaymentId(paymentItem),
                 name: paymentItem.name,
                 code: paymentItem.code,
                 type: paymentItem.type,
                 amount: formatAmount(paymentItem.amount),
                 voucher_id: paymentItem.voucher_id || '',
+                wallet_pass_usage_unit: paymentItem.wallet_pass_usage_unit,
+                wallet_pass_use_value: paymentItem.wallet_pass_use_value,
                 rounding_amount: paymentItem.rounding_amount || '0.00',
                 service_charge: paymentItem.service_charge,
                 status: 'active',

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

@@ -104,7 +104,11 @@ export interface PaymentItem {
     /** 支付类型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;
     /** 拓展参数字段 */
     metadata?: {
         /** 钱箱 ID */
@@ -227,13 +231,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;

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(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

package/lib/modules/Payment/index.js

@@ -62,6 +62,13 @@ function generateRequestUniqueId() {
   const randomDigits = Math.floor(Math.random() * 9e3) + 1e3;
   return `${year}${month}${day}${hour}${minute}${second}${millisecond}${randomDigits}`;
 }
+function normalizeCustomPaymentId(paymentItem) {
+  const rawId = paymentItem.custom_payment_id ?? paymentItem.id ?? 0;
+  const parsedId = Number(rawId);
+  if (!Number.isFinite(parsedId))
+    return 0;
+  return parsedId;
+}
 var PaymentModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name || "payment", version);
@@ -633,12 +640,14 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       const currentTime = formatDateTime(/* @__PURE__ */ new Date());
       const newPaymentItem = {
         uuid: paymentUuid,
-        custom_payment_id: paymentItem.custom_payment_id || 0,
+        custom_payment_id: normalizeCustomPaymentId(paymentItem),
         name: paymentItem.name,
         code: paymentItem.code,
         type: paymentItem.type,
         amount: formatAmount(paymentItem.amount),
         voucher_id: paymentItem.voucher_id || "",
+        wallet_pass_usage_unit: paymentItem.wallet_pass_usage_unit,
+        wallet_pass_use_value: paymentItem.wallet_pass_use_value,
         rounding_amount: paymentItem.rounding_amount || "0.00",
         service_charge: paymentItem.service_charge,
         status: "active",

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

@@ -104,7 +104,11 @@ export interface PaymentItem {
     /** 支付类型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;
     /** 拓展参数字段 */
     metadata?: {
         /** 钱箱 ID */
@@ -227,13 +231,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;

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(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

package/package.json

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