@pisell/pisellos 2.2.66 → 2.2.68

package/dist/modules/Payment/index.js

@@ -1535,7 +1535,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                       throw new Error("\u8BA2\u5355\u4E0D\u5B58\u5728: ".concat(orderUuid));
                     case 34:
                       existingActiveVoucherKeys = new Set(orderAfterDelete.payment.filter(function (p) {
-                        return p.voucher_id && p.status !== 'voided';
+                        return p.voucher_id && p.status !== 'voided' && !p.isSynced;
                       }).map(function (p) {
                         return "".concat(p.voucher_id, "|").concat(p.order_payment_type || 'normal');
                       }));

package/dist/modules/Payment/walletpass.js

@@ -482,6 +482,8 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
     value: (function () {
       var _searchIdentificationCodeAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(params) {
         var config,
+          _ref,
+          _response2,
           code,
           isWalletCode,
           walletDetailParams,
@@ -564,20 +566,31 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 multiple: searchParams.multiple,
                 payment_order_id: baseWalletParams === null || baseWalletParams === void 0 ? void 0 : baseWalletParams.payment_order_id
               });
-              _context6.next = 19;
+              if (!(!searchParams.products || ((_ref = searchParams.products || []) === null || _ref === void 0 ? void 0 : _ref.length) === 0)) {
+                _context6.next = 21;
+                break;
+              }
+              response = {
+                data: []
+              };
+              _context6.next = 24;
+              break;
+            case 21:
+              _context6.next = 23;
               return this.paymentModule.request.post('/machinecode/prepare/deduction/search', searchParams);
-            case 19:
+            case 23:
               response = _context6.sent;
-              searchResults = (response === null || response === void 0 ? void 0 : response.data) || [];
+            case 24:
+              searchResults = ((_response2 = response) === null || _response2 === void 0 ? void 0 : _response2.data) || [];
               if (!config.noCache) {
-                _context6.next = 23;
+                _context6.next = 27;
                 break;
               }
               return _context6.abrupt("return", {
                 type: 'normalCode',
                 data: searchResults
               });
-            case 23:
+            case 27:
               // 将搜索结果存储到缓存数组中
               if (searchResults.length > 0) {
                 // 避免重复存储相同的识别码
@@ -607,8 +620,8 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 type: 'normalCode',
                 data: searchResults
               });
-            case 29:
-              _context6.prev = 29;
+            case 33:
+              _context6.prev = 33;
               _context6.t0 = _context6["catch"](1);
               this.paymentModule.logError('[WalletPass] 搜索识别码信息失败', _context6.t0, {
                 code: params.code,
@@ -616,11 +629,11 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 order_expect_amount: params.order_expect_amount
               });
               throw _context6.t0;
-            case 33:
+            case 37:
             case "end":
               return _context6.stop();
           }
-        }, _callee6, this, [[1, 29]]);
+        }, _callee6, this, [[1, 33]]);
       }));
       function searchIdentificationCodeAsync(_x6) {
         return _searchIdentificationCodeAsync.apply(this, arguments);

package/lib/modules/Payment/index.js

@@ -801,7 +801,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
           throw new Error(`订单不存在: ${orderUuid}`);
         }
         const existingActiveVoucherKeys = new Set(
-          orderAfterDelete.payment.filter((p) => p.voucher_id && p.status !== "voided").map((p) => `${p.voucher_id}|${p.order_payment_type || "normal"}`)
+          orderAfterDelete.payment.filter((p) => p.voucher_id && p.status !== "voided" && !p.isSynced).map((p) => `${p.voucher_id}|${p.order_payment_type || "normal"}`)
         );
         console.log("[PaymentModule] 添加新的代金券支付项:", {
           orderUuid,

package/lib/modules/Payment/walletpass.js

@@ -346,6 +346,7 @@ var WalletPassPaymentImpl = class {
    * 特殊逻辑：当识别码长度为9位且前3位为"000"时，调用 /wallet/detail/search 接口
    */
   async searchIdentificationCodeAsync(params, config = {}) {
+    var _a;
     try {
       const { code } = params;
       this.paymentModule.logInfo("[WalletPass] 开始搜索识别码", {
@@ -403,10 +404,17 @@ var WalletPassPaymentImpl = class {
         multiple: searchParams.multiple,
         payment_order_id: baseWalletParams == null ? void 0 : baseWalletParams.payment_order_id
       });
-      const response = await this.paymentModule.request.post(
-        "/machinecode/prepare/deduction/search",
-        searchParams
-      );
+      let response;
+      if (!searchParams.products || ((_a = searchParams.products || []) == null ? void 0 : _a.length) === 0) {
+        response = {
+          data: []
+        };
+      } else {
+        response = await this.paymentModule.request.post(
+          "/machinecode/prepare/deduction/search",
+          searchParams
+        );
+      }
       const searchResults = (response == null ? void 0 : response.data) || [];
       if (config.noCache) {
         return {

package/package.json

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