@pisell/pisellos 2.2.10 → 2.2.11

package/dist/modules/Rules/types.d.ts

@@ -44,7 +44,6 @@ type ProductDetail = {
     quantity: number;
     vouchersApplicable?: boolean;
     holder_id?: number;
-    startDate?: any;
 };
 export interface RulesParamsHooks {
     getProduct: (product: Record<string, any>) => ProductDetail;
@@ -55,10 +54,8 @@ export interface RulesParamsHooks {
         origin_total?: number;
         price?: string | number;
         variant?: any[];
-        original_price?: number | string;
+        original_price?: number;
         quantity?: number;
-        bundle?: any[];
-        main_product_selling_price?: string | number;
     }) => Record<string, any>;
 }
 export {};

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

@@ -342,7 +342,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/BookingByStep/index.js

@@ -31,7 +31,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { BaseModule } from "../../modules/BaseModule";
 import { createModule } from "./types";
 import { formatProductToCartItem, createCartItemOrigin, getUniqueId, handleVariantProduct, formatDateToCartItem, formatAccountToCartItem } from "../../modules/Cart/utils";
-import { getAvailableProductResources, isSessionProduct } from "./utils/products";
+import { getAvailableProductResources } from "./utils/products";
 import { getResourcesByProduct, getTimeSlicesByResource, getTimeSlicesByResources, getIsUsableByTimeItem, getOthersSelectedResources, getOthersCartSelectedResources, filterScheduleByDateRange, checkSessionProductLeadTime, sortCombinedResources, filterResourcesByFormItem, checkTwoResourcesIntersection, isConflict } from "./utils/resources";
 import dayjs from 'dayjs';
 import isSameOrBefore from 'dayjs/plugin/isSameOrBefore';
@@ -238,29 +238,19 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadProducts",
     value: (function () {
       var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref) {
-        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, schedule_date, res;
+        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, schedule_date;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _ref$category_ids = _ref.category_ids, category_ids = _ref$category_ids === void 0 ? [] : _ref$category_ids, _ref$product_ids = _ref.product_ids, product_ids = _ref$product_ids === void 0 ? [] : _ref$product_ids, _ref$collection = _ref.collection, collection = _ref$collection === void 0 ? [] : _ref$collection, schedule_date = _ref.schedule_date;
-              _context2.next = 3;
-              return this.store.products.loadProducts({
+              return _context2.abrupt("return", this.store.products.loadProducts({
                 category_ids: category_ids,
                 product_ids: product_ids,
                 collection: collection,
                 schedule_date: schedule_date,
                 cacheId: this.cacheId
-              });
-            case 3:
-              res = _context2.sent;
-              // 预拉取当天的资源数据
-              this.getAvailableDate({
-                startDate: schedule_date || dayjs().format('YYYY-MM-DD'),
-                endDate: schedule_date || dayjs().format('YYYY-MM-DD'),
-                products: _toConsumableArray(res)
-              });
-              return _context2.abrupt("return", res);
-            case 6:
+              }));
+            case 2:
             case "end":
               return _context2.stop();
           }
@@ -292,7 +282,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _loadProductByScheduleDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref2) {
         var _schedule$product_ids;
-        var date, _ref2$product_ids, product_ids, _ref2$category_ids, category_ids, scheduleList, newProductIds, schedule, otherProductsIds, allProductIds, res;
+        var date, _ref2$product_ids, product_ids, _ref2$category_ids, category_ids, scheduleList, newProductIds, schedule, otherProductsIds, allProductIds;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -339,9 +329,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 schedule_date: date
               });
             case 10:
-              res = _context3.sent;
-              return _context3.abrupt("return", res);
-            case 12:
+              return _context3.abrupt("return", _context3.sent);
+            case 11:
             case "end":
               return _context3.stop();
           }
@@ -1161,16 +1150,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var productData = _objectSpread(_objectSpread({}, origin), {}, {
         product_variant_id: product_variant_id
       });
