@pisell/pisellos 0.0.248 → 0.0.249

package/dist/solution/BookingByStep/index.d.ts

@@ -314,7 +314,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     }[];
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/dist/solution/Checkout/index.js

@@ -2545,7 +2545,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "saveForLaterPaymentAsync",
     value: (function () {
       var _saveForLaterPaymentAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee33() {
-        var orderUuid, currentOrderId, allPaymentItems, filteredPaymentItems, voucherItems, realOrderId, finalOrderId, _this$store$currentOr11, errorMessage;
+        var orderUuid, currentOrderId, allPaymentItems, realOrderId, finalOrderId, _this$store$currentOr11, errorMessage;
         return _regeneratorRuntime().wrap(function _callee33$(_context33) {
           while (1) switch (_context33.prev = _context33.next) {
             case 0:
@@ -2572,45 +2572,16 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               return this.payment.getPaymentItemsAsync(this.store.currentOrder.uuid);
             case 8:
               allPaymentItems = _context33.sent;
-              // 过滤掉带有 voucher_id 的支付项（代金券类支付项）
-              filteredPaymentItems = allPaymentItems.filter(function (payment) {
-                return !payment.voucher_id;
-              }); // 记录过滤结果
-              voucherItems = allPaymentItems.filter(function (payment) {
-                return payment.voucher_id;
-              });
-              console.log('[Checkout] 支付项过滤结果:', {
-                总支付项: allPaymentItems.length,
-                过滤后支付项: filteredPaymentItems.length,
-                被过滤的代金券项: voucherItems.length,
-                代金券详情: voucherItems.map(function (item) {
-                  return {
-                    uuid: item.uuid,
-                    code: item.code,
-                    amount: item.amount,
-                    voucherId: item.voucher_id
-                  };
-                }),
-                保留的支付项: filteredPaymentItems.map(function (item) {
-                  return {
-                    uuid: item.uuid,
-                    code: item.code,
-                    amount: item.amount
-                  };
-                })
-              });
-
-              // 调用同步方法，传入过滤后的支付项
-              _context33.next = 14;
-              return this.syncOrderToBackendWithReturn(false, filteredPaymentItems);
-            case 14:
+              _context33.next = 11;
+              return this.syncOrderToBackendWithReturn(false, allPaymentItems);
+            case 11:
               realOrderId = _context33.sent;
               console.log('[Checkout] 保存订单完成:', {
                 orderUuid: orderUuid,
                 oldOrderId: currentOrderId,
                 realOrderId: realOrderId,
                 isOrderSynced: this.store.isOrderSynced,
-                filteredPaymentsCount: filteredPaymentItems.length
+                filteredPaymentsCount: allPaymentItems.length
               });
 
               // 验证最终状态
@@ -2627,8 +2598,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 orderId: realOrderId,
                 orderUuid: orderUuid
               });
-            case 21:
-              _context33.prev = 21;
+            case 18:
+              _context33.prev = 18;
               _context33.t0 = _context33["catch"](0);
               console.error('[Checkout] 保存订单失败:', _context33.t0);
               errorMessage = _context33.t0 instanceof Error ? _context33.t0.message : '保存失败';
@@ -2637,11 +2608,11 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 message: "\u8BA2\u5355\u4FDD\u5B58\u5931\u8D25: ".concat(errorMessage),
                 orderUuid: (_this$store$currentOr11 = this.store.currentOrder) === null || _this$store$currentOr11 === void 0 ? void 0 : _this$store$currentOr11.uuid
               });
-            case 26:
+            case 23:
             case "end":
               return _context33.stop();
           }
-        }, _callee33, this, [[0, 21]]);
+        }, _callee33, this, [[0, 18]]);
       }));
       function saveForLaterPaymentAsync() {
         return _saveForLaterPaymentAsync.apply(this, arguments);
@@ -3681,7 +3652,17 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "syncOrderToBackendWithReturn",
     value: (function () {
       var _syncOrderToBackendWithReturn = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee47() {
-        var _this$store$currentCu2, _this$store$currentOr20, _this$store$currentOr21, _checkoutResponse3, _checkoutResponse4, _checkoutResponse5, _checkoutResponse6, _checkoutResponse7, _checkoutResponse8;
+        var _this4 = this,
+          _processedPaymentItem,
+          _this$store$currentCu2,
+          _this$store$currentOr20,
+          _this$store$currentOr21,
+          _checkoutResponse3,
+          _checkoutResponse4,
+          _checkoutResponse5,
+          _checkoutResponse6,
+          _checkoutResponse7,
+          _checkoutResponse8;
         var isManual,
           customPaymentItems,
           syncType,
@@ -3691,6 +3672,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
           reason,
           operation,
           paymentItems,
+          processedPaymentItems,
           orderParams,
           startTime,
           checkoutResponse,
@@ -3794,12 +3776,35 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 })
               });
 
