@pisell/pisellos 2.2.12 → 2.2.14

package/dist/modules/Payment/index.js

@@ -312,66 +312,67 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               return _context3.abrupt("return", cachedMethods);
             case 16:
               _context3.next = 18;
-              return this.request.get('/pay/custom-payment/available', {
-                channel: 'pos'
-              });
+              return this.request.get('/pay/custom-payment/all');
             case 18:
               response = _context3.sent;
+              response.data = response.data.filter(function (method) {
+                return method.status === 1 && method.disable === 0;
+              });
               payMethods = response.data || []; // 尝试缓存到 IndexDB
-              _context3.prev = 20;
+              _context3.prev = 21;
               _iterator = _createForOfIteratorHelper(payMethods);
-              _context3.prev = 22;
+              _context3.prev = 23;
               _iterator.s();
-            case 24:
+            case 25:
               if ((_step = _iterator.n()).done) {
-                _context3.next = 30;
+                _context3.next = 31;
                 break;
               }
               method = _step.value;
-              _context3.next = 28;
+              _context3.next = 29;
               return this.dbManager.update('pay_method', method);
-            case 28:
-              _context3.next = 24;
+            case 29:
+              _context3.next = 25;
               break;
-            case 30:
-              _context3.next = 35;
+            case 31:
+              _context3.next = 36;
               break;
-            case 32:
-              _context3.prev = 32;
-              _context3.t1 = _context3["catch"](22);
+            case 33:
+              _context3.prev = 33;
+              _context3.t1 = _context3["catch"](23);
               _iterator.e(_context3.t1);
-            case 35:
-              _context3.prev = 35;
+            case 36:
+              _context3.prev = 36;
               _iterator.f();
-              return _context3.finish(35);
-            case 38:
-              _context3.next = 43;
+              return _context3.finish(36);
+            case 39:
+              _context3.next = 44;
               break;
-            case 40:
-              _context3.prev = 40;
-              _context3.t2 = _context3["catch"](20);
+            case 41:
+              _context3.prev = 41;
+              _context3.t2 = _context3["catch"](21);
               console.warn('[PaymentModule] 无法缓存支付方式，pay_method 表不存在');
-            case 43:
-              _context3.next = 45;
+            case 44:
+              _context3.next = 46;
               return this.core.effects.emit("".concat(this.name, ":onPaymentMethodsLoaded"), payMethods);
-            case 45:
+            case 46:
               this.logInfo('getPayMethodListAsync completed successfully', {
                 methodCount: payMethods.length,
                 hasCache: cachedMethods.length > 0
               });
               return _context3.abrupt("return", payMethods);
-            case 49:
-              _context3.prev = 49;
+            case 50:
+              _context3.prev = 50;
               _context3.t3 = _context3["catch"](1);
               console.error('[PaymentModule] 获取支付方式列表失败', _context3.t3);
               this.logError('getPayMethodListAsync failed', _context3.t3);
               // 如果所有操作都失败，返回空数组
               return _context3.abrupt("return", []);
-            case 54:
+            case 55:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[1, 49], [3, 9], [20, 40], [22, 32, 35, 38]]);
+        }, _callee3, this, [[1, 50], [3, 9], [21, 41], [23, 33, 36, 39]]);
       }));
       function getPayMethodListAsync() {
         return _getPayMethodListAsync.apply(this, arguments);
@@ -398,15 +399,16 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
 
               // 从服务器获取最新数据
               _context4.next = 5;
-              return this.request.get('/pay/custom-payment/available', {
-                channel: 'pos'
-              });
+              return this.request.get('/pay/custom-payment/all');
             case 5:
               response = _context4.sent;
+              response.data = response.data.filter(function (method) {
+                return method.status === 1 && method.disable === 0;
+              });
               newPayMethods = response.data || []; // 检查是否有变化
               hasChanges = this.hasPaymentMethodsChanged(cachedMethods, newPayMethods);
               if (!hasChanges) {
-                _context4.next = 56;
+                _context4.next = 57;
                 break;
               }
               console.log('[PaymentModule] 支付方式列表已更新');
@@ -416,92 +418,92 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               });
 
               // 更新缓存
-              _context4.prev = 11;
+              _context4.prev = 12;
               // 先清除旧数据
               _iterator2 = _createForOfIteratorHelper(cachedMethods);