-      debugger;
-      // 保护，如果进来的是 session 商品，则必须要有 date 和时间片，否则不允许添加
-      if (isSessionProduct(productData)) {
-        if (!date || !date.startTime || !date.endTime) {
-          return {
-            success: false,
-            errorCode: 'date_or_time_required'
-          };
-        }
-      }
 
       // 库存检测
       var currentCartItems = this.store.cart.getItems();
@@ -2313,7 +2292,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           }
         });
       });
-      this.core.effects.emit("".concat(this.store.cart.name, ":onUpdateBookingDate"), {});
     }
   }, {
     key: "getScheduleDataByIds",

package/dist/solution/BookingByStep/utils/products.d.ts

@@ -9,9 +9,3 @@ export declare const getAvailableProductResources: (products: ProductData[]) =>
     rules: any[];
     resourcesMap: Record<number, ProductResourceItem>;
 };
-/**
- * 判断商品是否是 session 商品
- * @param product 商品数据
- * @returns 是否是 session 商品
- */
-export declare const isSessionProduct: (product: ProductData) => boolean;

package/dist/solution/BookingByStep/utils/products.js

@@ -47,14 +47,4 @@ export var getAvailableProductResources = function getAvailableProductResources(
     rules: rules,
     resourcesMap: resourcesMap
   };
-};
-
-/**
- * 判断商品是否是 session 商品
- * @param product 商品数据
- * @returns 是否是 session 商品
- */
-export var isSessionProduct = function isSessionProduct(product) {
-  var _product$scheduleIds, _product$scheduleIds2;
-  return ((_product$scheduleIds = product === null || product === void 0 || (_product$scheduleIds2 = product['schedule.ids']) === null || _product$scheduleIds2 === void 0 ? void 0 : _product$scheduleIds2.length) !== null && _product$scheduleIds !== void 0 ? _product$scheduleIds : 0) > 0;
 };

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

@@ -123,7 +123,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/dist/solution/Checkout/index.js

@@ -396,66 +396,23 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
           return pre + (item.amount || 0);
         }, 0);
       };