+              // 处理支付项数据，确保包含完整的 metadata
+              processedPaymentItems = paymentItems.map(function (item) {
+                var _item$metadata, _item$metadata2;
+                return _objectSpread(_objectSpread({}, item), {}, {
+                  metadata: _objectSpread(_objectSpread({}, item.metadata), {}, {
+                    rounding_rule: ((_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.rounding_rule) || _this4.otherParams.order_rounding_setting,
+                    shop_wallet_pass_id: ((_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.shop_wallet_pass_id) || _this4.otherParams.shop_wallet_pass_id
+                  })
+                });
+              });
+              console.log('[Checkout] 处理后的支付项数据（包含完整metadata）:', {
+                originalCount: paymentItems.length,
+                processedCount: processedPaymentItems.length,
+                sampleMetadata: (_processedPaymentItem = processedPaymentItems[0]) === null || _processedPaymentItem === void 0 ? void 0 : _processedPaymentItem.metadata,
+                allPaymentItems: processedPaymentItems.map(function (p) {
+                  return {
+                    code: p.code,
+                    amount: p.amount,
+                    metadata: p.metadata
+                  };
+                })
+              });
+
               // 构造订单参数，直接使用 localOrderData 中已处理好的数据
               orderParams = _objectSpread(_objectSpread({}, this.store.localOrderData), {}, {
                 type: this.store.localOrderData.type,
                 platform: this.store.localOrderData.platform,
-                payments: paymentItems,
-                // 添加支付项
+                payments: processedPaymentItems,
+                // 使用处理过的支付项数据
                 customer_id: (_this$store$currentCu2 = this.store.currentCustomer) === null || _this$store$currentCu2 === void 0 ? void 0 : _this$store$currentCu2.customer_id,
                 // 添加客户ID
                 is_price_include_tax: this.otherParams.is_price_include_tax,
@@ -3845,7 +3850,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
 
               // 发送下单接口请求开始事件
               startTime = Date.now();
-              _context47.next = 25;
+              _context47.next = 27;
               return this.core.effects.emit(CheckoutHooks.OnOrderSubmitStart, {
                 orderUuid: this.store.currentOrder.uuid,
                 operation: isUpdateOperation ? 'update' : 'create',
@@ -3853,26 +3858,26 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 paymentItemCount: paymentItems.length,
                 timestamp: startTime
               });
-            case 25:
+            case 27:
               submitSuccess = false;
-              _context47.prev = 26;
-              _context47.next = 29;
+              _context47.prev = 28;
+              _context47.next = 31;
               return this.order.createOrderByCheckout(orderParams);
-            case 29:
+            case 31:
               checkoutResponse = _context47.sent;
               submitSuccess = true;
               console.log('[Checkout] 下单接口调用成功');
-              _context47.next = 41;
+              _context47.next = 43;
               break;
-            case 34:
-              _context47.prev = 34;
-              _context47.t1 = _context47["catch"](26);
+            case 36:
+              _context47.prev = 36;
+              _context47.t1 = _context47["catch"](28);
               submitSuccess = false;
               submitError = _context47.t1 instanceof Error ? _context47.t1.message : String(_context47.t1);
               // console.error('[Checkout] 下单接口调用失败:', submitError);
 
               // 发送订单同步失败事件（网络错误或请求失败）
-              _context47.next = 40;
+              _context47.next = 42;
               return this.core.effects.emit(CheckoutHooks.OnOrderSyncFailed, {
                 orderUuid: this.store.currentOrder.uuid,
                 operation: isUpdateOperation ? 'update' : 'create',
@@ -3882,11 +3887,11 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 duration: Date.now() - startTime,
                 timestamp: Date.now()
               });
-            case 40:
+            case 42:
               throw _context47.t1;
-            case 41:
-              _context47.prev = 41;
-              _context47.next = 44;
+            case 43:
+              _context47.prev = 43;
+              _context47.next = 46;
               return this.core.effects.emit(CheckoutHooks.OnOrderSubmitEnd, {
                 success: submitSuccess,
                 orderUuid: this.store.currentOrder.uuid,
@@ -3897,9 +3902,9 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 duration: Date.now() - startTime,
                 timestamp: Date.now()
               });
-            case 44:
-              return _context47.finish(41);
-            case 45:
+            case 46:
+              return _context47.finish(43);
+            case 47:
               console.log('[Checkout] 后端返回的响应数据:', {
                 status: (_checkoutResponse3 = checkoutResponse) === null || _checkoutResponse3 === void 0 ? void 0 : _checkoutResponse3.status,
                 code: (_checkoutResponse4 = checkoutResponse) === null || _checkoutResponse4 === void 0 ? void 0 : _checkoutResponse4.code,
@@ -3911,7 +3916,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               responseStatus = (_checkoutResponse7 = checkoutResponse) === null || _checkoutResponse7 === void 0 ? void 0 : _checkoutResponse7.status;
               isSuccessResponse = responseStatus === true || responseStatus === 200 || responseStatus === 'success' || responseStatus === 1 && ((_checkoutResponse8 = checkoutResponse) === null || _checkoutResponse8 === void 0 ? void 0 : _checkoutResponse8.code) === 200;
               if (isSuccessResponse) {
-                _context47.next = 54;
+                _context47.next = 56;
                 break;
               }
               errorMessage = ((_checkoutResponse9 = checkoutResponse) === null || _checkoutResponse9 === void 0 ? void 0 : _checkoutResponse9.message) || '订单同步失败，后端返回非成功状态';
@@ -3924,7 +3929,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               });
 
               // 发送订单同步失败事件
-              _context47.next = 53;
+              _context47.next = 55;
               return this.core.effects.emit(CheckoutHooks.OnOrderSyncFailed, {
                 orderUuid: this.store.currentOrder.uuid,
                 operation: isUpdateOperation ? 'update' : 'create',
@@ -3935,20 +3940,20 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 duration: Date.now() - startTime,
                 timestamp: Date.now()
               });
-            case 53:
+            case 55:
               throw new Error(errorMessage);
-            case 54:
+            case 56:
               console.log('[Checkout] 响应状态检查通过，开始处理订单数据');
               if (!isUpdateOperation) {
-                _context47.next = 60;
+                _context47.next = 62;
                 break;
               }
               // 更新操作：使用现有的订单ID
               realOrderId = currentOrderId;
               console.log("[Checkout] \u8BA2\u5355\u66F4\u65B0\u6210\u529F\uFF0C\u8BA2\u5355ID: ".concat(realOrderId));
-              _context47.next = 81;
+              _context47.next = 83;
               break;
-            case 60:
+            case 62:
               // 创建操作：从响应中提取新的订单ID
               extractedOrderId = (_checkoutResponse12 = checkoutResponse) === null || _checkoutResponse12 === void 0 || (_checkoutResponse12 = _checkoutResponse12.data) === null || _checkoutResponse12 === void 0 ? void 0 : _checkoutResponse12.order_id; // 如果data.order_id不存在，尝试直接从根级获取
               if (!extractedOrderId) {
@@ -3960,11 +3965,11 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 extractedOrderId = String(extractedOrderId);
               }
               if (extractedOrderId) {
-                _context47.next = 65;
+                _context47.next = 67;
                 break;
               }
               throw new Error('后端返回的订单信息中未包含订单ID');
-            case 65:
+            case 67:
               realOrderId = extractedOrderId;
               console.log('[Checkout] 订单创建成功，真实订单ID:', realOrderId);
 
@@ -3974,10 +3979,10 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 oldOrderId: this.store.currentOrder.order_id,
                 newOrderId: realOrderId
               });
-              _context47.prev = 68;
-              _context47.next = 71;
+              _context47.prev = 70;
+              _context47.next = 73;
               return this.payment.replaceOrderIdByUuidAsync(this.store.currentOrder.uuid, realOrderId);
-            case 71:
+            case 73:
               updatedOrder = _context47.sent;
               console.log('[Checkout] Payment模块替换订单ID结果:', {
                 wasSuccessful: !!updatedOrder,
@@ -4004,22 +4009,22 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   目标ID: realOrderId
                 });
               }
-              _context47.next = 81;
+              _context47.next = 83;
               break;
-            case 76:
-              _context47.prev = 76;
-              _context47.t2 = _context47["catch"](68);
+            case 78:
+              _context47.prev = 78;
+              _context47.t2 = _context47["catch"](70);
               console.error('[Checkout] 调用Payment模块替换订单ID时发生错误:', _context47.t2);
 
               // 发生错误时也进行手动替换
               this.store.currentOrder.order_id = realOrderId;
               console.log('[Checkout] 错误恢复：手动设置订单ID:', realOrderId);
-            case 81:
+            case 83:
               // 标记订单已同步
               this.store.isOrderSynced = true;
 
               // 触发订单同步完成事件
-              _context47.next = 84;
+              _context47.next = 86;
               return this.core.effects.emit(CheckoutHooks.OnOrderSynced, {
                 orderUuid: this.store.currentOrder.uuid,
                 realOrderId: realOrderId,
@@ -4028,7 +4033,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 isManual: isManual,
                 response: checkoutResponse
               });
-            case 84:
+            case 86:
               // 验证最终状态
               finalOrderId = this.store.currentOrder.order_id;
               finalIsVirtual = this.isVirtualOrderId(finalOrderId || '');
@@ -4046,11 +4051,11 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
 
               // 返回真实订单ID
               return _context47.abrupt("return", realOrderId);
-            case 89:
+            case 91:
             case "end":
               return _context47.stop();
           }
