@pisell/pisellos 0.0.258 → 0.0.260

package/dist/modules/Payment/walletpass.js

@@ -406,9 +406,8 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
               });
 
               // 检查识别码是否为9位且前3位为"000"
-              // const isWalletCode = code.length === 9 && code.startsWith('000');
-              // 测试环境先使用 WL
-              isWalletCode = code.startsWith('WL');
+              isWalletCode = code.length === 9 && code.startsWith('000'); // 测试环境先使用 WL
+              // const isWalletCode = code.startsWith('WL');
               if (!isWalletCode) {
                 _context5.next = 14;
                 break;

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/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

@@ -1099,9 +1099,10 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               return this.updateStateAmountToRemaining();
             case 31:
               _context15.next = 33;
-              return this.core.effects.emit(CheckoutHooks.OnPaymentStarted, {
+              return this.core.effects.emit(CheckoutHooks.OnPaymentItemAdded, {
                 orderUuid: this.store.currentOrder.uuid,
                 paymentMethodCode: paymentItem.code,
+                paymentMethodName: paymentItem.name,
                 amount: String(paymentItem.amount),
                 timestamp: Date.now()
               });
@@ -1743,7 +1744,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
             case 8:
               allPaymentItems = _context21.sent;
               _context21.next = 11;
-              return this.syncOrderToBackendWithReturn(false, allPaymentItems);
+              return this.syncOrderToBackendWithReturn(true, allPaymentItems);
             case 11:
               syncResult = _context21.sent;
               this.logInfo('保存订单完成:', {
@@ -2673,8 +2674,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _syncOrderToBackendWithReturn = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34() {
         var _this4 = this,
-          _this$store$currentCu2,
           _this$store$currentOr17,
+          _this$store$currentCu2,
           _this$store$currentOr18,
           _checkoutResponse3,
           _checkoutResponse4;
@@ -2684,6 +2685,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
           isUpdateOperation,
           paymentItems,
           processedPaymentItems,
+          depositPaymentItems,
+          calculatedDepositAmount,
           orderParams,
           startTime,
           checkoutResponse,
@@ -2747,7 +2750,34 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                     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
                   })
                 });
-              }); // 构造订单参数，直接使用 localOrderData 中已处理好的数据
+              }); // 计算定金支付项的总金额（order_payment_type="deposit"）
+              depositPaymentItems = processedPaymentItems.filter(function (item) {
+                return item.order_payment_type === 'deposit' && item.status !== 'voided';
+              });
+              calculatedDepositAmount = depositPaymentItems.reduce(function (sum, item) {
+                var amount = new Decimal(item.amount || '0');
+                var roundingAmount = new Decimal(item.rounding_amount || '0');
+                // 包含抹零计算的有效支付金额
+                var effectiveAmount = amount.add(roundingAmount.abs());
+                return sum.add(effectiveAmount);
+              }, new Decimal(0)).toFixed(2);
+              this.logInfo('计算定金支付项总金额', {
+                depositPaymentItemsCount: depositPaymentItems.length,
+                depositPaymentItems: depositPaymentItems.map(function (item) {
+                  return {
+                    uuid: item.uuid,
+                    code: item.code,
+                    amount: item.amount,
+                    rounding_amount: item.rounding_amount,
+                    order_payment_type: item.order_payment_type,
+                    status: item.status
+                  };
+                }),
+                calculatedDepositAmount: calculatedDepositAmount,
+                originalDepositAmount: ((_this$store$currentOr17 = this.store.currentOrder) === null || _this$store$currentOr17 === void 0 ? void 0 : _this$store$currentOr17.deposit_amount) || '0.00'
+              });
+
+              // 构造订单参数，直接使用 localOrderData 中已处理好的数据
               orderParams = _objectSpread(_objectSpread({}, this.store.localOrderData), {}, {
                 type: this.store.localOrderData.type,
                 platform: this.store.localOrderData.platform,
@@ -2766,8 +2796,9 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 currency_code: this.otherParams.currency_code,
                 currency_symbol: this.otherParams.currency_symbol,
                 currency_format: this.otherParams.currency_format,
-                is_deposit: ((_this$store$currentOr17 = this.store.currentOrder) === null || _this$store$currentOr17 === void 0 ? void 0 : _this$store$currentOr17.is_deposit) || 0,
-                deposit_amount: ((_this$store$currentOr18 = this.store.currentOrder) === null || _this$store$currentOr18 === void 0 ? void 0 : _this$store$currentOr18.deposit_amount) || '0.00',
+                is_deposit: ((_this$store$currentOr18 = this.store.currentOrder) === null || _this$store$currentOr18 === void 0 ? void 0 : _this$store$currentOr18.is_deposit) || 0,
+                deposit_amount: calculatedDepositAmount,
+                // 使用从支付项中计算出的定金金额
                 product_tax_fee: this.store.localOrderData.tax_fee,
                 note: this.store.localOrderData.shop_note
               }); // 如果是更新操作，需要在参数中包含真实的订单ID
