@pisell/pisellos 0.0.409 → 0.0.411

package/dist/modules/Summary/utils.js

@@ -3,12 +3,12 @@ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArra
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -153,7 +153,12 @@ export var getTax = function getTax(_ref, options) {
   if (service || addons) {
     // 处理服务商品
     if (service !== null && service !== void 0 && service.length) {
-      var serviceResult = processItemsTax(service, {
+      var serviceResult = processItemsTax(service.map(function (item) {
+        return _objectSpread(_objectSpread({}, item), {}, {
+          option: (item === null || item === void 0 ? void 0 : item.option) || (item === null || item === void 0 ? void 0 : item.options) || [],
+          bundle: (item === null || item === void 0 ? void 0 : item.bundle) || (item === null || item === void 0 ? void 0 : item.bundles) || []
+        });
+      }), {
         bookingDetail: bookingDetail,
         bookingId: bookingId
       }, {
@@ -222,7 +227,10 @@ var processItemsTax = function processItemsTax(items, _ref2, options) {
       var item = _step.value;
       var quantity = new Decimal(item.num || 1);
       var unitPrice = new Decimal(item.total || 0);
-      var mainProductPrice = new Decimal(getMainProductTotal(item) || 0);
+      var mainProductPrice = new Decimal(getMainProductTotal(_objectSpread(_objectSpread({}, item), {}, {
+        option: (item === null || item === void 0 ? void 0 : item.option) || (item === null || item === void 0 ? void 0 : item.options) || [],
+        bundle: (item === null || item === void 0 ? void 0 : item.bundle) || (item === null || item === void 0 ? void 0 : item.bundles) || []
+      })) || 0);
 
       // 计算原始税费（折扣前）- 单个商品（精确值）
       var originalTaxPerItemPrecise = getProductItemTax(_objectSpread(_objectSpread({}, item), {}, {
@@ -895,7 +903,10 @@ export var getSurcharge = function getSurcharge(_ref10, options) {
             isInScheduleByDate: isInScheduleByDate
           })) {
             // 主商品加价减价后的总价
-            var total = getMainProductTotal(item);
+            var total = getMainProductTotal(_objectSpread(_objectSpread({}, item), {}, {
+              option: (item === null || item === void 0 ? void 0 : item.option) || (item === null || item === void 0 ? void 0 : item.options) || [],
+              bundle: (item === null || item === void 0 ? void 0 : item.bundle) || (item === null || item === void 0 ? void 0 : item.bundles) || []
+            }));
             var mainQuantity = item.num || 1;
             matchedItems.push({
               total: total,

package/dist/solution/Checkout/index.js

@@ -1239,7 +1239,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "replaceLocalOrderIdAsync",
     value: (function () {
       var _replaceLocalOrderIdAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(newOrderId) {
-        var updatedOrder;
+        var previousOrder, latestPaymentStatus, updatedOrder;
         return _regeneratorRuntime().wrap(function _callee13$(_context13) {
           while (1) switch (_context13.prev = _context13.next) {
             case 0:
@@ -1251,24 +1251,38 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               console.warn('[Checkout] 没有当前订单，无法替换订单ID');
               return _context13.abrupt("return", null);
             case 4:
-              _context13.next = 6;
-              return this.payment.replaceOrderIdByUuidAsync(this.store.currentOrder.uuid, newOrderId);
-            case 6:
+              previousOrder = this.store.currentOrder;
+              latestPaymentStatus = previousOrder.payment_status;
+              _context13.next = 8;
+              return this.payment.replaceOrderIdByUuidAsync(previousOrder.uuid, newOrderId);
+            case 8:
               updatedOrder = _context13.sent;
               if (!updatedOrder) {
-                _context13.next = 15;
+                _context13.next = 20;
                 break;
               }
-              // 更新当前订单引用
-              this.store.currentOrder = updatedOrder;
+              // 🔧 重要：Payment.replaceOrderIdByUuidAsync 返回的是 DB 快照（只保证 order_id 变化）
+              // 这里需要合并到内存态，避免覆盖掉刚刚从后端拿到的 payment_status 等字段
+              this.store.currentOrder = _objectSpread(_objectSpread(_objectSpread({}, previousOrder), updatedOrder), {}, {
+                payment_status: latestPaymentStatus
+              });
 
-              // 触发订单更新事件
-              _context13.next = 11;
+              // 同步更新 Payment 模块 DB，避免后续再次从 DB 读回旧的 payment_status
+              if (!latestPaymentStatus) {
+                _context13.next = 14;
+                break;
+              }
+              _context13.next = 14;
+              return this.payment.updateOrderAsync(previousOrder.uuid, {
+                payment_status: latestPaymentStatus
+              });
+            case 14:
+              _context13.next = 16;
               return this.core.effects.emit("".concat(this.name, ":onOrderCreated"), {
                 order: updatedOrder,
                 timestamp: Date.now()
               });
-            case 11:
+            case 16:
               console.log('[Checkout] 本地订单ID替换成功:', {
                 uuid: updatedOrder.uuid,
                 newOrderId: updatedOrder.id
@@ -1278,23 +1292,23 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               this.store.isOrderSynced = true;
 
               // 订单ID替换后更新 stateAmount
-              _context13.next = 15;
+              _context13.next = 20;
               return this.updateStateAmountToRemaining(false);
-            case 15:
+            case 20:
               return _context13.abrupt("return", updatedOrder);
-            case 18:
-              _context13.prev = 18;
+            case 23:
+              _context13.prev = 23;
               _context13.t0 = _context13["catch"](0);
               console.error('[Checkout] 替换订单ID失败:', _context13.t0);
-              _context13.next = 23;
+              _context13.next = 28;
               return this.handleError(_context13.t0, CheckoutErrorType.UnknownError);
-            case 23:
+            case 28:
               return _context13.abrupt("return", null);
-            case 24:
+            case 29:
             case "end":
               return _context13.stop();
           }
-        }, _callee13, this, [[0, 18]]);
+        }, _callee13, this, [[0, 23]]);
       }));
       function replaceLocalOrderIdAsync(_x13) {
         return _replaceLocalOrderIdAsync.apply(this, arguments);
@@ -3782,6 +3796,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
           _checkoutResponse6,
           extractedOrderId,
           _checkoutResponse7,
+          latestPaymentStatus,
+          previousOrder,
           updatedOrder,
           beforeManualUpdate,
           syncedPaymentUuids,
@@ -4065,7 +4081,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               }
               // 更新操作：使用现有的订单ID
               realOrderId = currentOrderId;
-              _context39.next = 83;
+              _context39.next = 97;
               break;
             case 64:
               // 创建操作：从响应中提取新的订单ID
@@ -4090,90 +4106,112 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 newOrderId: realOrderId
               });
               _context39.prev = 70;
-              _context39.next = 73;
-              return this.payment.replaceOrderIdByUuidAsync(this.store.currentOrder.uuid, realOrderId);
-            case 73:
+              latestPaymentStatus = this.store.currentOrder.payment_status;
+              previousOrder = this.store.currentOrder;
+              _context39.next = 75;
+              return this.payment.replaceOrderIdByUuidAsync(previousOrder.uuid, realOrderId);
+            case 75:
               updatedOrder = _context39.sent;
               this.logInfo('Payment模块替换订单ID结果:', {
                 wasSuccessful: !!updatedOrder,
                 returnedOrderId: updatedOrder === null || updatedOrder === void 0 ? void 0 : updatedOrder.order_id,
                 expectedOrderId: realOrderId
               });
-              if (updatedOrder) {
-                this.logInfo('Payment模块返回的更新后订单:', {
-                  uuid: updatedOrder.uuid,
-                  orderId: updatedOrder.order_id,
-                  totalAmount: updatedOrder.total_amount
-                });
-                this.store.currentOrder = updatedOrder;
-                this.logInfo('[Checkout] 订单ID替换成功，当前订单ID:', this.store.currentOrder.order_id);
-              } else {
-                this.logError('[Checkout] Payment模块返回空订单，订单ID替换失败，开始手动替换');
+              if (!updatedOrder) {
+                _context39.next = 86;
+                break;
+              }
+              this.logInfo('Payment模块返回的更新后订单:', {
+                uuid: updatedOrder.uuid,
+                orderId: updatedOrder.order_id,
+                totalAmount: updatedOrder.total_amount
+              });
 
-                // 如果替换失败，手动更新订单ID
-                beforeManualUpdate = this.store.currentOrder.order_id;
-                this.store.currentOrder.order_id = realOrderId;
-                this.logInfo('手动设置订单ID:', {
-                  beforeReplacement: beforeManualUpdate,
-                  afterReplacement: this.store.currentOrder.order_id,
-                  目标ID: realOrderId
-                });
+              // 🔧 合并 DB 快照到内存态，避免覆盖 payment_status（以及其它刚更新过的内存字段）
+              this.store.currentOrder = _objectSpread(_objectSpread(_objectSpread({}, previousOrder), updatedOrder), {}, {
+                payment_status: latestPaymentStatus
+              });
+
+              // 同步更新 Payment 模块 DB，避免后续读取 DB 时又拿回旧状态
+              if (!latestPaymentStatus) {
+                _context39.next = 83;
+                break;
               }
               _context39.next = 83;
+              return this.payment.updateOrderAsync(previousOrder.uuid, {
+                payment_status: latestPaymentStatus
+              });
+            case 83:
+              this.logInfo('[Checkout] 订单ID替换成功，当前订单ID:', this.store.currentOrder.order_id);
+              _context39.next = 90;
               break;
-            case 78:
-              _context39.prev = 78;
+            case 86:
+              this.logError('[Checkout] Payment模块返回空订单，订单ID替换失败，开始手动替换');
+
+              // 如果替换失败，手动更新订单ID
+              beforeManualUpdate = this.store.currentOrder.order_id;
+              this.store.currentOrder.order_id = realOrderId;
+              this.logInfo('手动设置订单ID:', {
+                beforeReplacement: beforeManualUpdate,
+                afterReplacement: this.store.currentOrder.order_id,
+                目标ID: realOrderId
+              });
+            case 90:
+              _context39.next = 97;
+              break;
+            case 92:
+              _context39.prev = 92;
               _context39.t2 = _context39["catch"](70);
               this.logError('调用Payment模块替换订单ID时发生错误:', _context39.t2);
 
               // 发生错误时也进行手动替换
               this.store.currentOrder.order_id = realOrderId;
               this.logInfo('错误恢复：手动设置订单ID:', realOrderId);
-            case 83:
-              _context39.prev = 83;
+            case 97:
+              _context39.prev = 97;
               syncedPaymentUuids = processedPaymentItems.filter(function (item) {
                 return item.status !== 'voided';
               }).map(function (item) {
                 return item.uuid;
               }).filter(Boolean);
               _iterator3 = _createForOfIteratorHelper(syncedPaymentUuids);
-              _context39.prev = 86;
+              _context39.prev = 100;
               _iterator3.s();
-            case 88:
+            case 102:
               if ((_step3 = _iterator3.n()).done) {
-                _context39.next = 94;
+                _context39.next = 108;
                 break;
               }
               paymentUuid = _step3.value;
-              _context39.next = 92;
+              _context39.next = 106;
               return this.payment.updatePaymentAsync(this.store.currentOrder.uuid, paymentUuid, {
                 isSynced: true,
                 syncError: undefined
               });
-            case 92:
-              _context39.next = 88;
+            case 106:
+              _context39.next = 102;
               break;
-            case 94:
-              _context39.next = 99;
+            case 108:
+              _context39.next = 113;
               break;
-            case 96:
-              _context39.prev = 96;
-              _context39.t3 = _context39["catch"](86);
+            case 110:
+              _context39.prev = 110;
+              _context39.t3 = _context39["catch"](100);
               _iterator3.e(_context39.t3);
-            case 99:
-              _context39.prev = 99;
+            case 113:
+              _context39.prev = 113;
               _iterator3.f();
-              return _context39.finish(99);
-            case 102:
-              _context39.next = 107;
+              return _context39.finish(113);
+            case 116:
+              _context39.next = 121;
               break;
-            case 104:
-              _context39.prev = 104;
-              _context39.t4 = _context39["catch"](83);
+            case 118:
+              _context39.prev = 118;
+              _context39.t4 = _context39["catch"](97);
               this.logWarning('标记支付项已同步失败（不阻塞主流程）', {
                 error: _context39.t4
               });
-            case 107:
+            case 121:
               // 标记订单已同步
               this.store.isOrderSynced = true;
 
@@ -4181,7 +4219,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               this.clearCalculationCache();
 
               // 触发订单同步完成事件
-              _context39.next = 111;
+              _context39.next = 125;
               return this.core.effects.emit("".concat(this.name, ":onOrderSynced"), {
                 orderUuid: this.store.currentOrder.uuid,
                 realOrderId: realOrderId,
@@ -4190,18 +4228,18 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 isManual: isManual,
                 response: checkoutResponse
               });
-            case 111:
+            case 125:
               return _context39.abrupt("return", {
                 success: true,
                 orderId: realOrderId,
                 orderUuid: this.store.currentOrder.uuid,
                 response: checkoutResponse
               });
-            case 112:
+            case 126:
             case "end":
               return _context39.stop();
           }
-        }, _callee39, this, [[31, 41, 49, 53], [70, 78], [83, 104], [86, 96, 99, 102]]);
+        }, _callee39, this, [[31, 41, 49, 53], [70, 92], [97, 118], [100, 110, 113, 116]]);
       }));
       function syncOrderToBackendWithReturn() {
         return _syncOrderToBackendWithReturn.apply(this, arguments);

package/lib/modules/Summary/utils.js

@@ -99,7 +99,13 @@ var getTax = ({ service, addons, bookingDetail, bookingId }, options) => {
   let totalTax = new import_decimal.default(0);
   if (service || addons) {
     if (service == null ? void 0 : service.length) {
-      const serviceResult = processItemsTax(service, { bookingDetail, bookingId }, {
+      const serviceResult = processItemsTax(service.map((item) => {
+        return {
+          ...item,
+          option: (item == null ? void 0 : item.option) || (item == null ? void 0 : item.options) || [],
+          bundle: (item == null ? void 0 : item.bundle) || (item == null ? void 0 : item.bundles) || []
+        };
+      }), { bookingDetail, bookingId }, {
         tax_rate,
         is_price_include_tax,
         computed
@@ -133,7 +139,11 @@ var processItemsTax = (items, { bookingDetail, bookingId }, options) => {
   for (let item of items) {
     const quantity = new import_decimal.default(item.num || 1);
     const unitPrice = new import_decimal.default(item.total || 0);
-    const mainProductPrice = new import_decimal.default(getMainProductTotal(item) || 0);
+    const mainProductPrice = new import_decimal.default(getMainProductTotal({
+      ...item,
+      option: (item == null ? void 0 : item.option) || (item == null ? void 0 : item.options) || [],
+      bundle: (item == null ? void 0 : item.bundle) || (item == null ? void 0 : item.bundles) || []
+    }) || 0);
     let originalTaxPerItemPrecise = getProductItemTax(
       {
         ...item,
@@ -531,7 +541,11 @@ var getSurcharge = ({ service, addons, bookingDetail, bookingId }, options) => {
             isInScheduleByDate
           }
         )) {
-          const total = getMainProductTotal(item);
+          const total = getMainProductTotal({
+            ...item,
+            option: (item == null ? void 0 : item.option) || (item == null ? void 0 : item.options) || [],
+            bundle: (item == null ? void 0 : item.bundle) || (item == null ? void 0 : item.bundles) || []
+          });
           const mainQuantity = item.num || 1;
           matchedItems.push({
             total,

package/lib/solution/Checkout/index.js

@@ -859,12 +859,22 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         console.warn("[Checkout] 没有当前订单，无法替换订单ID");
         return null;
       }
+      const previousOrder = this.store.currentOrder;
+      const latestPaymentStatus = previousOrder.payment_status;
       const updatedOrder = await this.payment.replaceOrderIdByUuidAsync(
-        this.store.currentOrder.uuid,
+        previousOrder.uuid,
         newOrderId
       );
       if (updatedOrder) {
-        this.store.currentOrder = updatedOrder;
+        this.store.currentOrder = {
+          ...previousOrder,
+          ...updatedOrder,
+          payment_status: latestPaymentStatus
+        };
+        if (latestPaymentStatus)
+          await this.payment.updateOrderAsync(previousOrder.uuid, {
+            payment_status: latestPaymentStatus
+          });
         await this.core.effects.emit(`${this.name}:onOrderCreated`, {
           order: updatedOrder,
           timestamp: Date.now()
@@ -2586,8 +2596,10 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         newOrderId: realOrderId
       });
       try {
+        const latestPaymentStatus = this.store.currentOrder.payment_status;
+        const previousOrder = this.store.currentOrder;
         const updatedOrder = await this.payment.replaceOrderIdByUuidAsync(
-          this.store.currentOrder.uuid,
+          previousOrder.uuid,
           realOrderId
         );
         this.logInfo("Payment模块替换订单ID结果:", {
@@ -2601,7 +2613,15 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
             orderId: updatedOrder.order_id,
             totalAmount: updatedOrder.total_amount
           });
-          this.store.currentOrder = updatedOrder;
+          this.store.currentOrder = {
+            ...previousOrder,
+            ...updatedOrder,
+            payment_status: latestPaymentStatus
+          };
+          if (latestPaymentStatus)
+            await this.payment.updateOrderAsync(previousOrder.uuid, {
+              payment_status: latestPaymentStatus
+            });
           this.logInfo(
             "[Checkout] 订单ID替换成功，当前订单ID:",
             this.store.currentOrder.order_id

package/package.json

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