-      var formatProduct = function formatProduct(items) {
-        return items.map(function (item) {
-          var _item$is_charge_tax;
-          return {
-            product_id: item.product_id,
-            product_variant_id: item.product_variant_id,
-            quantity: item.num,
-            // 商品是否含税：1；0
-            is_charge_tax: (_item$is_charge_tax = item.is_charge_tax) !== null && _item$is_charge_tax !== void 0 ? _item$is_charge_tax : 0,
-            // 若商品不含税，计算得到的税费，单位（元）
-            tax_fee: item.tax_fee,
-            // 整个商品折扣后的总金额
-            selling_price: item.calculated_selling_price,
-            // 使用者id
-            holder_id: item.holder_id,
-            // 整个商品折扣前的总金额
-            original_price: item.calculated_original_price,
-            // 主商品折扣前金额，不包含套餐子商品
-            main_product_original_price: item.price,
-            // 主商品折扣后金额，不包含套餐子商品
-            main_product_selling_price: item.main_product_selling_price,
-            metadata: {
-              // 主商品+非原价(加减价)子商品税费
-              "main_product_attached_bundle_tax_fee": item.metadata.main_product_attached_bundle_tax_fee,
-              // 主商品+非原价(加减价)子商品附加费
-              "main_product_attached_bundle_surcharge_fee": item.metadata.main_product_attached_bundle_surcharge_fee,
-              // 可选，附加费均摊舍入金额
-              "surcharge_rounding_remainder": item.metadata.surcharge_rounding_remainder
-            },
-            product_bundle: item.product_bundle.map(function (bundle) {
-              return {
-                bundle_id: bundle.bundle_id,
-                bundle_product_id: bundle.bundle_product_id,
-                bundle_variant_id: bundle.bundle_variant_id,
-                price_type: bundle.price_type,
-                price_type_ext: bundle.price_type_ext,
-                // 套餐子商品总价，不包含折扣金额
-                bundle_sum_price: bundle.bundle_sum_price,
-                // 套餐子商品折扣后金额
-                bundle_selling_price: bundle.bundle_selling_price,
-                num: bundle.num,
-                is_charge_tax: bundle.is_charge_tax,
-                tax_fee: bundle.tax_fee,
-                metadata: {
-                  // 子商品单数量附加费
-                  "surcharge_fee": bundle.metadata.surcharge_fee,
-                  // 可选，附加费均摊舍入金额
-                  "surcharge_rounding_remainder": bundle.metadata.surcharge_rounding_remainder
-                }
-              };
-            })
-          };
-        }) || [];
-      };
-      var productList = formatProduct(((_this$store$currentOr = this.store.currentOrder.order_info) === null || _this$store$currentOr === void 0 || (_this$store$currentOr = _this$store$currentOr.original_order_data) === null || _this$store$currentOr === void 0 || (_this$store$currentOr = _this$store$currentOr.bookings) === null || _this$store$currentOr === void 0 ? void 0 : _this$store$currentOr.map(function (item) {
-        return _objectSpread(_objectSpread({}, item.product), {}, {
+      var productList = ((_this$store$currentOr = this.store.currentOrder.order_info) === null || _this$store$currentOr === void 0 || (_this$store$currentOr = _this$store$currentOr.original_order_data.bookings) === null || _this$store$currentOr === void 0 ? void 0 : _this$store$currentOr.map(function (item) {
+        return {
+          product_id: item.product.product_id,
+          product_variant_id: item.product.product_variant_id,
+          quantity: item.product.num,
+          selling_price: item.product.calculated_selling_price,
           holder_id: _this3.getHolderIdFromBooking(item)
-        });
-      })) || []);
-      var relationProducts = formatProduct(((_this$store$currentOr2 = this.store.currentOrder.order_info) === null || _this$store$currentOr2 === void 0 || (_this$store$currentOr2 = _this$store$currentOr2.original_order_data) === null || _this$store$currentOr2 === void 0 ? void 0 : _this$store$currentOr2.relation_products) || []);
+        };
+      })) || [];
+      var relationProducts = ((_this$store$currentOr2 = this.store.currentOrder.order_info) === null || _this$store$currentOr2 === void 0 || (_this$store$currentOr2 = _this$store$currentOr2.original_order_data) === null || _this$store$currentOr2 === void 0 || (_this$store$currentOr2 = _this$store$currentOr2.relation_products) === null || _this$store$currentOr2 === void 0 ? void 0 : _this$store$currentOr2.map(function (item) {
+        return {
+          product_id: item.product_id,
+          product_variant_id: item.product_variant_id,
+          quantity: item.num,
+          selling_price: item.source_product_price
+        };
+      })) || [];
       return [].concat(_toConsumableArray(productList), _toConsumableArray(relationProducts));
     }
   }, {
@@ -490,8 +447,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   depositAmount: (_this$store$currentOr5 = this.store.currentOrder) === null || _this$store$currentOr5 === void 0 ? void 0 : _this$store$currentOr5.deposit_amount,
                   isDeposit: (_this$store$currentOr6 = this.store.currentOrder) === null || _this$store$currentOr6 === void 0 ? void 0 : _this$store$currentOr6.is_deposit
                 },