@@ -2782,7 +2813,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
 
               // 发送下单接口请求开始事件
               startTime = Date.now();
-              _context34.next = 20;
+              _context34.next = 23;
               return this.core.effects.emit(CheckoutHooks.OnOrderSubmitStart, {
                 orderUuid: this.store.currentOrder.uuid,
                 operation: isUpdateOperation ? 'update' : 'create',
@@ -2790,9 +2821,9 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 paymentItemCount: paymentItems.length,
                 timestamp: startTime
               });
-            case 20:
+            case 23:
               submitSuccess = false;
-              _context34.prev = 21;
+              _context34.prev = 24;
               // 记录接口调用参数
               this.logInfo('Calling backend checkout API', _objectSpread({
                 url: '/order/checkout',
@@ -2800,23 +2831,23 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               }, orderParams));
 
               // 调用 Order 模块的专用 createOrderByCheckout 方法
-              _context34.next = 25;
+              _context34.next = 28;
               return this.order.createOrderByCheckout(orderParams);
-            case 25:
+            case 28:
               checkoutResponse = _context34.sent;
               submitSuccess = true;
               this.logInfo('下单接口调用成功', checkoutResponse);
-              _context34.next = 38;
+              _context34.next = 41;
               break;
-            case 30:
-              _context34.prev = 30;
-              _context34.t1 = _context34["catch"](21);
+            case 33:
+              _context34.prev = 33;
+              _context34.t1 = _context34["catch"](24);
               submitSuccess = false;
               submitError = _context34.t1 instanceof Error ? _context34.t1.message : String(_context34.t1);
               this.logError('下单接口调用失败:', submitError);
 
               // 发送订单同步失败事件（网络错误或请求失败）
-              _context34.next = 37;
+              _context34.next = 40;
               return this.core.effects.emit(CheckoutHooks.OnOrderSyncFailed, {
                 orderUuid: this.store.currentOrder.uuid,
                 operation: isUpdateOperation ? 'update' : 'create',
@@ -2826,11 +2857,11 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 duration: Date.now() - startTime,
                 timestamp: Date.now()
               });
-            case 37:
+            case 40:
               throw _context34.t1;
-            case 38:
-              _context34.prev = 38;
-              _context34.next = 41;
+            case 41:
+              _context34.prev = 41;
+              _context34.next = 44;
               return this.core.effects.emit(CheckoutHooks.OnOrderSubmitEnd, {
                 success: submitSuccess,
                 orderUuid: this.store.currentOrder.uuid,
@@ -2841,18 +2872,18 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 duration: Date.now() - startTime,
                 timestamp: Date.now()
               });
-            case 41:
-              return _context34.finish(38);
-            case 42:
+            case 44:
+              return _context34.finish(41);
+            case 45:
               // 检查响应状态是否为成功状态
               responseStatus = (_checkoutResponse3 = checkoutResponse) === null || _checkoutResponse3 === void 0 ? void 0 : _checkoutResponse3.status;
               isSuccessResponse = responseStatus === true || responseStatus === 200 || responseStatus === 'success' || responseStatus === 1 && ((_checkoutResponse4 = checkoutResponse) === null || _checkoutResponse4 === void 0 ? void 0 : _checkoutResponse4.code) === 200;
               if (isSuccessResponse) {
-                _context34.next = 49;
+                _context34.next = 52;
                 break;
               }
               errorMessage = ((_checkoutResponse5 = checkoutResponse) === null || _checkoutResponse5 === void 0 ? void 0 : _checkoutResponse5.message) || '订单同步失败，后端返回非成功状态'; // 发送订单同步失败事件
-              _context34.next = 48;
+              _context34.next = 51;
               return this.core.effects.emit(CheckoutHooks.OnOrderSyncFailed, {
                 orderUuid: this.store.currentOrder.uuid,
                 operation: isUpdateOperation ? 'update' : 'create',
@@ -2863,18 +2894,18 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 duration: Date.now() - startTime,
                 timestamp: Date.now()
               });