-              _context4.prev = 13;
+              _context4.prev = 14;
               _iterator2.s();
-            case 15:
+            case 16:
               if ((_step2 = _iterator2.n()).done) {
-                _context4.next = 21;
+                _context4.next = 22;
                 break;
               }
               method = _step2.value;
-              _context4.next = 19;
+              _context4.next = 20;
               return this.dbManager.delete('pay_method', method.id);
-            case 19:
-              _context4.next = 15;
+            case 20:
+              _context4.next = 16;
               break;
-            case 21:
-              _context4.next = 26;
+            case 22:
+              _context4.next = 27;
               break;
-            case 23:
-              _context4.prev = 23;
-              _context4.t0 = _context4["catch"](13);
+            case 24:
+              _context4.prev = 24;
+              _context4.t0 = _context4["catch"](14);
               _iterator2.e(_context4.t0);
-            case 26:
-              _context4.prev = 26;
+            case 27:
+              _context4.prev = 27;
               _iterator2.f();
-              return _context4.finish(26);
-            case 29:
+              return _context4.finish(27);
+            case 30:
               // 添加新数据
               _iterator3 = _createForOfIteratorHelper(newPayMethods);
-              _context4.prev = 30;
+              _context4.prev = 31;
               _iterator3.s();
-            case 32:
+            case 33:
               if ((_step3 = _iterator3.n()).done) {
-                _context4.next = 38;
+                _context4.next = 39;
                 break;
               }
               _method = _step3.value;
-              _context4.next = 36;
+              _context4.next = 37;
               return this.dbManager.update('pay_method', _method);
-            case 36:
-              _context4.next = 32;
+            case 37:
+              _context4.next = 33;
               break;
-            case 38:
-              _context4.next = 43;
+            case 39:
+              _context4.next = 44;
               break;
-            case 40:
-              _context4.prev = 40;
-              _context4.t1 = _context4["catch"](30);
+            case 41:
+              _context4.prev = 41;
+              _context4.t1 = _context4["catch"](31);
               _iterator3.e(_context4.t1);
-            case 43:
-              _context4.prev = 43;
+            case 44:
+              _context4.prev = 44;
               _iterator3.f();
-              return _context4.finish(43);
-            case 46:
-              _context4.next = 51;
+              return _context4.finish(44);
+            case 47:
+              _context4.next = 52;
               break;
-            case 48:
-              _context4.prev = 48;
-              _context4.t2 = _context4["catch"](11);
+            case 49:
+              _context4.prev = 49;
+              _context4.t2 = _context4["catch"](12);
               console.warn('[PaymentModule] 无法更新支付方式缓存', _context4.t2);
-            case 51:
+            case 52:
               // 通知外部支付方式已变化
               eventData = {
                 oldMethods: cachedMethods,
                 newMethods: newPayMethods
               };
-              _context4.next = 54;
+              _context4.next = 55;
               return this.core.effects.emit("".concat(this.name, ":onPaymentMethodsChanged"), eventData);
-            case 54:
-              _context4.next = 57;
+            case 55:
+              _context4.next = 58;
               break;
-            case 56:
-              console.log('[PaymentModule] 支付方式列表无变化');
             case 57:
-              _context4.next = 62;
+              console.log('[PaymentModule] 支付方式列表无变化');
+            case 58:
+              _context4.next = 63;
               break;
-            case 59:
-              _context4.prev = 59;
+            case 60:
+              _context4.prev = 60;
               _context4.t3 = _context4["catch"](1);
               console.error('[PaymentModule] 后台刷新支付方式失败', _context4.t3);