-        }, _callee47, this, [[26, 34, 41, 45], [68, 76]]);
+        }, _callee47, this, [[28, 36, 43, 47], [70, 78]]);
       }));
       function syncOrderToBackendWithReturn() {
         return _syncOrderToBackendWithReturn.apply(this, arguments);

package/lib/solution/BookingByStep/index.d.ts

@@ -314,7 +314,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     }[];
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
+    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/lib/solution/Checkout/index.js

@@ -1566,38 +1566,16 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       const allPaymentItems = await this.payment.getPaymentItemsAsync(
         this.store.currentOrder.uuid
       );
-      const filteredPaymentItems = allPaymentItems.filter(
-        (payment) => !payment.voucher_id
-      );
-      const voucherItems = allPaymentItems.filter(
-        (payment) => payment.voucher_id
-      );
-      console.log("[Checkout] 支付项过滤结果:", {
-        总支付项: allPaymentItems.length,
-        过滤后支付项: filteredPaymentItems.length,
-        被过滤的代金券项: voucherItems.length,
-        代金券详情: voucherItems.map((item) => ({
-          uuid: item.uuid,
-          code: item.code,
-          amount: item.amount,
-          voucherId: item.voucher_id
-        })),
-        保留的支付项: filteredPaymentItems.map((item) => ({
-          uuid: item.uuid,
-          code: item.code,
-          amount: item.amount
-        }))
-      });
       const realOrderId = await this.syncOrderToBackendWithReturn(
         false,
-        filteredPaymentItems
+        allPaymentItems
       );
       console.log("[Checkout] 保存订单完成:", {
         orderUuid,
         oldOrderId: currentOrderId,
         realOrderId,
         isOrderSynced: this.store.isOrderSynced,
-        filteredPaymentsCount: filteredPaymentItems.length
+        filteredPaymentsCount: allPaymentItems.length
       });
       const finalOrderId = this.store.currentOrder.order_id;
       console.log("[Checkout] saveForLaterPaymentAsync 最终状态验证:", {
@@ -2236,7 +2214,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
    * @returns 后端返回的真实订单ID
    */
   async syncOrderToBackendWithReturn(isManual = false, customPaymentItems) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     if (!this.store.localOrderData || !this.store.currentOrder) {
       throw new Error("缺少必要的订单数据，无法同步到后端");
     }
@@ -2290,13 +2268,34 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         };
       })
     });