-            case 48:
+            case 51:
               throw new Error(errorMessage);
-            case 49:
+            case 52:
               if (!isUpdateOperation) {
-                _context34.next = 53;
+                _context34.next = 56;
                 break;
               }
               // 更新操作：使用现有的订单ID
               realOrderId = currentOrderId;
-              _context34.next = 72;
+              _context34.next = 75;
               break;
-            case 53:
+            case 56:
               // 创建操作：从响应中提取新的订单ID
               extractedOrderId = (_checkoutResponse6 = checkoutResponse) === null || _checkoutResponse6 === void 0 || (_checkoutResponse6 = _checkoutResponse6.data) === null || _checkoutResponse6 === void 0 ? void 0 : _checkoutResponse6.order_id; // 如果data.order_id不存在，尝试直接从根级获取
               if (!extractedOrderId) {
@@ -2896,10 +2927,10 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 oldOrderId: this.store.currentOrder.order_id,
                 newOrderId: realOrderId
               });
-              _context34.prev = 59;
-              _context34.next = 62;
+              _context34.prev = 62;
+              _context34.next = 65;
               return this.payment.replaceOrderIdByUuidAsync(this.store.currentOrder.uuid, realOrderId);
-            case 62:
+            case 65:
               updatedOrder = _context34.sent;
               this.logInfo('Payment模块替换订单ID结果:', {
                 wasSuccessful: !!updatedOrder,
@@ -2926,22 +2957,22 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   目标ID: realOrderId
                 });
               }
-              _context34.next = 72;
+              _context34.next = 75;
               break;
-            case 67:
-              _context34.prev = 67;
-              _context34.t2 = _context34["catch"](59);
+            case 70:
+              _context34.prev = 70;
+              _context34.t2 = _context34["catch"](62);
               this.logError('调用Payment模块替换订单ID时发生错误:', _context34.t2);
 
               // 发生错误时也进行手动替换
               this.store.currentOrder.order_id = realOrderId;
               this.logInfo('错误恢复：手动设置订单ID:', realOrderId);
-            case 72:
+            case 75:
               // 标记订单已同步
               this.store.isOrderSynced = true;
 
               // 触发订单同步完成事件
-              _context34.next = 75;
+              _context34.next = 78;
               return this.core.effects.emit(CheckoutHooks.OnOrderSynced, {
                 orderUuid: this.store.currentOrder.uuid,
                 realOrderId: realOrderId,
@@ -2950,18 +2981,18 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 isManual: isManual,
                 response: checkoutResponse
               });
-            case 75:
+            case 78:
               return _context34.abrupt("return", {
                 success: true,
                 orderId: realOrderId,
                 orderUuid: this.store.currentOrder.uuid,
                 response: checkoutResponse
               });
-            case 76:
+            case 79:
             case "end":
               return _context34.stop();
           }
-        }, _callee34, this, [[21, 30, 38, 42], [59, 67]]);
+        }, _callee34, this, [[24, 33, 41, 45], [62, 70]]);
       }));
       function syncOrderToBackendWithReturn() {
         return _syncOrderToBackendWithReturn.apply(this, arguments);

package/dist/solution/Checkout/types.d.ts

@@ -300,7 +300,9 @@ export declare enum CheckoutHooks {
     /** 下单接口请求完成 */
     OnOrderSubmitEnd = "checkout:onOrderSubmitEnd",
     /** 钱包数据初始化完成 */
-    OnWalletDataInitialized = "checkout:onWalletDataInitialized"
+    OnWalletDataInitialized = "checkout:onWalletDataInitialized",
+    /** 支付项添加成功 */
+    OnPaymentItemAdded = "checkout:onPaymentItemAdded"
 }
 /**
  * 结账状态数据

package/dist/solution/Checkout/types.js

@@ -75,6 +75,7 @@ export var CheckoutHooks = /*#__PURE__*/function (CheckoutHooks) {
   CheckoutHooks["OnOrderSubmitStart"] = "checkout:onOrderSubmitStart";
   CheckoutHooks["OnOrderSubmitEnd"] = "checkout:onOrderSubmitEnd";
   CheckoutHooks["OnWalletDataInitialized"] = "checkout:onWalletDataInitialized";
+  CheckoutHooks["OnPaymentItemAdded"] = "checkout:onPaymentItemAdded";
   return CheckoutHooks;
 }({});
 

package/lib/modules/Payment/walletpass.js

@@ -268,7 +268,7 @@ var WalletPassPaymentImpl = class {
         code_length: code.length,
         noCache: config.noCache || false
       });