-            case 62:
+            case 63:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this, [[1, 59], [11, 48], [13, 23, 26, 29], [30, 40, 43, 46]]);
+        }, _callee4, this, [[1, 60], [12, 49], [14, 24, 27, 30], [31, 41, 44, 47]]);
       }));
       function refreshPaymentMethodsInBackground(_x4) {
         return _refreshPaymentMethodsInBackground.apply(this, arguments);

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, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/dist/solution/Checkout/index.js

@@ -1443,7 +1443,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "addPaymentItemAsync",
     value: (function () {
       var _addPaymentItemAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(paymentItem) {
-        var orderPaymentType, processedPaymentItem, metadata, paymentItemWithType, remainingAmount, _paymentItem$type, _paymentItem$code, isEftposPayment, _isCashPayment, isCustomePayment, syncResult;
+        var orderPaymentType, processedPaymentItem, metadata, paymentItemWithType, remainingAmount, _paymentItem$type, _paymentItem$code, isEftposPayment, isCash, isCustomePayment, syncResult;
         return _regeneratorRuntime().wrap(function _callee16$(_context16) {
           while (1) switch (_context16.prev = _context16.next) {
             case 0:
@@ -1493,7 +1493,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               this.logInfo('订单金额还有待付的，同步 EFTPOS 支付');
               // 检查是否是 EFTPOS 支付，如果是则立即同步订单
               isEftposPayment = ((_paymentItem$type = paymentItem.type) === null || _paymentItem$type === void 0 ? void 0 : _paymentItem$type.toLowerCase()) === 'eftpos' || ((_paymentItem$code = paymentItem.code) === null || _paymentItem$code === void 0 ? void 0 : _paymentItem$code.toUpperCase().includes('EFTPOS'));
-              _isCashPayment = paymentItem.code === 'CASHMANUAL';
+              isCash = isCashPayment(paymentItem);
               isCustomePayment = paymentItem.type === 'custom';
               this.logInfo('EFTPOS 支付检查:', {
                 paymentCode: paymentItem.code,
@@ -1501,7 +1501,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 isEftposPayment: isEftposPayment,
                 currentOrderSynced: this.store.isOrderSynced
               });
-              if (!(isEftposPayment || _isCashPayment || isCustomePayment)) {
+              if (!(isEftposPayment || isCash || isCustomePayment)) {
                 _context16.next = 39;
                 break;
               }
@@ -2614,7 +2614,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context28.prev = _context28.next) {
             case 0:
               // 检查是否是现金支付
-              cashPayment = isCashPayment(paymentItem.code, paymentItem.type);
+              cashPayment = isCashPayment(paymentItem);
               if (cashPayment) {
                 _context28.next = 3;
                 break;

package/dist/solution/Checkout/utils/index.d.ts

@@ -1,5 +1,6 @@
 import { CheckoutInitParams, CheckoutError, CheckoutErrorType, LocalOrderData, CartSummaryItem, ExtractedAmountInfo } from '../types';
 import { CartItem } from '../../../modules/Cart/types';
+import { PaymentItemInput } from '../../../modules/Payment/types';
 /**
  * 验证结账数据
  */
@@ -118,4 +119,4 @@ export declare function shouldSyncOrderForPayment(paymentCode: string, paymentTy
  * @param paymentType 支付方式类型
  * @returns 是否为现金支付
  */
-export declare function isCashPayment(paymentCode?: string, paymentType?: string): boolean;
+export declare function isCashPayment(paymentItem: PaymentItemInput): boolean;

package/dist/solution/Checkout/utils/index.js

@@ -499,13 +499,15 @@ export function shouldSyncOrderForPayment(paymentCode, paymentType) {
  * @param paymentType 支付方式类型
  * @returns 是否为现金支付
  */
-export function isCashPayment(paymentCode, paymentType) {
-  var codeUpper = (paymentCode === null || paymentCode === void 0 ? void 0 : paymentCode.toUpperCase()) || '';
-  var typeUpper = (paymentType === null || paymentType === void 0 ? void 0 : paymentType.toUpperCase()) || '';
+export function isCashPayment(paymentItem) {
+  var _paymentItem$code, _paymentItem$type, _paymentItem$name;
+  var codeUpper = ((_paymentItem$code = paymentItem.code) === null || _paymentItem$code === void 0 ? void 0 : _paymentItem$code.toUpperCase()) || '';
+  var typeUpper = ((_paymentItem$type = paymentItem.type) === null || _paymentItem$type === void 0 ? void 0 : _paymentItem$type.toUpperCase()) || '';
+  var isNameCash = (_paymentItem$name = paymentItem.name) === null || _paymentItem$name === void 0 ? void 0 : _paymentItem$name.toLowerCase().includes('cash');
 
   // 现金支付识别规则
   var cashIdentifiers = ['CASH', 'CASHMANUAL', 'MANUAL'];
   return cashIdentifiers.some(function (identifier) {
     return codeUpper.includes(identifier) || typeUpper.includes(identifier);
-  });
+  }) || isNameCash;
 }

package/lib/modules/Payment/index.js

@@ -192,7 +192,8 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
         this.refreshPaymentMethodsInBackground(cachedMethods);
         return cachedMethods;
       }
-      const response = await this.request.get("/pay/custom-payment/available", { channel: "pos" });
+      const response = await this.request.get("/pay/custom-payment/all");
+      response.data = response.data.filter((method) => method.status === 1 && method.disable === 0);
       const payMethods = response.data || [];
       try {
         for (const method of payMethods) {
@@ -225,7 +226,8 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
     });
     try {
       console.log("[PaymentModule] 后台刷新支付方式列表...");
-      const response = await this.request.get("/pay/custom-payment/available", { channel: "pos" });
+      const response = await this.request.get("/pay/custom-payment/all");
+      response.data = response.data.filter((method) => method.status === 1 && method.disable === 0);
       const newPayMethods = response.data || [];
       const hasChanges = this.hasPaymentMethodsChanged(
         cachedMethods,

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, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/lib/solution/Checkout/index.js

@@ -981,7 +981,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       if (Number(remainingAmount) > 0) {
         this.logInfo("订单金额还有待付的，同步 EFTPOS 支付");
         const isEftposPayment = ((_a = paymentItem.type) == null ? void 0 : _a.toLowerCase()) === "eftpos" || ((_b = paymentItem.code) == null ? void 0 : _b.toUpperCase().includes("EFTPOS"));
-        const isCashPayment2 = paymentItem.code === "CASHMANUAL";
+        const isCash = (0, import_utils.isCashPayment)(paymentItem);
         const isCustomePayment = paymentItem.type === "custom";
         this.logInfo("EFTPOS 支付检查:", {
           paymentCode: paymentItem.code,
@@ -989,7 +989,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           isEftposPayment,
           currentOrderSynced: this.store.isOrderSynced
         });
-        if (isEftposPayment || isCashPayment2 || isCustomePayment) {
+        if (isEftposPayment || isCash || isCustomePayment) {
           this.logInfo("检测到 EFTPOS 支付，立即同步订单到后端...");
           try {
             const syncResult = await this.syncOrderToBackendWithReturn(true);
@@ -1718,7 +1718,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
    * @returns 处理后的支付项（包含找零信息）
    */
   async processCashPaymentItem(paymentItem) {
-    const cashPayment = (0, import_utils.isCashPayment)(paymentItem.code, paymentItem.type);
+    const cashPayment = (0, import_utils.isCashPayment)(paymentItem);
     if (!cashPayment) {
       return paymentItem;
     }

package/lib/solution/Checkout/utils/index.d.ts

@@ -1,5 +1,6 @@
 import { CheckoutInitParams, CheckoutError, CheckoutErrorType, LocalOrderData, CartSummaryItem, ExtractedAmountInfo } from '../types';
 import { CartItem } from '../../../modules/Cart/types';
+import { PaymentItemInput } from '../../../modules/Payment/types';
 /**
  * 验证结账数据
  */
@@ -118,4 +119,4 @@ export declare function shouldSyncOrderForPayment(paymentCode: string, paymentTy
  * @param paymentType 支付方式类型
  * @returns 是否为现金支付
  */
-export declare function isCashPayment(paymentCode?: string, paymentType?: string): boolean;
+export declare function isCashPayment(paymentItem: PaymentItemInput): boolean;

package/lib/solution/Checkout/utils/index.js

@@ -326,13 +326,15 @@ function shouldSyncOrderForPayment(paymentCode, paymentType) {
   }
   return true;
 }
-function isCashPayment(paymentCode, paymentType) {
-  const codeUpper = (paymentCode == null ? void 0 : paymentCode.toUpperCase()) || "";
-  const typeUpper = (paymentType == null ? void 0 : paymentType.toUpperCase()) || "";
+function isCashPayment(paymentItem) {
+  var _a, _b, _c;
+  const codeUpper = ((_a = paymentItem.code) == null ? void 0 : _a.toUpperCase()) || "";
+  const typeUpper = ((_b = paymentItem.type) == null ? void 0 : _b.toUpperCase()) || "";
+  const isNameCash = (_c = paymentItem.name) == null ? void 0 : _c.toLowerCase().includes("cash");
   const cashIdentifiers = ["CASH", "CASHMANUAL", "MANUAL"];
   return cashIdentifiers.some(
     (identifier) => codeUpper.includes(identifier) || typeUpper.includes(identifier)
-  );
+  ) || isNameCash;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/package.json

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