@pisell/pisellos 2.2.204 → 2.2.206

package/dist/modules/Order/index.js

@@ -1221,6 +1221,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (price.lte(0) || points.lte(0)) return payment.wallet_pass_use_value;
       return amount.div(price).times(points).toDecimalPlaces(2).toFixed(2);
     }
+  }, {
+    key: "adjustVoucherFundRecord",
+    value: function adjustVoucherFundRecord(params) {
+      var _params$voucher$fund_;
+      var fundRecord = params.voucher.fund_record && _typeof(params.voucher.fund_record) === 'object' && !Array.isArray(params.voucher.fund_record) ? _objectSpread({}, params.voucher.fund_record) : null;
+      if (!fundRecord || fundRecord.using_before_value === undefined || fundRecord.using_before_value === null) {
+        return fundRecord || undefined;
+      }
+      var code = String(params.voucher.code || '').toUpperCase();
+      var isPointCard = code === 'POINTCARD' || String(((_params$voucher$fund_ = params.voucher.fund_record) === null || _params$voucher$fund_ === void 0 ? void 0 : _params$voucher$fund_.tag) || '').toLowerCase() === 'point_card';
+      var usingValue = isPointCard ? new Decimal(params.walletPassUseValue || 0) : params.amount;
+      fundRecord.using_after_value = new Decimal(fundRecord.using_before_value || 0).minus(usingValue).toDecimalPlaces(2).toFixed(2);
+      return fundRecord;
+    }
   }, {
     key: "capVoucherPaymentsByRemainingAmount",
     value: function capVoucherPaymentsByRemainingAmount(params) {
@@ -1239,10 +1253,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           if (voucherAmount.lte(0)) continue;
           var cappedAmount = Decimal.min(voucherAmount, remainingAmount);
           var amountText = cappedAmount.toDecimalPlaces(2).toFixed(2);
+          var walletPassUseValue = this.resolveWalletPassUseValue(voucher, cappedAmount);
           cappedVouchers.push(_objectSpread(_objectSpread({}, voucher), {}, {
             amount: amountText,
             origin_amount: amountText,
-            wallet_pass_use_value: this.resolveWalletPassUseValue(voucher, cappedAmount)
+            wallet_pass_use_value: walletPassUseValue,
+            fund_record: this.adjustVoucherFundRecord({
+              voucher: voucher,
+              amount: cappedAmount,
+              walletPassUseValue: walletPassUseValue
+            })
           }));
           remainingAmount = remainingAmount.minus(cappedAmount);
         }
@@ -2781,6 +2801,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               shouldForceNewLine = !!booking;
               matchedIndex = hasIncomingGoodPass || shouldForceNewLine ? -1 : tempOrder.products.findIndex(function (item) {
                 if (_this16.hasGoodPassDiscount(item)) return false;
+                if (item.order_detail_id !== undefined && item.order_detail_id !== null) return false;
                 if (item.product_id !== productToAdd.product_id) return false;
                 if (item.product_variant_id !== productToAdd.product_variant_id) return false;
                 var existedFingerprint = buildProductLineFingerprint(getProductSkuOptions(item), item.product_bundle);
@@ -3377,25 +3398,90 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       return clearOrderCartLines;
     }() // ─── TempOrder: 提交 ───
+    )
+  }, {
+    key: "buildCurrentSubmitPayloadForLocalPrint",
+    value: function buildCurrentSubmitPayloadForLocalPrint(params) {
+      var _params$cacheId, _this$otherParams, _ref64, _params$businessCode, _this$otherParams2, _this$otherParams3;
+      var tempOrder = this.ensureTempOrder();
+      this.persistTempOrder();
+      var payload = buildSubmitPayload({
+        tempOrder: tempOrder,
+        cacheId: (_params$cacheId = params === null || params === void 0 ? void 0 : params.cacheId) !== null && _params$cacheId !== void 0 ? _params$cacheId : this.cacheId,
+        platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.platform),
+        businessCode: (_ref64 = (_params$businessCode = params === null || params === void 0 ? void 0 : params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams2 = this.otherParams) === null || _this$otherParams2 === void 0 ? void 0 : _this$otherParams2.businessCode) !== null && _ref64 !== void 0 ? _ref64 : (_this$otherParams3 = this.otherParams) === null || _this$otherParams3 === void 0 ? void 0 : _this$otherParams3.business_code,
+        channel: params === null || params === void 0 ? void 0 : params.channel,
+        type: params === null || params === void 0 ? void 0 : params.type,
+        enhance: function enhance(nextPayload) {
+          var _ref65, _tempOrder$order_numb, _ref66, _tempOrder$shop_order, _ref67, _tempOrder$shop_full_;
+          return _objectSpread(_objectSpread({}, nextPayload), {}, {
+            order_number: (_ref65 = (_tempOrder$order_numb = tempOrder.order_number) !== null && _tempOrder$order_numb !== void 0 ? _tempOrder$order_numb : nextPayload.order_number) !== null && _ref65 !== void 0 ? _ref65 : null,
+            shop_order_number: (_ref66 = (_tempOrder$shop_order = tempOrder.shop_order_number) !== null && _tempOrder$shop_order !== void 0 ? _tempOrder$shop_order : nextPayload.shop_order_number) !== null && _ref66 !== void 0 ? _ref66 : null,
+            shop_full_order_number: (_ref67 = (_tempOrder$shop_full_ = tempOrder.shop_full_order_number) !== null && _tempOrder$shop_full_ !== void 0 ? _tempOrder$shop_full_ : nextPayload.shop_full_order_number) !== null && _ref67 !== void 0 ? _ref67 : null,
+            small_ticket_data_flag: 1
+          });
+        }
+      });
+      payload.created_at = undefined;
+      return payload;
+    }
+  }, {
+    key: "applyLocalPrintOrderNumbers",
+    value: function () {
+      var _applyLocalPrintOrderNumbers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(order) {
+        var tempOrder, shopOrderNumber, shopFullOrderNumber;
+        return _regeneratorRuntime().wrap(function _callee23$(_context25) {
+          while (1) switch (_context25.prev = _context25.next) {
+            case 0:
+              tempOrder = this.ensureTempOrder();
+              if (!(!order || _typeof(order) !== 'object')) {
+                _context25.next = 3;
+                break;
+              }
+              return _context25.abrupt("return", tempOrder);
+            case 3:
+              shopOrderNumber = order.shop_order_number;
+              shopFullOrderNumber = order.shop_full_order_number;
+              if (shopOrderNumber !== undefined && shopOrderNumber !== null && shopOrderNumber !== '') {
+                tempOrder.shop_order_number = String(shopOrderNumber);
+              }
+              if (shopFullOrderNumber !== undefined && shopFullOrderNumber !== null && shopFullOrderNumber !== '') {
+                tempOrder.shop_full_order_number = String(shopFullOrderNumber);
+              }
+              this.persistTempOrder();
+              _context25.next = 10;
+              return this.saveDraft();
+            case 10:
+              return _context25.abrupt("return", tempOrder);
+            case 11:
+            case "end":
+              return _context25.stop();
+          }
+        }, _callee23, this);
+      }));
+      function applyLocalPrintOrderNumbers(_x25) {
+        return _applyLocalPrintOrderNumbers.apply(this, arguments);
+      }
+      return applyLocalPrintOrderNumbers;
+    }()
     /**
      * 提交当前 Sales tempOrder。
      *
      * smallTicketDataFlag 用于 B 端 checkout 小票数据返回。PaymentModal 在支付提交时
      * 应传 1，确保 /shop/order/sales/checkout 返回打印所需数据。
      */