-      const isWalletCode = code.startsWith("WL");
+      const isWalletCode = code.length === 9 && code.startsWith("000");
       if (isWalletCode) {
         const walletDetailParams = {
           code,

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/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

@@ -665,9 +665,10 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         }
       }
       await this.updateStateAmountToRemaining();
-      await this.core.effects.emit(import_types.CheckoutHooks.OnPaymentStarted, {
+      await this.core.effects.emit(import_types.CheckoutHooks.OnPaymentItemAdded, {
         orderUuid: this.store.currentOrder.uuid,
         paymentMethodCode: paymentItem.code,
+        paymentMethodName: paymentItem.name,
         amount: String(paymentItem.amount),
         timestamp: Date.now()
       });
@@ -1103,7 +1104,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         this.store.currentOrder.uuid
       );
       const syncResult = await this.syncOrderToBackendWithReturn(
-        false,
+        true,
         allPaymentItems
       );
       this.logInfo("保存订单完成:", {
@@ -1636,13 +1637,35 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         }
       };
     });
+    const depositPaymentItems = processedPaymentItems.filter(
+      (item) => item.order_payment_type === "deposit" && item.status !== "voided"
+    );
+    const calculatedDepositAmount = depositPaymentItems.reduce((sum, item) => {
+      const amount = new import_decimal.default(item.amount || "0");
+      const roundingAmount = new import_decimal.default(item.rounding_amount || "0");
+      const effectiveAmount = amount.add(roundingAmount.abs());
+      return sum.add(effectiveAmount);
+    }, new import_decimal.default(0)).toFixed(2);
+    this.logInfo("计算定金支付项总金额", {
+      depositPaymentItemsCount: depositPaymentItems.length,
+      depositPaymentItems: depositPaymentItems.map((item) => ({
+        uuid: item.uuid,
+        code: item.code,
+        amount: item.amount,
+        rounding_amount: item.rounding_amount,
+        order_payment_type: item.order_payment_type,
+        status: item.status
+      })),
+      calculatedDepositAmount,
+      originalDepositAmount: ((_a = this.store.currentOrder) == null ? void 0 : _a.deposit_amount) || "0.00"
+    });
     const orderParams = {
       ...this.store.localOrderData,
       type: this.store.localOrderData.type,
       platform: this.store.localOrderData.platform,
       payments: processedPaymentItems,
       // 使用处理过的支付项数据
-      customer_id: (_a = this.store.currentCustomer) == null ? void 0 : _a.customer_id,
+      customer_id: (_b = this.store.currentCustomer) == null ? void 0 : _b.customer_id,
       // 添加客户ID
       is_price_include_tax: this.otherParams.is_price_include_tax,
       // core 有
@@ -1655,8 +1678,9 @@ 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: calculatedDepositAmount,
+      // 使用从支付项中计算出的定金金额
       product_tax_fee: this.store.localOrderData.tax_fee,
       note: this.store.localOrderData.shop_note
     };

package/lib/solution/Checkout/types.d.ts

@@ -300,7 +300,9 @@ export declare enum CheckoutHooks {
     /** 下单接口请求完成 */
     OnOrderSubmitEnd = "checkout:onOrderSubmitEnd",
     /** 钱包数据初始化完成 */
-    OnWalletDataInitialized = "checkout:onWalletDataInitialized"
+    OnWalletDataInitialized = "checkout:onWalletDataInitialized",
+    /** 支付项添加成功 */
+    OnPaymentItemAdded = "checkout:onPaymentItemAdded"
 }
 /**
  * 结账状态数据

package/lib/solution/Checkout/types.js

@@ -53,6 +53,7 @@ var CheckoutHooks = /* @__PURE__ */ ((CheckoutHooks2) => {
   CheckoutHooks2["OnOrderSubmitStart"] = "checkout:onOrderSubmitStart";
   CheckoutHooks2["OnOrderSubmitEnd"] = "checkout:onOrderSubmitEnd";
   CheckoutHooks2["OnWalletDataInitialized"] = "checkout:onWalletDataInitialized";
+  CheckoutHooks2["OnPaymentItemAdded"] = "checkout:onPaymentItemAdded";
   return CheckoutHooks2;
 })(CheckoutHooks || {});
 // Annotate the CommonJS export names for ESM import in node:

package/package.json

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