-                products: this.getProductListByOrder(),
-                is_price_include_tax: this.otherParams.is_price_include_tax
+                products: this.getProductListByOrder()
               }, params); // 判断订单是否已经同步，如果是则追加payment_order_id参数
               if (this.store.isOrderSynced) {
                 walletBusinessData.payment_order_id = (_this$store$currentOr7 = this.store.currentOrder) === null || _this$store$currentOr7 === void 0 ? void 0 : _this$store$currentOr7.order_id;
@@ -751,7 +707,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "updateLocalOrderAsync",
     value: (function () {
       var _updateLocalOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(params) {
-        var _params$orderData6, _params$orderData7, _params$cartSummary2, _params$totalInfo5, _params$totalInfo6, _params$totalInfo7, _params$totalInfo8;
+        var _params$orderData6, _params$orderData7, _params$cartSummary2, _params$totalInfo5, _params$totalInfo6, _params$totalInfo7, _params$totalInfo8, _this$store$currentOr9, _this$store$currentOr10;
         var validation, amountInfo, customerInfo, allOrders, existingOrder, _updated$payment2, _existingOrder$paymen, _updated$payment, currentTime, formattedExistPayments, _isNeedDeposit, _updated, syncedPayments, _syncedAmount, _totalAmount, _remainingExpectAmount, _depositDiffAmount, totalAmount, activePayments, paidAmount, remaining, _isNeedDeposit2, updated, syncedAmount, remainingExpectAmount, depositDiffAmount, isNeedDeposit, created, _syncedPayments, _syncedAmount2;
         return _regeneratorRuntime().wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
@@ -1003,7 +959,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               this.store.currentOrder = created;
 
               // 🔧 新增: 如果有云端支付项，需要计算正确的待付金额
-              if (params.existPayment && params.existPayment.length > 0) {
+              if (params.existPayment && params.existPayment.length > 0 || (_this$store$currentOr9 = this.store.currentOrder) !== null && _this$store$currentOr9 !== void 0 && _this$store$currentOr9.order_id && !isVirtualOrderId((_this$store$currentOr10 = this.store.currentOrder) === null || _this$store$currentOr10 === void 0 ? void 0 : _this$store$currentOr10.order_id)) {
                 // 标记订单已同步（因为订单和支付项都来自云端）
                 this.store.isOrderSynced = true;
 
@@ -1117,8 +1073,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderOriginalData",
     value: function getOrderOriginalData() {
-      var _this$store$currentOr9;
-      return (_this$store$currentOr9 = this.store.currentOrder) === null || _this$store$currentOr9 === void 0 ? void 0 : _this$store$currentOr9.order_info;
+      var _this$store$currentOr11;
+      return (_this$store$currentOr11 = this.store.currentOrder) === null || _this$store$currentOr11 === void 0 ? void 0 : _this$store$currentOr11.order_info;
     }
 
     /**
@@ -1967,7 +1923,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "setDepositAmountAsync",
     value: (function () {
       var _setDepositAmountAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(depositAmount) {
-        var _this$store$currentOr10, _this$store$currentOr11;
+        var _this$store$currentOr12, _this$store$currentOr13;
         var depositValue, formattedDepositAmount, oldDepositAmount, updateParams;
         return _regeneratorRuntime().wrap(function _callee20$(_context20) {
           while (1) switch (_context20.prev = _context20.next) {
@@ -1975,8 +1931,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               this.logInfo('setDepositAmountAsync called', {
                 depositAmount: depositAmount,
                 hasCurrentOrder: !!this.store.currentOrder,
-                currentOrderId: (_this$store$currentOr10 = this.store.currentOrder) === null || _this$store$currentOr10 === void 0 ? void 0 : _this$store$currentOr10.order_id,
-                currentTotalAmount: (_this$store$currentOr11 = this.store.currentOrder) === null || _this$store$currentOr11 === void 0 ? void 0 : _this$store$currentOr11.total_amount
+                currentOrderId: (_this$store$currentOr12 = this.store.currentOrder) === null || _this$store$currentOr12 === void 0 ? void 0 : _this$store$currentOr12.order_id,
+                currentTotalAmount: (_this$store$currentOr13 = this.store.currentOrder) === null || _this$store$currentOr13 === void 0 ? void 0 : _this$store$currentOr13.total_amount
               });
               _context20.prev = 1;
               // 验证定金金额格式
@@ -2096,17 +2052,17 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "manualSyncOrderAsync",
     value: (function () {
       var _manualSyncOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21() {
-        var _this$store$currentOr12, _this$store$currentOr13, _this$store$currentOr14;
-        var _this$store$currentOr15, orderUuid, oldOrderId, syncResult, finalOrderId, finalIsVirtual, newRes, _this$store$currentOr16, errorMessage;
+        var _this$store$currentOr14, _this$store$currentOr15, _this$store$currentOr16;
+        var _this$store$currentOr17, orderUuid, oldOrderId, syncResult, finalOrderId, finalIsVirtual, newRes, _this$store$currentOr18, errorMessage;
         return _regeneratorRuntime().wrap(function _callee21$(_context21) {
           while (1) switch (_context21.prev = _context21.next) {
             case 0:
               console.log('manualSyncOrderAsync called');
               this.logInfo('manualSyncOrderAsync called', {
                 hasCurrentOrder: !!this.store.currentOrder,
-                currentOrderId: (_this$store$currentOr12 = this.store.currentOrder) === null || _this$store$currentOr12 === void 0 ? void 0 : _this$store$currentOr12.order_id,
-                orderUuid: (_this$store$currentOr13 = this.store.currentOrder) === null || _this$store$currentOr13 === void 0 ? void 0 : _this$store$currentOr13.uuid,
-                totalAmount: (_this$store$currentOr14 = this.store.currentOrder) === null || _this$store$currentOr14 === void 0 ? void 0 : _this$store$currentOr14.total_amount,
+                currentOrderId: (_this$store$currentOr14 = this.store.currentOrder) === null || _this$store$currentOr14 === void 0 ? void 0 : _this$store$currentOr14.order_id,
+                orderUuid: (_this$store$currentOr15 = this.store.currentOrder) === null || _this$store$currentOr15 === void 0 ? void 0 : _this$store$currentOr15.uuid,
+                totalAmount: (_this$store$currentOr16 = this.store.currentOrder) === null || _this$store$currentOr16 === void 0 ? void 0 : _this$store$currentOr16.total_amount,
                 isOrderSynced: this.store.isOrderSynced,
                 isVirtualOrderId: this.store.currentOrder ? isVirtualOrderId(this.store.currentOrder.order_id) : false
               });
@@ -2166,7 +2122,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 this.logError('[Checkout] 严重警告：返回的订单ID与存储的订单ID不一致！');
               }
               newRes = _objectSpread(_objectSpread({}, syncResult), {}, {
-                is_deposit: ((_this$store$currentOr15 = this.store.currentOrder) === null || _this$store$currentOr15 === void 0 ? void 0 : _this$store$currentOr15.is_deposit) || 0
+                is_deposit: ((_this$store$currentOr17 = this.store.currentOrder) === null || _this$store$currentOr17 === void 0 ? void 0 : _this$store$currentOr17.is_deposit) || 0
               });
               _context21.next = 30;
               return this.updateStateAmountToRemaining(false);
@@ -2180,7 +2136,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               return _context21.abrupt("return", {
                 success: false,
                 message: "\u8BA2\u5355\u540C\u6B65\u5931\u8D25: ".concat(errorMessage),
-                orderUuid: (_this$store$currentOr16 = this.store.currentOrder) === null || _this$store$currentOr16 === void 0 ? void 0 : _this$store$currentOr16.uuid
+                orderUuid: (_this$store$currentOr18 = this.store.currentOrder) === null || _this$store$currentOr18 === void 0 ? void 0 : _this$store$currentOr18.uuid
               });
             case 38:
             case "end":
@@ -2257,15 +2213,15 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "cancelCurrentOrderAsync",
     value: (function () {
       var _cancelCurrentOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(cancelReason) {
-        var _this$store$currentOr17, _this$store$currentOr18, currentOrderUuid, currentOrderId, isOrderSynced, errorMessage;
+        var _this$store$currentOr19, _this$store$currentOr20, currentOrderUuid, currentOrderId, isOrderSynced, errorMessage;
         return _regeneratorRuntime().wrap(function _callee22$(_context22) {
           while (1) switch (_context22.prev = _context22.next) {
             case 0:
               _context22.prev = 0;
               this.logInfo('开始取消当前本地订单:', {
                 hasCurrentOrder: !!this.store.currentOrder,
-                orderUuid: (_this$store$currentOr17 = this.store.currentOrder) === null || _this$store$currentOr17 === void 0 ? void 0 : _this$store$currentOr17.uuid,
-                orderId: (_this$store$currentOr18 = this.store.currentOrder) === null || _this$store$currentOr18 === void 0 ? void 0 : _this$store$currentOr18.order_id,
+                orderUuid: (_this$store$currentOr19 = this.store.currentOrder) === null || _this$store$currentOr19 === void 0 ? void 0 : _this$store$currentOr19.uuid,
+                orderId: (_this$store$currentOr20 = this.store.currentOrder) === null || _this$store$currentOr20 === void 0 ? void 0 : _this$store$currentOr20.order_id,
                 isOrderSynced: this.store.isOrderSynced,
                 cancelReason: cancelReason
               });
@@ -2376,7 +2332,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "saveForLaterPaymentAsync",
     value: (function () {
       var _saveForLaterPaymentAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23() {
-        var orderUuid, currentOrderId, allPaymentItems, syncResult, _this$store$currentOr19, errorMessage;
+        var orderUuid, currentOrderId, allPaymentItems, syncResult, _this$store$currentOr21, errorMessage;
         return _regeneratorRuntime().wrap(function _callee23$(_context23) {
           while (1) switch (_context23.prev = _context23.next) {
             case 0:
@@ -2430,7 +2386,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               return _context23.abrupt("return", {
                 success: false,
                 message: "\u8BA2\u5355\u4FDD\u5B58\u5931\u8D25: ".concat(errorMessage),
-                orderUuid: (_this$store$currentOr19 = this.store.currentOrder) === null || _this$store$currentOr19 === void 0 ? void 0 : _this$store$currentOr19.uuid
+                orderUuid: (_this$store$currentOr21 = this.store.currentOrder) === null || _this$store$currentOr21 === void 0 ? void 0 : _this$store$currentOr21.uuid
               });
             case 21:
             case "end":
@@ -2453,7 +2409,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "updateOrderNoteAsync",
     value: (function () {
       var _updateOrderNoteAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(note) {
-        var _this$store$currentOr20, _this$store$currentOr21, oldNote, orderInPayment;
+        var _this$store$currentOr22, _this$store$currentOr23, oldNote, orderInPayment;
         return _regeneratorRuntime().wrap(function _callee24$(_context24) {
           while (1) switch (_context24.prev = _context24.next) {
             case 0:
@@ -2465,7 +2421,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               throw createCheckoutError(CheckoutErrorType.ValidationFailed, '没有本地订单数据，无法更新备注');
             case 3:
               console.log('[Checkout] 更新订单备注:', {
-                orderUuid: (_this$store$currentOr20 = this.store.currentOrder) === null || _this$store$currentOr20 === void 0 ? void 0 : _this$store$currentOr20.uuid,
+                orderUuid: (_this$store$currentOr22 = this.store.currentOrder) === null || _this$store$currentOr22 === void 0 ? void 0 : _this$store$currentOr22.uuid,
                 oldNote: this.store.localOrderData.shop_note,
                 newNote: note
               });
@@ -2498,7 +2454,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
             case 17:
               _context24.next = 19;
               return this.core.effects.emit("".concat(this.name, ":onOrderNoteChanged"), {
-                orderUuid: (_this$store$currentOr21 = this.store.currentOrder) === null || _this$store$currentOr21 === void 0 ? void 0 : _this$store$currentOr21.uuid,
+                orderUuid: (_this$store$currentOr23 = this.store.currentOrder) === null || _this$store$currentOr23 === void 0 ? void 0 : _this$store$currentOr23.uuid,
                 oldNote: oldNote,
                 newNote: note,
                 timestamp: Date.now()
@@ -2570,7 +2526,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "handlePaymentSuccess",
     value: (function () {
       var _handlePaymentSuccess = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(data) {
-        var _this$store$currentOr22;
+        var _this$store$currentOr24;
         return _regeneratorRuntime().wrap(function _callee26$(_context26) {
           while (1) switch (_context26.prev = _context26.next) {
             case 0:
@@ -2581,7 +2537,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               return this.core.effects.emit("".concat(this.name, ":onPaymentSuccess"), {
                 orderUuid: data.orderUuid,
                 paymentMethodCode: '',
-                amount: ((_this$store$currentOr22 = this.store.currentOrder) === null || _this$store$currentOr22 === void 0 ? void 0 : _this$store$currentOr22.total_amount) || '0',
+                amount: ((_this$store$currentOr24 = this.store.currentOrder) === null || _this$store$currentOr24 === void 0 ? void 0 : _this$store$currentOr24.total_amount) || '0',
                 timestamp: data.timestamp
               });
             case 4:
@@ -2606,7 +2562,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "handlePaymentError",
     value: (function () {
       var _handlePaymentError = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(data) {
-        var _this$store$currentOr23;
+        var _this$store$currentOr25;
         var error;
         return _regeneratorRuntime().wrap(function _callee27$(_context27) {
           while (1) switch (_context27.prev = _context27.next) {
@@ -2619,7 +2575,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               return this.core.effects.emit("".concat(this.name, ":onPaymentFailed"), {
                 orderUuid: data.orderUuid,
                 paymentMethodCode: '',
-                amount: ((_this$store$currentOr23 = this.store.currentOrder) === null || _this$store$currentOr23 === void 0 ? void 0 : _this$store$currentOr23.total_amount) || '0',
+                amount: ((_this$store$currentOr25 = this.store.currentOrder) === null || _this$store$currentOr25 === void 0 ? void 0 : _this$store$currentOr25.total_amount) || '0',
                 timestamp: data.timestamp
               });
             case 5:
@@ -3742,10 +3698,10 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _syncOrderToBackendWithReturn = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee39() {
         var _this6 = this,
-          _this$store$currentOr24,
-          _this$store$currentOr25,
-          _this$store$currentCu2,
           _this$store$currentOr26,
+          _this$store$currentOr27,
+          _this$store$currentCu2,
+          _this$store$currentOr28,
           _this$store$localOrde,
           _this$store$localOrde2,
           _checkoutResponse3,
@@ -3827,7 +3783,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   })
                 });
               }); // 确定最终的定金金额：优先使用手动设置的值，否则从支付项中计算
-              manualDepositAmount = ((_this$store$currentOr24 = this.store.currentOrder) === null || _this$store$currentOr24 === void 0 ? void 0 : _this$store$currentOr24.deposit_amount) || '0.00'; // 优先级逻辑：手动设置的定金金额 > 从支付项计算的金额
+              manualDepositAmount = ((_this$store$currentOr26 = this.store.currentOrder) === null || _this$store$currentOr26 === void 0 ? void 0 : _this$store$currentOr26.deposit_amount) || '0.00'; // 优先级逻辑：手动设置的定金金额 > 从支付项计算的金额
               manualDepositValue = new Decimal(manualDepositAmount);
               if (manualDepositValue.gt(0)) {
                 // 如果手动设置了定金金额且大于0，使用手动设置的值
@@ -3887,7 +3843,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 }),
                 manualDepositAmount: manualDepositAmount,
                 finalDepositAmount: finalDepositAmount,
-                isDeposit: ((_this$store$currentOr25 = this.store.currentOrder) === null || _this$store$currentOr25 === void 0 ? void 0 : _this$store$currentOr25.is_deposit) || 0
+                isDeposit: ((_this$store$currentOr27 = this.store.currentOrder) === null || _this$store$currentOr27 === void 0 ? void 0 : _this$store$currentOr27.is_deposit) || 0
               });
 
               // 构造订单参数，直接使用 localOrderData 中已处理好的数据
@@ -3909,7 +3865,7 @@ 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$currentOr26 = this.store.currentOrder) !== null && _this$store$currentOr26 !== void 0 && _this$store$currentOr26.is_deposit || Number(finalDepositAmount) > 0 ? 1 : 0) || 0,
+                is_deposit: ((_this$store$currentOr28 = this.store.currentOrder) !== null && _this$store$currentOr28 !== void 0 && _this$store$currentOr28.is_deposit || Number(finalDepositAmount) > 0 ? 1 : 0) || 0,
                 deposit_amount: finalDepositAmount,
                 // 使用最终确定的定金金额（手动设置优先）
                 product_tax_fee: this.store.localOrderData.tax_fee,

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

@@ -18,8 +18,6 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     private initializePlugins;
     private registerDependentModules;
     private registerEventListeners;
-    getCurrentBookingTime(): string | null;
-    private filterDiscountListByBookingTime;
     setCustomer(customer: Customer): Promise<void>;
     setHolders(holders: {
         form_record_id: number;