-    )
   }, {
     key: "submitTempOrder",
-    value: function () {
-      var _submitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23(params) {
-        var _params$cacheId, _this$otherParams, _ref64, _params$businessCode, _this$otherParams2, _this$otherParams3;
+    value: (function () {
+      var _submitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(params) {
+        var _params$cacheId2, _this$otherParams4, _ref68, _params$businessCode2, _this$otherParams5, _this$otherParams6;
         var tempOrder, effectiveCacheId, hasPaymentOverride, hasPaymentStatusOverride, hasSmallTicketDataFlagOverride, enhancePayload, payload, result, _payload$payments, _payload$payments2, backendErrorResponse, submittedOrderId, resultRecord;
-        return _regeneratorRuntime().wrap(function _callee23$(_context25) {
-          while (1) switch (_context25.prev = _context25.next) {
+        return _regeneratorRuntime().wrap(function _callee24$(_context26) {
+          while (1) switch (_context26.prev = _context26.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               this.persistTempOrder();
-              effectiveCacheId = (_params$cacheId = params === null || params === void 0 ? void 0 : params.cacheId) !== null && _params$cacheId !== void 0 ? _params$cacheId : this.cacheId;
+              effectiveCacheId = (_params$cacheId2 = params === null || params === void 0 ? void 0 : params.cacheId) !== null && _params$cacheId2 !== void 0 ? _params$cacheId2 : this.cacheId;
               hasPaymentOverride = (params === null || params === void 0 ? void 0 : params.payments) !== undefined;
               hasPaymentStatusOverride = (params === null || params === void 0 ? void 0 : params.paymentStatus) !== undefined;
               hasSmallTicketDataFlagOverride = (params === null || params === void 0 ? void 0 : params.smallTicketDataFlag) !== undefined;
@@ -3413,17 +3499,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               payload = buildSubmitPayload({
                 tempOrder: tempOrder,
                 cacheId: effectiveCacheId,
-                platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.platform),
-                businessCode: (_ref64 = (_params$businessCode = params === null || params === void 0 ? void 0 : params.businessCode) !== null && _params$businessCode !== void 0 ? _params$businessCode : (_this$otherParams2 = this.otherParams) === null || _this$otherParams2 === void 0 ? void 0 : _this$otherParams2.businessCode) !== null && _ref64 !== void 0 ? _ref64 : (_this$otherParams3 = this.otherParams) === null || _this$otherParams3 === void 0 ? void 0 : _this$otherParams3.business_code,
+                platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams4 = this.otherParams) === null || _this$otherParams4 === void 0 ? void 0 : _this$otherParams4.platform),
+                businessCode: (_ref68 = (_params$businessCode2 = params === null || params === void 0 ? void 0 : params.businessCode) !== null && _params$businessCode2 !== void 0 ? _params$businessCode2 : (_this$otherParams5 = this.otherParams) === null || _this$otherParams5 === void 0 ? void 0 : _this$otherParams5.businessCode) !== null && _ref68 !== void 0 ? _ref68 : (_this$otherParams6 = this.otherParams) === null || _this$otherParams6 === void 0 ? void 0 : _this$otherParams6.business_code,
                 channel: params === null || params === void 0 ? void 0 : params.channel,
                 type: params === null || params === void 0 ? void 0 : params.type,
                 enhance: enhancePayload
               }); // TODO: 前端生成的时间现在是有问题的，后面要统一优化
               payload.created_at = undefined;
-              _context25.next = 11;
+              _context26.next = 11;
               return this.saveDraft();
             case 11:
-              _context25.prev = 11;
+              _context26.prev = 11;
               this.logInfo('submitTempOrder calling sales checkout', {
                 orderId: payload.order_id,
                 externalSaleNumber: payload.external_sale_number,
@@ -3432,88 +3518,93 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 paymentsCount: ((_payload$payments = payload.payments) === null || _payload$payments === void 0 ? void 0 : _payload$payments.length) || 0,
                 smallTicketDataFlag: payload.small_ticket_data_flag
               });
-              _context25.next = 15;
+              _context26.next = 15;
               return this.submitSalesOrder({
                 query: payload
               });
             case 15:
-              result = _context25.sent;
-              _context25.next = 28;
+              result = _context26.sent;
+              _context26.next = 28;
               break;
             case 18:
-              _context25.prev = 18;
-              _context25.t0 = _context25["catch"](11);
-              backendErrorResponse = this.extractSubmitErrorResponse(_context25.t0);
+              _context26.prev = 18;
+              _context26.t0 = _context26["catch"](11);
+              backendErrorResponse = this.extractSubmitErrorResponse(_context26.t0);
               if (!backendErrorResponse) {
-                _context25.next = 25;
+                _context26.next = 25;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(backendErrorResponse, payload);
-              return _context25.abrupt("return", backendErrorResponse);
+              return _context26.abrupt("return", backendErrorResponse);
             case 25:
               this.store.syncState = 'failed';
               this.logError('submitTempOrder failed', {
-                error: _context25.t0 instanceof Error ? _context25.t0.message : String(_context25.t0),
+                error: _context26.t0 instanceof Error ? _context26.t0.message : String(_context26.t0),
                 orderId: payload.order_id,
                 externalSaleNumber: payload.external_sale_number,
                 paymentStatus: payload.payment_status,
                 paymentsCount: ((_payload$payments2 = payload.payments) === null || _payload$payments2 === void 0 ? void 0 : _payload$payments2.length) || 0
               });
-              throw _context25.t0;
+              throw _context26.t0;
             case 28:
               if (!this.isSubmitResponseRejected(result)) {
-                _context25.next = 32;
+                _context26.next = 32;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(result, payload);
-              return _context25.abrupt("return", result);
+              return _context26.abrupt("return", result);
             case 32:
               submittedOrderId = this.extractOrderIdFromSubmitResult(result);
               if (!(submittedOrderId !== null && submittedOrderId !== undefined)) {
-                _context25.next = 38;
+                _context26.next = 40;
                 break;
               }
               tempOrder.order_id = submittedOrderId;
               resultRecord = result;
-              _context25.next = 38;
+              _context26.next = 38;
               return this.markLocalOrderSynced(submittedOrderId, (resultRecord === null || resultRecord === void 0 ? void 0 : resultRecord.data) || resultRecord || {});
             case 38:
-              return _context25.abrupt("return", result);
-            case 39:
+              _context26.next = 41;
+              break;
+            case 40:
+              this.store.syncState = 'submitted';
+            case 41:
+              return _context26.abrupt("return", result);
+            case 42:
             case "end":
-              return _context25.stop();
+              return _context26.stop();
           }
-        }, _callee23, this, [[11, 18]]);
+        }, _callee24, this, [[11, 18]]);
       }));
-      function submitTempOrder(_x25) {
+      function submitTempOrder(_x26) {
         return _submitTempOrder.apply(this, arguments);
       }
       return submitTempOrder;
-    }()
+    }())
   }, {
     key: "markLocalOrderSynced",
     value: function () {
-      var _markLocalOrderSynced = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(orderId, remoteOrder) {
+      var _markLocalOrderSynced = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(orderId, remoteOrder) {
         var tempOrder;
-        return _regeneratorRuntime().wrap(function _callee24$(_context26) {
-          while (1) switch (_context26.prev = _context26.next) {
+        return _regeneratorRuntime().wrap(function _callee25$(_context27) {
+          while (1) switch (_context27.prev = _context27.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               tempOrder.order_id = orderId;
               this.store.lastOrderInfo = remoteOrder;
               this.store.syncState = 'submitted';
               this.persistTempOrder();
-              _context26.next = 7;
+              _context27.next = 7;
               return this.saveDraft();
             case 7:
             case "end":
-              return _context26.stop();
+              return _context27.stop();
           }
-        }, _callee24, this);
+        }, _callee25, this);
       }));
-      function markLocalOrderSynced(_x26, _x27) {
+      function markLocalOrderSynced(_x27, _x28) {
         return _markLocalOrderSynced.apply(this, arguments);
       }
       return markLocalOrderSynced;
@@ -3560,10 +3651,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "syncPaymentsToOrder",
     value: function () {
-      var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(params) {
+      var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(params) {
         var tempOrder, mappedPayments, paymentTotal, targetAmount, isFullyPaid, paymentStatus, paymentSyncIdempotencyToken, submitResult;
-        return _regeneratorRuntime().wrap(function _callee25$(_context27) {
-          while (1) switch (_context27.prev = _context27.next) {
+        return _regeneratorRuntime().wrap(function _callee26$(_context28) {
+          while (1) switch (_context28.prev = _context28.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               mappedPayments = mapPaymentItemsToOrderPayments(params.payments || []);
@@ -3574,28 +3665,28 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               tempOrder.payments = mappedPayments;
               tempOrder.payment_status = paymentStatus;
               this.persistTempOrder();
-              _context27.next = 11;
+              _context28.next = 11;
               return this.saveDraft();
             case 11:
               if (params.submitWhenPaid) {
-                _context27.next = 13;
+                _context28.next = 13;
                 break;
               }
-              return _context27.abrupt("return", {
+              return _context28.abrupt("return", {
                 isFullyPaid: isFullyPaid
               });
             case 13:
               if (!(this.store.syncState === 'submitting')) {
-                _context27.next = 15;
+                _context28.next = 15;
                 break;
               }
-              return _context27.abrupt("return", {
+              return _context28.abrupt("return", {
                 isFullyPaid: isFullyPaid
               });
             case 15:
               this.store.syncState = 'submitting';
               paymentSyncIdempotencyToken = this.buildPaymentSyncIdempotencyToken(tempOrder, mappedPayments);
-              _context27.next = 19;
+              _context28.next = 19;
               return this.submitTempOrder({
                 payments: mappedPayments,
                 paymentStatus: paymentStatus,
@@ -3610,18 +3701,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 }
               });
             case 19:
-              submitResult = _context27.sent;
-              return _context27.abrupt("return", {
+              submitResult = _context28.sent;
+              return _context28.abrupt("return", {
                 isFullyPaid: isFullyPaid,
                 submitResult: submitResult
               });
             case 21:
             case "end":
-              return _context27.stop();
+              return _context28.stop();
           }
-        }, _callee25, this);
+        }, _callee26, this);
       }));
-      function syncPaymentsToOrder(_x28) {
+      function syncPaymentsToOrder(_x29) {
         return _syncPaymentsToOrder.apply(this, arguments);
       }
       return syncPaymentsToOrder;
@@ -3710,11 +3801,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitOrder",
     value: function () {
-      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(order) {
+      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(order) {
         var _order$query$cartItem, _params$bookings, _params$relation_prod;
         var url, query, fetchUrl, params;
-        return _regeneratorRuntime().wrap(function _callee26$(_context28) {
-          while (1) switch (_context28.prev = _context28.next) {
+        return _regeneratorRuntime().wrap(function _callee27$(_context29) {
+          while (1) switch (_context29.prev = _context29.next) {
             case 0:
               this.logInfo('submitOrder called', {
                 url: order.url,
@@ -3734,14 +3825,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 relationProductsCount: ((_params$relation_prod = params.relation_products) === null || _params$relation_prod === void 0 ? void 0 : _params$relation_prod.length) || 0,
                 scheduleDate: params.schedule_date
               });
-              return _context28.abrupt("return", this.request.post(fetchUrl, params));
+              return _context29.abrupt("return", this.request.post(fetchUrl, params));
             case 6:
             case "end":
-              return _context28.stop();
+              return _context29.stop();
           }
-        }, _callee26, this);
+        }, _callee27, this);
       }));
-      function submitOrder(_x29) {
+      function submitOrder(_x30) {
         return _submitOrder.apply(this, arguments);
       }
       return submitOrder;
@@ -3749,13 +3840,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "cancelOrder",
     value: function () {
-      var _cancelOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(params) {
+      var _cancelOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(params) {
         var payload;
-        return _regeneratorRuntime().wrap(function _callee27$(_context29) {
-          while (1) switch (_context29.prev = _context29.next) {
+        return _regeneratorRuntime().wrap(function _callee28$(_context30) {
+          while (1) switch (_context30.prev = _context30.next) {
             case 0:
               if (!(!Array.isArray(params.order_ids) || params.order_ids.length === 0)) {
-                _context29.next = 2;
+                _context30.next = 2;
                 break;
               }
               throw new Error('取消订单失败：order_ids 不能为空');
@@ -3771,16 +3862,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 method: 'PUT',
                 orderIdsCount: params.order_ids.length
               });
-              return _context29.abrupt("return", this.request.put('/order/update-status', payload, {
+              return _context30.abrupt("return", this.request.put('/order/update-status', payload, {
                 isShopApi: true
               }));
             case 5:
             case "end":
-              return _context29.stop();
+              return _context30.stop();
           }
-        }, _callee27, this);
+        }, _callee28, this);
       }));
-      function cancelOrder(_x30) {
+      function cancelOrder(_x31) {
         return _cancelOrder.apply(this, arguments);
       }
       return cancelOrder;
@@ -3788,19 +3879,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "changeBookingStatus",
     value: function () {
-      var _changeBookingStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(params) {
+      var _changeBookingStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29(params) {
         var url, payload;
-        return _regeneratorRuntime().wrap(function _callee28$(_context30) {
-          while (1) switch (_context30.prev = _context30.next) {
+        return _regeneratorRuntime().wrap(function _callee29$(_context31) {
+          while (1) switch (_context31.prev = _context31.next) {
             case 0:
               if (params.booking_id) {
-                _context30.next = 2;
+                _context31.next = 2;
                 break;
               }
               throw new Error('变更预约状态失败：booking_id 不能为空');
             case 2:
               if (params.appointment_status) {
-                _context30.next = 4;
+                _context31.next = 4;
                 break;
               }
               throw new Error('变更预约状态失败：appointment_status 不能为空');
@@ -3815,16 +3906,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 bookingId: params.booking_id,
                 appointmentStatus: params.appointment_status
               });
-              return _context30.abrupt("return", this.request.put(url, payload, {
+              return _context31.abrupt("return", this.request.put(url, payload, {
                 isShopApi: true
               }));
             case 8:
             case "end":
-              return _context30.stop();
+              return _context31.stop();
           }
-        }, _callee28, this);
+        }, _callee29, this);
       }));
-      function changeBookingStatus(_x31) {
+      function changeBookingStatus(_x32) {
         return _changeBookingStatus.apply(this, arguments);
       }
       return changeBookingStatus;
@@ -3842,11 +3933,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "createOrderByCheckout",
     value: (function () {
-      var _createOrderByCheckout = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29(params) {
+      var _createOrderByCheckout = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30(params) {
         var _params$payments, _params$bookings2, _params$relation_prod2, _params$payments2, _params$payments3, _params$bookings3, _params$relation_prod3, _params$payments4;
         var onlineStorePaymentCodeList, _orderData$payments, _orderData$bookings, _orderData$relation_p, _orderData$payments2, _orderData$payments3, _orderData$bookings2, _orderData$relation_p2, _orderData$payments4, _orderData$payments5, _response$data, orderData, response;
-        return _regeneratorRuntime().wrap(function _callee29$(_context31) {
-          while (1) switch (_context31.prev = _context31.next) {
+        return _regeneratorRuntime().wrap(function _callee30$(_context32) {
+          while (1) switch (_context32.prev = _context32.next) {
             case 0:
               // 过滤掉由在线店铺下单的 payment 支付数据
               onlineStorePaymentCodeList = ['WXPAY', 'WECHAT', 'ALIPAY', 'APPLE_PAY', 'CREDIT_CARD_3DS', 'CREDIT_CARD_TOKEN', 'GOOGLE_PAY', 'GOOGLE_PAY_3DS', 'CREDIT_CARD'];
@@ -3880,7 +3971,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 relationProductsCount: ((_params$relation_prod3 = params.relation_products) === null || _params$relation_prod3 === void 0 ? void 0 : _params$relation_prod3.length) || 0,
                 paymentsCount: ((_params$payments4 = params.payments) === null || _params$payments4 === void 0 ? void 0 : _params$payments4.length) || 0
               });
-              _context31.prev = 4;
+              _context32.prev = 4;
               // 构建订单数据，设置默认值并允许 params 覆盖
               orderData = _objectSpread({
                 sales_channel: 'my_pisel',
@@ -3942,13 +4033,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 hasOrderId: !!orderData.order_id,
                 smallTicketDataFlag: orderData.small_ticket_data_flag
               });
-              _context31.next = 12;
-              return this.request.post('/shop/order/checkout', orderData, {
+              _context32.next = 12;
+              return this.request.post('/order/checkout', orderData, {
                 osServer: true,
                 customToast: function customToast() {}
               });
             case 12:
-              response = _context31.sent;
+              response = _context32.sent;
               this.logInfo('Order API called successfully', {
                 response: response
               });
@@ -3956,22 +4047,22 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 success: !!response,
                 hasOrderId: !!(response !== null && response !== void 0 && (_response$data = response.data) !== null && _response$data !== void 0 && _response$data.order_id || response !== null && response !== void 0 && response.order_id)
               });
-              return _context31.abrupt("return", response);
+              return _context32.abrupt("return", response);
             case 18:
-              _context31.prev = 18;
-              _context31.t0 = _context31["catch"](4);
-              console.error('[Order] createOrderByCheckout 创建订单失败:', _context31.t0);
+              _context32.prev = 18;
+              _context32.t0 = _context32["catch"](4);
+              console.error('[Order] createOrderByCheckout 创建订单失败:', _context32.t0);
               this.logInfo('Order API called failed', {
-                error: _context31.t0 instanceof Error ? _context31.t0.message : String(_context31.t0)
+                error: _context32.t0 instanceof Error ? _context32.t0.message : String(_context32.t0)
               });
-              throw _context31.t0;
+              throw _context32.t0;
             case 23:
             case "end":
-              return _context31.stop();
+              return _context32.stop();
           }
-        }, _callee29, this, [[4, 18]]);
+        }, _callee30, this, [[4, 18]]);
       }));
-      function createOrderByCheckout(_x32) {
+      function createOrderByCheckout(_x33) {
         return _createOrderByCheckout.apply(this, arguments);
       }
       return createOrderByCheckout;
@@ -3979,24 +4070,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitSalesOrder",
     value: function () {
-      var _submitSalesOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30(params) {
+      var _submitSalesOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31(params) {
         var url, query, fetchUrl;
-        return _regeneratorRuntime().wrap(function _callee30$(_context32) {
-          while (1) switch (_context32.prev = _context32.next) {
+        return _regeneratorRuntime().wrap(function _callee31$(_context33) {
+          while (1) switch (_context33.prev = _context33.next) {
             case 0:
               url = params.url, query = params.query;
               fetchUrl = url || '/order/sales/checkout';
-              return _context32.abrupt("return", this.request.post(fetchUrl, query, {
+              return _context33.abrupt("return", this.request.post(fetchUrl, query, {
                 osServer: true,
                 customToast: function customToast() {}
               }));
             case 3:
             case "end":
-              return _context32.stop();
+              return _context33.stop();
           }
-        }, _callee30, this);
+        }, _callee31, this);
       }));
-      function submitSalesOrder(_x33) {
+      function submitSalesOrder(_x34) {
         return _submitSalesOrder.apply(this, arguments);
       }
       return submitSalesOrder;
@@ -4010,37 +4101,37 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "sendCustomerPayLink",
     value: (function () {
-      var _sendCustomerPayLink = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31(params) {
+      var _sendCustomerPayLink = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee32(params) {
         var _params$emails;
         var orderIds;
-        return _regeneratorRuntime().wrap(function _callee31$(_context33) {
-          while (1) switch (_context33.prev = _context33.next) {
+        return _regeneratorRuntime().wrap(function _callee32$(_context34) {
+          while (1) switch (_context34.prev = _context34.next) {
             case 0:
               orderIds = params.order_ids || params.orderIds || [];
               if (orderIds.length) {
-                _context33.next = 3;
+                _context34.next = 3;
                 break;
               }
               throw new Error('发送支付链接前必须先提交本地订单并取得订单 ID');
             case 3:
               if ((_params$emails = params.emails) !== null && _params$emails !== void 0 && _params$emails.length) {
-                _context33.next = 5;
+                _context34.next = 5;
                 break;
               }
               throw new Error('发送支付链接需要至少一个邮箱');
             case 5:
-              return _context33.abrupt("return", this.request.post('/order/batch-email', {
+              return _context34.abrupt("return", this.request.post('/order/batch-email', {
                 order_ids: orderIds,
                 notify_action: params.notify_action || 'order_payment_reminder',
                 emails: params.emails
               }));
             case 6:
             case "end":
-              return _context33.stop();
+              return _context34.stop();
           }
-        }, _callee31, this);
+        }, _callee32, this);
       }));
-      function sendCustomerPayLink(_x34) {
+      function sendCustomerPayLink(_x35) {
         return _sendCustomerPayLink.apply(this, arguments);
       }
       return sendCustomerPayLink;
@@ -4048,19 +4139,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getSalesOrderByLookup",
     value: function () {
-      var _getSalesOrderByLookup = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee32(params) {
+      var _getSalesOrderByLookup = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee33(params) {
         var lookup, res;
-        return _regeneratorRuntime().wrap(function _callee32$(_context34) {
-          while (1) switch (_context34.prev = _context34.next) {
+        return _regeneratorRuntime().wrap(function _callee33$(_context35) {
+          while (1) switch (_context35.prev = _context35.next) {
             case 0:
               lookup = params.lookup === undefined || params.lookup === null ? '' : String(params.lookup).trim();
               if (lookup) {
-                _context34.next = 3;
+                _context35.next = 3;
                 break;
               }
               throw new Error('加载销售详情需要 lookup');
             case 3:
-              _context34.next = 5;
+              _context35.next = 5;
               return this.request.get("/order/sales/".concat(encodeURIComponent(lookup)), _objectSpread({
                 with: ['products', 'bookings', 'payments', 'customer', 'summary', 'contacts_info']
               }, params.forceRemote ? {
@@ -4069,18 +4160,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 osServer: true
               });
             case 5:
-              res = _context34.sent;
+              res = _context35.sent;
               if (res.code === 200) {
                 this.store.lastOrderInfo = res.data;
               }
-              return _context34.abrupt("return", res);
+              return _context35.abrupt("return", res);
             case 8:
             case "end":
-              return _context34.stop();
+              return _context35.stop();
           }
-        }, _callee32, this);
+        }, _callee33, this);
       }));
-      function getSalesOrderByLookup(_x35) {
+      function getSalesOrderByLookup(_x36) {
         return _getSalesOrderByLookup.apply(this, arguments);
       }
       return getSalesOrderByLookup;
@@ -4094,11 +4185,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "hydrateTempOrderFromRecord",
     value: (function () {
-      var _hydrateTempOrderFromRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee33(record, options) {
+      var _hydrateTempOrderFromRecord = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34(record, options) {
         var _this$store$discount13, _this$store$discount14;
         var raw, nextTempOrder, rawSummary, summarySurcharges, hydratedEditDiscounts;
-        return _regeneratorRuntime().wrap(function _callee33$(_context35) {
-          while (1) switch (_context35.prev = _context35.next) {
+        return _regeneratorRuntime().wrap(function _callee34$(_context36) {
+          while (1) switch (_context36.prev = _context36.next) {
             case 0:
               raw = record && _typeof(record) === 'object' && record.data && record.order_id == null ? record.data : record || {};
               nextTempOrder = this.normalizeTempOrderForRuntime(raw);
@@ -4121,30 +4212,30 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
               this.store.lastOrderInfo = raw.lastOrderInfo || raw;
               hydratedEditDiscounts = this.collectHydratedEditDiscounts(nextTempOrder.products);
-              _context35.next = 11;
+              _context36.next = 11;
               return (_this$store$discount13 = this.store.discount) === null || _this$store$discount13 === void 0 ? void 0 : _this$store$discount13.setOriginalDiscountList(hydratedEditDiscounts);
             case 11:
-              _context35.next = 13;
+              _context36.next = 13;
               return (_this$store$discount14 = this.store.discount) === null || _this$store$discount14 === void 0 ? void 0 : _this$store$discount14.setDiscountList(hydratedEditDiscounts);
             case 13:
               if (!(options !== null && options !== void 0 && options.recalcOnHydrate)) {
-                _context35.next = 16;
+                _context36.next = 16;
                 break;
               }
-              _context35.next = 16;
+              _context36.next = 16;
               return this.recalculateSummary({
                 createIfMissing: false
               });
             case 16:
               this.persistTempOrder();
-              return _context35.abrupt("return", nextTempOrder);
+              return _context36.abrupt("return", nextTempOrder);
             case 18:
             case "end":
-              return _context35.stop();
+              return _context36.stop();
           }
-        }, _callee33, this);
+        }, _callee34, this);
       }));
-      function hydrateTempOrderFromRecord(_x36, _x37) {
+      function hydrateTempOrderFromRecord(_x37, _x38) {
         return _hydrateTempOrderFromRecord.apply(this, arguments);
       }
       return hydrateTempOrderFromRecord;
@@ -4203,7 +4294,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _step18;
       try {
         for (_iterator18.s(); !(_step18 = _iterator18.n()).done;) {
-          var _product$metadata7, _ref65, _ref66, _existed$origin, _rawProduct$metadata;
+          var _product$metadata7, _ref69, _ref70, _existed$origin, _rawProduct$metadata;
           var _step18$value = _slicedToArray(_step18.value, 2),
             index = _step18$value[0],
             product = _step18$value[1];
@@ -4211,7 +4302,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           if (!uid) continue;
           var existed = productsByUid[uid] && _typeof(productsByUid[uid]) === 'object' ? productsByUid[uid] : {};
           var rawProduct = rawProducts[index] && _typeof(rawProducts[index]) === 'object' ? rawProducts[index] : product;
-          var origin = (_ref65 = (_ref66 = (_existed$origin = existed.origin) !== null && _existed$origin !== void 0 ? _existed$origin : rawProduct._origin) !== null && _ref66 !== void 0 ? _ref66 : (_rawProduct$metadata = rawProduct.metadata) === null || _rawProduct$metadata === void 0 ? void 0 : _rawProduct$metadata.origin) !== null && _ref65 !== void 0 ? _ref65 : rawProduct;
+          var origin = (_ref69 = (_ref70 = (_existed$origin = existed.origin) !== null && _existed$origin !== void 0 ? _existed$origin : rawProduct._origin) !== null && _ref70 !== void 0 ? _ref70 : (_rawProduct$metadata = rawProduct.metadata) === null || _rawProduct$metadata === void 0 ? void 0 : _rawProduct$metadata.origin) !== null && _ref69 !== void 0 ? _ref69 : rawProduct;
           var originSnapshot = cloneDeep(origin);
           var productOptionString = this.buildHydratedProductOptionString(rawProduct) || this.buildHydratedProductOptionString(product);
           if (productOptionString && originSnapshot && _typeof(originSnapshot) === 'object') {
@@ -4279,10 +4370,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeHydratedProductOptionItem",
     value: function normalizeHydratedProductOptionItem(optionItem) {
-      var _ref67, _optionItem$num, _ref68, _optionItem$add_price;
-      var rawNum = (_ref67 = (_optionItem$num = optionItem === null || optionItem === void 0 ? void 0 : optionItem.num) !== null && _optionItem$num !== void 0 ? _optionItem$num : optionItem === null || optionItem === void 0 ? void 0 : optionItem.quantity) !== null && _ref67 !== void 0 ? _ref67 : 1;
+      var _ref71, _optionItem$num, _ref72, _optionItem$add_price;
+      var rawNum = (_ref71 = (_optionItem$num = optionItem === null || optionItem === void 0 ? void 0 : optionItem.num) !== null && _optionItem$num !== void 0 ? _optionItem$num : optionItem === null || optionItem === void 0 ? void 0 : optionItem.quantity) !== null && _ref71 !== void 0 ? _ref71 : 1;
       var parsedNum = Number(rawNum);
-      var rawPrice = (_ref68 = (_optionItem$add_price = optionItem === null || optionItem === void 0 ? void 0 : optionItem.add_price) !== null && _optionItem$add_price !== void 0 ? _optionItem$add_price : optionItem === null || optionItem === void 0 ? void 0 : optionItem.price) !== null && _ref68 !== void 0 ? _ref68 : 0;
+      var rawPrice = (_ref72 = (_optionItem$add_price = optionItem === null || optionItem === void 0 ? void 0 : optionItem.add_price) !== null && _optionItem$add_price !== void 0 ? _optionItem$add_price : optionItem === null || optionItem === void 0 ? void 0 : optionItem.price) !== null && _ref72 !== void 0 ? _ref72 : 0;
       var parsedPrice = Number(rawPrice);
       var normalized = _objectSpread(_objectSpread({}, optionItem), {}, {
         option_group_item_id: optionItem === null || optionItem === void 0 ? void 0 : optionItem.option_group_item_id,
@@ -4338,25 +4429,25 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderInfo",
     value: function () {
-      var _getOrderInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34(order_id) {
+      var _getOrderInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee35(order_id) {
         var res;
-        return _regeneratorRuntime().wrap(function _callee34$(_context36) {
-          while (1) switch (_context36.prev = _context36.next) {
+        return _regeneratorRuntime().wrap(function _callee35$(_context37) {
+          while (1) switch (_context37.prev = _context37.next) {
             case 0:
-              _context36.next = 2;
+              _context37.next = 2;
               return this.request.get("/order/sales/".concat(order_id), {
                 with: ['products', 'bookings']
               });
             case 2:
-              res = _context36.sent;
-              return _context36.abrupt("return", res);
+              res = _context37.sent;
+              return _context37.abrupt("return", res);
             case 4:
             case "end":
-              return _context36.stop();
+              return _context37.stop();
           }
-        }, _callee34, this);
+        }, _callee35, this);
       }));
-      function getOrderInfo(_x38) {
+      function getOrderInfo(_x39) {
         return _getOrderInfo.apply(this, arguments);
       }
       return getOrderInfo;
@@ -4395,9 +4486,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             _step23;
           try {
             for (_iterator23.s(); !(_step23 = _iterator23.n()).done;) {
-              var _ref69, _bundle$num3;
+              var _ref73, _bundle$num3;
               var bundle = _step23.value;
-              var bundleQty = new Decimal(Number(qty) || 1).times(Number((_ref69 = (_bundle$num3 = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num3 !== void 0 ? _bundle$num3 : bundle === null || bundle === void 0 ? void 0 : bundle.quantity) !== null && _ref69 !== void 0 ? _ref69 : 1) || 1).toNumber();
+              var bundleQty = new Decimal(Number(qty) || 1).times(Number((_ref73 = (_bundle$num3 = bundle === null || bundle === void 0 ? void 0 : bundle.num) !== null && _bundle$num3 !== void 0 ? _bundle$num3 : bundle === null || bundle === void 0 ? void 0 : bundle.quantity) !== null && _ref73 !== void 0 ? _ref73 : 1) || 1).toNumber();
               var _iterator24 = _createForOfIteratorHelper((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []),
                 _step24;
               try {