+    const processedPaymentItems = paymentItems.map((item) => {
+      var _a2, _b2;
+      return {
+        ...item,
+        metadata: {
+          ...item.metadata,
+          rounding_rule: ((_a2 = item.metadata) == null ? void 0 : _a2.rounding_rule) || this.otherParams.order_rounding_setting,
+          shop_wallet_pass_id: ((_b2 = item.metadata) == null ? void 0 : _b2.shop_wallet_pass_id) || this.otherParams.shop_wallet_pass_id
+        }
+      };
+    });
+    console.log("[Checkout] 处理后的支付项数据（包含完整metadata）:", {
+      originalCount: paymentItems.length,
+      processedCount: processedPaymentItems.length,
+      sampleMetadata: (_a = processedPaymentItems[0]) == null ? void 0 : _a.metadata,
+      allPaymentItems: processedPaymentItems.map((p) => ({
+        code: p.code,
+        amount: p.amount,
+        metadata: p.metadata
+      }))
+    });
     const orderParams = {
       ...this.store.localOrderData,
       type: this.store.localOrderData.type,
       platform: this.store.localOrderData.platform,
-      payments: paymentItems,
-      // 添加支付项
-      customer_id: (_a = this.store.currentCustomer) == null ? void 0 : _a.customer_id,
+      payments: processedPaymentItems,
+      // 使用处理过的支付项数据
+      customer_id: (_b = this.store.currentCustomer) == null ? void 0 : _b.customer_id,
       // 添加客户ID
       is_price_include_tax: this.otherParams.is_price_include_tax,
       // core 有
@@ -2309,8 +2308,8 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       currency_code: this.otherParams.currency_code,
       currency_symbol: this.otherParams.currency_symbol,
       currency_format: this.otherParams.currency_format,
-      is_deposit: ((_b = this.store.currentOrder) == null ? void 0 : _b.is_deposit) || 0,
-      deposit_amount: ((_c = this.store.currentOrder) == null ? void 0 : _c.deposit_amount) || "0.00",
+      is_deposit: ((_c = this.store.currentOrder) == null ? void 0 : _c.is_deposit) || 0,
+      deposit_amount: ((_d = this.store.currentOrder) == null ? void 0 : _d.deposit_amount) || "0.00",
       // surcharge_fee: this.otherParams.surcharge_fee,
       // surcharges: ,
       note: this.store.localOrderData.shop_note
@@ -2372,7 +2371,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         orderUuid: this.store.currentOrder.uuid,
         operation: isUpdateOperation ? "update" : "create",
         isManual,
-        orderId: submitSuccess ? ((_d = checkoutResponse == null ? void 0 : checkoutResponse.data) == null ? void 0 : _d.order_id) || (checkoutResponse == null ? void 0 : checkoutResponse.order_id) : void 0,
+        orderId: submitSuccess ? ((_e = checkoutResponse == null ? void 0 : checkoutResponse.data) == null ? void 0 : _e.order_id) || (checkoutResponse == null ? void 0 : checkoutResponse.order_id) : void 0,
         error: submitError,
         duration: Date.now() - startTime,
         timestamp: Date.now()
@@ -2413,7 +2412,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       realOrderId = currentOrderId;
       console.log(`[Checkout] 订单更新成功，订单ID: ${realOrderId}`);
     } else {
-      let extractedOrderId = (_e = checkoutResponse == null ? void 0 : checkoutResponse.data) == null ? void 0 : _e.order_id;
+      let extractedOrderId = (_f = checkoutResponse == null ? void 0 : checkoutResponse.data) == null ? void 0 : _f.order_id;
       if (!extractedOrderId) {
         extractedOrderId = checkoutResponse == null ? void 0 : checkoutResponse.order_id;
       }

package/package.json

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