@pisell/pisellos 0.0.237 → 0.0.238

package/dist/modules/Discount/index.d.ts

@@ -30,3 +30,4 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
     clear(): Promise<void>;
     storeChange(): void;
 }
+export type { Discount } from './types';

package/dist/modules/Order/index.js

@@ -26,6 +26,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { BaseModule } from "../BaseModule";
 import { generateDuration, mergeRelationForms } from "./utils";
 import { isNormalProduct } from "../Product/utils";
+import dayjs from 'dayjs';
 export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(OrderModule, _BaseModule);
   var _super = _createSuper(OrderModule);
@@ -205,6 +206,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 orderData.bookings = [];
                 orderData.relation_products = [];
               }
+
+              // 兜底策略，如果是第一次下单，没有 order_id，且没有 schedule_date，则设置为当前时间
+              if (!params.order_id && !orderData.schedule_date) {
+                orderData.schedule_date = dayjs().format('YYYY-MM-DD HH:mm:ss');
+              }
               console.log('[Order] 调用后端接口创建订单:', {
                 url: '/order/checkout',
                 orderType: orderData.type,
@@ -220,25 +226,25 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
 
               // 调用后端接口
-              _context3.next = 8;
+              _context3.next = 9;
               return this.request.post('/order/checkout', orderData);
-            case 8:
+            case 9:
               response = _context3.sent;
               console.log('[Order] 订单创建成功，后端响应:', {
                 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 _context3.abrupt("return", response);
-            case 13:
-              _context3.prev = 13;
+            case 14:
+              _context3.prev = 14;
               _context3.t0 = _context3["catch"](1);
               console.error('[Order] createOrderByCheckout 创建订单失败:', _context3.t0);
               throw _context3.t0;
-            case 17:
+            case 18:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[1, 13]]);
+        }, _callee3, this, [[1, 14]]);
       }));
       function createOrderByCheckout(_x4) {
         return _createOrderByCheckout.apply(this, arguments);

package/dist/solution/Checkout/index.js

@@ -1641,7 +1641,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "addPaymentItemAsync",
     value: (function () {
       var _addPaymentItemAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(paymentItem) {
-        var currentOrderId, isCurrentOrderReal;
+        var _paymentItem$type, _paymentItem$code, isEftposPayment;
         return _regeneratorRuntime().wrap(function _callee25$(_context25) {
           while (1) switch (_context25.prev = _context25.next) {
             case 0:
@@ -1669,89 +1669,63 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
             case 6:
               console.log('[Checkout] 支付项添加成功');
 
-              // 重新从Payment模块获取最新的订单数据，确保支付项同步
-              currentOrderId = this.store.currentOrder.order_id; // 保存当前的订单ID
-              isCurrentOrderReal = currentOrderId && !this.isVirtualOrderId(currentOrderId);
-              console.log('[Checkout] 准备同步订单数据:', {
-                当前订单ID: currentOrderId,
-                是否为真实ID: isCurrentOrderReal
+              // 检查是否是 EFTPOS 支付，如果是则立即同步订单
+              isEftposPayment = ((_paymentItem$type = paymentItem.type) === null || _paymentItem$type === void 0 ? void 0 : _paymentItem$type.toLowerCase()) === 'eftpos' || ((_paymentItem$code = paymentItem.code) === null || _paymentItem$code === void 0 ? void 0 : _paymentItem$code.toUpperCase().includes('EFTPOS'));
+              console.log('[Checkout] EFTPOS 支付检查:', {
+                paymentCode: paymentItem.code,
+                paymentType: paymentItem.type,
+                isEftposPayment: isEftposPayment,
+                currentOrderSynced: this.store.isOrderSynced
               });
-
-              // const updatedOrder = await this.payment.getPaymentOrderByUuidAsync(this.store.currentOrder.uuid);
-              // if (updatedOrder) {
-              //   // 如果当前订单ID是真实ID，但获取到的订单ID是虚拟ID，需要保护真实ID
-              //   if (isCurrentOrderReal && this.isVirtualOrderId(updatedOrder.order_id)) {
-              //     console.warn('[Checkout] 检测到订单ID回退，保护真实订单ID:', {
-              //       当前真实ID: currentOrderId,
-              //       获取到的虚拟ID: updatedOrder.order_id
-              //     });
-              //     updatedOrder.order_id = currentOrderId; // 恢复真实的订单ID
-              //   }
-
-              //   this.store.currentOrder = updatedOrder;
-              //   console.log('[Checkout] 订单数据已同步:', {
-              //     支付项数量: updatedOrder.payment.length,
-              //     最终订单ID: updatedOrder.order_id,
-              //     是否为虚拟ID: this.isVirtualOrderId(updatedOrder.order_id)
-              //   });
-              // }
-
-              // // 检查是否需要同步订单到后端
-              // const needsOrderSync = this.shouldSyncOrderForPayment(paymentItem.code, paymentItem.type);
-
-              // console.log('[Checkout] 支付项同步检查:', {
-              //   paymentCode: paymentItem.code,
-              //   paymentType: paymentItem.type,
-              //   paymentAmount: paymentItem.amount,
-              //   expectedCashCode: PaymentMethodType.Cash,
-              //   needsOrderSync,
-              //   isOrderSynced: this.store.isOrderSynced
-              // });
-
-              // if (needsOrderSync) {
-              //   console.log('[Checkout] 检测到非现金/自定义支付，开始同步订单到后端...', {
-              //     同步前订单ID: this.store.currentOrder.order_id,
-              //     是否为虚拟ID: this.isVirtualOrderId(this.store.currentOrder.order_id),
-              //     订单同步状态: this.store.isOrderSynced,
-              //     订单UUID: this.store.currentOrder.uuid
-              //   });
-
-              //   await this.syncOrderToBackend();
-
-              //   console.log('[Checkout] addPaymentItemAsync 中的同步完成:', {
-              //     同步后订单ID: this.store.currentOrder.order_id,
-              //     是否为虚拟ID: this.isVirtualOrderId(this.store.currentOrder.order_id),
-              //     订单同步状态: this.store.isOrderSynced
-              //   });
-              // }
-
-              // 支付项添加后，更新 stateAmount 为剩余未支付金额
-              _context25.next = 12;
-              return this.updateStateAmountToRemaining();
-            case 12:
+              if (!isEftposPayment) {
+                _context25.next = 22;
+                break;
+              }
+              console.log('[Checkout] 检测到 EFTPOS 支付，立即同步订单到后端...');
+              _context25.prev = 11;
               _context25.next = 14;
+              return this.syncOrderToBackendWithReturn(true);
+            case 14:
+              console.log('[Checkout] EFTPOS 支付后订单同步完成 (已标记为手动同步):', {
+                订单ID: this.store.currentOrder.order_id,
+                是否已同步: this.store.isOrderSynced
+              });
+              _context25.next = 22;
+              break;
+            case 17:
+              _context25.prev = 17;
+              _context25.t0 = _context25["catch"](11);
+              console.error('[Checkout] EFTPOS 支付后订单同步失败:', _context25.t0);
+              // 不抛出错误，避免影响支付流程，但记录错误
+              _context25.next = 22;
+              return this.handleError(new Error("EFTPOS \u652F\u4ED8\u540E\u8BA2\u5355\u540C\u6B65\u5931\u8D25: ".concat(_context25.t0 instanceof Error ? _context25.t0.message : String(_context25.t0))), CheckoutErrorType.OrderCreationFailed);
+            case 22:
+              _context25.next = 24;
+              return this.updateStateAmountToRemaining();
+            case 24:
+              _context25.next = 26;
               return this.core.effects.emit(CheckoutHooks.OnPaymentStarted, {
                 orderUuid: this.store.currentOrder.uuid,
                 paymentMethodCode: paymentItem.code,
                 amount: String(paymentItem.amount),
                 timestamp: Date.now()
               });
-            case 14:
-              _context25.next = 22;
+            case 26:
+              _context25.next = 34;
               break;
-            case 16:
-              _context25.prev = 16;
-              _context25.t0 = _context25["catch"](0);
-              console.error('[Checkout] 添加支付项失败:', _context25.t0);
-              _context25.next = 21;
-              return this.handleError(_context25.t0, CheckoutErrorType.PaymentFailed);
-            case 21:
-              throw _context25.t0;
-            case 22:
+            case 28:
+              _context25.prev = 28;
+              _context25.t1 = _context25["catch"](0);
+              console.error('[Checkout] 添加支付项失败:', _context25.t1);
+              _context25.next = 33;
+              return this.handleError(_context25.t1, CheckoutErrorType.PaymentFailed);
+            case 33:
+              throw _context25.t1;
+            case 34:
             case "end":
               return _context25.stop();
           }
-        }, _callee25, this, [[0, 16]]);
+        }, _callee25, this, [[0, 28], [11, 17]]);
       }));
       function addPaymentItemAsync(_x16) {
         return _addPaymentItemAsync.apply(this, arguments);
@@ -2569,10 +2543,10 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               allPaymentItems = _context33.sent;
               // 过滤掉带有 voucher_id 的支付项（代金券类支付项）
               filteredPaymentItems = allPaymentItems.filter(function (payment) {
-                return !payment.voucher_id || payment.voucher_id.trim() === '';
+                return !payment.voucher_id;
               }); // 记录过滤结果
               voucherItems = allPaymentItems.filter(function (payment) {
-                return payment.voucher_id && payment.voucher_id.trim() !== '';
+                return payment.voucher_id;
               });
               console.log('[Checkout] 支付项过滤结果:', {
                 总支付项: allPaymentItems.length,
@@ -3436,7 +3410,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "checkOrderPaymentCompletion",
     value: (function () {
       var _checkOrderPaymentCompletion = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee47() {
-        var remainingAmount, remainingValue, totalAmount, paidAmount, currentPayments, allPaymentsHaveVoucherId;
+        var remainingAmount, remainingValue, totalAmount, paidAmount, currentPayments, hasPaymentItems, allPaymentsHaveVoucherId, shouldAutoSync;
         return _regeneratorRuntime().wrap(function _callee47$(_context47) {
           while (1) switch (_context47.prev = _context47.next) {
             case 0:
@@ -3453,7 +3427,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               remainingAmount = _context47.sent;
               remainingValue = parseFloat(remainingAmount); // 当剩余金额小于等于0时，认为订单已完成支付
               if (!(remainingValue <= 0)) {
-                _context47.next = 27;
+                _context47.next = 29;
                 break;
               }
               totalAmount = this.store.currentOrder.total_amount;
@@ -3470,18 +3444,32 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 isOrderSynced: this.store.isOrderSynced
               });
 
-              // 从 Payment 模块获取最新支付项，检查是否所有支付项都带有 voucher_id
+              // 从 Payment 模块获取最新支付项，检查自动同步条件
               _context47.next = 15;
               return this.payment.getPaymentItemsAsync(this.store.currentOrder.uuid, false // 不包括已撤销的支付项
               );
             case 15:
               currentPayments = _context47.sent;
-              allPaymentsHaveVoucherId = currentPayments.length > 0 && currentPayments.every(function (item) {
+              // 检查自动同步条件：
+              // 1. 待付金额为 0 ✓ (已在上面检查)
+              // 2. 需要有支付项
+              // 3. 支付项不能全是带 voucher_id 的数据
+              hasPaymentItems = currentPayments.length > 0;
+              allPaymentsHaveVoucherId = hasPaymentItems && currentPayments.every(function (item) {
                 return item.status !== 'voided' && item.voucher_id;
-              });
-              console.log('[Checkout] 支付项voucher_id检查:', {
+              }); // 判断是否需要自动同步订单
+              // 条件：
+              // 1. 有支付项
+              // 2. 不全是代金券支付
+              // 3. 订单未同步 OR (订单已同步但支付刚完成，需要同步最终支付状态)
+              shouldAutoSync = hasPaymentItems && !allPaymentsHaveVoucherId;
+              console.log('[Checkout] 自动同步订单条件检查:', {
                 paymentCount: currentPayments.length,
+                hasPaymentItems: hasPaymentItems,
                 allHaveVoucherId: allPaymentsHaveVoucherId,
+                isOrderSynced: this.store.isOrderSynced,
+                shouldAutoSync: shouldAutoSync,
+                reason: shouldAutoSync ? '支付完成，需要同步最终支付状态' : '跳过同步',
                 paymentItems: currentPayments.map(function (p) {
                   return {
                     uuid: p.uuid,
@@ -3492,29 +3480,24 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   };
                 })
               });
-
-              // // 如果支付完成但订单未同步，需要判断是否同步
-              // if (!this.store.isOrderSynced) {
-              //   if (allPaymentsHaveVoucherId) {
-              //     console.log('[Checkout] 所有支付项均为代金券类型，跳过订单同步');
-              //   } else {
-              //   console.log('[Checkout] 支付完成但订单未同步，开始同步订单到后端...');
-              //   await this.syncOrderToBackend();
-              //   }
-              // }
-              if (!allPaymentsHaveVoucherId) {
-                _context47.next = 22;
+              if (!shouldAutoSync) {
+                _context47.next = 26;
                 break;
               }
-              console.log('[Checkout] 所有支付项均为代金券类型，跳过订单同步');
-              _context47.next = 25;
-              break;
-            case 22:
-              console.log('[Checkout] 支付完成但订单未同步，开始同步订单到后端...');
-              _context47.next = 25;
+              console.log('[Checkout] 满足自动同步条件，开始同步订单到后端...');
+              _context47.next = 24;
               return this.syncOrderToBackend();
-            case 25:
+            case 24:
               _context47.next = 27;
+              break;
+            case 26:
+              if (!hasPaymentItems) {
+                console.log('[Checkout] 没有支付项，跳过订单同步');
+              } else if (allPaymentsHaveVoucherId) {
+                console.log('[Checkout] 所有支付项均为代金券类型，跳过订单同步');
+              }
+            case 27:
+              _context47.next = 29;
               return this.core.effects.emit(CheckoutHooks.OnOrderPaymentCompleted, {
                 orderUuid: this.store.currentOrder.uuid,
                 orderId: this.store.currentOrder.order_id,
@@ -3523,18 +3506,18 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 remainingAmount: remainingAmount,
                 timestamp: Date.now()
               });
-            case 27:
-              _context47.next = 32;
-              break;
             case 29:
-              _context47.prev = 29;
+              _context47.next = 34;
+              break;
+            case 31:
+              _context47.prev = 31;
               _context47.t0 = _context47["catch"](0);
               console.error('[Checkout] 检查订单支付完成状态失败:', _context47.t0);
-            case 32:
+            case 34:
             case "end":
               return _context47.stop();
           }
-        }, _callee47, this, [[0, 29]]);
+        }, _callee47, this, [[0, 31]]);
       }));
       function checkOrderPaymentCompletion() {
         return _checkOrderPaymentCompletion.apply(this, arguments);
@@ -3607,7 +3590,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "syncOrderToBackendWithReturn",
     value: (function () {
       var _syncOrderToBackendWithReturn = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee48() {
-        var _this$store$currentCu2, _this$store$currentOr18, _this$store$currentOr19;
+        var _this$store$currentCu2, _this$store$currentOr18, _this$store$currentOr19, _checkoutResponse3, _checkoutResponse4, _checkoutResponse5, _checkoutResponse6;
         var isManual,
           customPaymentItems,
           syncType,
@@ -3618,10 +3601,16 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
           operation,
           paymentItems,
           orderParams,
+          startTime,
           checkoutResponse,
+          submitSuccess,
+          submitError,
+          _checkoutResponse,
+          _checkoutResponse2,
           realOrderId,
-          _data3,
+          _checkoutResponse7,
           extractedOrderId,
+          _checkoutResponse8,
           updatedOrder,
           beforeManualUpdate,
           finalOrderId,
@@ -3755,31 +3744,70 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 console.log('[Checkout] 创建新订单操作');
               }
 
-              // 调用 Order 模块的专用 createOrderByCheckout 方法
-              _context48.next = 24;
+              // 发送下单接口请求开始事件
+              startTime = Date.now();
+              _context48.next = 25;
+              return this.core.effects.emit(CheckoutHooks.OnOrderSubmitStart, {
+                orderUuid: this.store.currentOrder.uuid,
+                operation: isUpdateOperation ? 'update' : 'create',
+                isManual: isManual,
+                paymentItemCount: paymentItems.length,
+                timestamp: startTime
+              });
+            case 25:
+              submitSuccess = false;
+              _context48.prev = 26;
+              _context48.next = 29;
               return this.order.createOrderByCheckout(orderParams);
-            case 24:
+            case 29:
               checkoutResponse = _context48.sent;
+              submitSuccess = true;
+              console.log('[Checkout] 下单接口调用成功');
+              _context48.next = 40;
+              break;
+            case 34:
+              _context48.prev = 34;
+              _context48.t1 = _context48["catch"](26);
+              submitSuccess = false;
+              submitError = _context48.t1 instanceof Error ? _context48.t1.message : String(_context48.t1);
+              console.error('[Checkout] 下单接口调用失败:', submitError);
+              throw _context48.t1;
+            case 40:
+              _context48.prev = 40;
+              _context48.next = 43;
+              return this.core.effects.emit(CheckoutHooks.OnOrderSubmitEnd, {
+                success: submitSuccess,
+                orderUuid: this.store.currentOrder.uuid,
+                operation: isUpdateOperation ? 'update' : 'create',
+                isManual: isManual,
+                orderId: submitSuccess ? ((_checkoutResponse = checkoutResponse) === null || _checkoutResponse === void 0 || (_checkoutResponse = _checkoutResponse.data) === null || _checkoutResponse === void 0 ? void 0 : _checkoutResponse.order_id) || ((_checkoutResponse2 = checkoutResponse) === null || _checkoutResponse2 === void 0 ? void 0 : _checkoutResponse2.order_id) : undefined,
+                error: submitError,
+                duration: Date.now() - startTime,
+                timestamp: Date.now()
+              });
+            case 43:
+              return _context48.finish(40);
+            case 44:
               console.log('[Checkout] 后端返回的响应数据:', {
-                status: checkoutResponse === null || checkoutResponse === void 0 ? void 0 : checkoutResponse.status,
-                code: checkoutResponse === null || checkoutResponse === void 0 ? void 0 : checkoutResponse.code,
-                message: checkoutResponse === null || checkoutResponse === void 0 ? void 0 : checkoutResponse.message,
-                data: checkoutResponse === null || checkoutResponse === void 0 ? void 0 : checkoutResponse.data
+                status: (_checkoutResponse3 = checkoutResponse) === null || _checkoutResponse3 === void 0 ? void 0 : _checkoutResponse3.status,
+                code: (_checkoutResponse4 = checkoutResponse) === null || _checkoutResponse4 === void 0 ? void 0 : _checkoutResponse4.code,
+                message: (_checkoutResponse5 = checkoutResponse) === null || _checkoutResponse5 === void 0 ? void 0 : _checkoutResponse5.message,
+                data: (_checkoutResponse6 = checkoutResponse) === null || _checkoutResponse6 === void 0 ? void 0 : _checkoutResponse6.data
               });
               if (!isUpdateOperation) {
-                _context48.next = 31;
+                _context48.next = 50;
                 break;
               }
               // 更新操作：使用现有的订单ID
               realOrderId = currentOrderId;
               console.log("[Checkout] \u8BA2\u5355\u66F4\u65B0\u6210\u529F\uFF0C\u8BA2\u5355ID: ".concat(realOrderId));
-              _context48.next = 52;
+              _context48.next = 71;
               break;
-            case 31:
+            case 50:
               // 创建操作：从响应中提取新的订单ID
-              extractedOrderId = checkoutResponse === null || checkoutResponse === void 0 || (_data3 = checkoutResponse.data) === null || _data3 === void 0 ? void 0 : _data3.order_id; // 如果data.order_id不存在，尝试直接从根级获取
+              extractedOrderId = (_checkoutResponse7 = checkoutResponse) === null || _checkoutResponse7 === void 0 || (_checkoutResponse7 = _checkoutResponse7.data) === null || _checkoutResponse7 === void 0 ? void 0 : _checkoutResponse7.order_id; // 如果data.order_id不存在，尝试直接从根级获取
               if (!extractedOrderId) {
-                extractedOrderId = checkoutResponse === null || checkoutResponse === void 0 ? void 0 : checkoutResponse.order_id;
+                extractedOrderId = (_checkoutResponse8 = checkoutResponse) === null || _checkoutResponse8 === void 0 ? void 0 : _checkoutResponse8.order_id;
               }
 
               // 确保转换为字符串类型
@@ -3787,11 +3815,11 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 extractedOrderId = String(extractedOrderId);
               }
               if (extractedOrderId) {
-                _context48.next = 36;
+                _context48.next = 55;
                 break;
               }
               throw new Error('后端返回的订单信息中未包含订单ID');
-            case 36:
+            case 55:
               realOrderId = extractedOrderId;
               console.log('[Checkout] 订单创建成功，真实订单ID:', realOrderId);
 
@@ -3801,10 +3829,10 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 oldOrderId: this.store.currentOrder.order_id,
                 newOrderId: realOrderId
               });
-              _context48.prev = 39;
-              _context48.next = 42;
+              _context48.prev = 58;
+              _context48.next = 61;
               return this.payment.replaceOrderIdByUuidAsync(this.store.currentOrder.uuid, realOrderId);
-            case 42:
+            case 61:
               updatedOrder = _context48.sent;
               console.log('[Checkout] Payment模块替换订单ID结果:', {
                 wasSuccessful: !!updatedOrder,
@@ -3831,22 +3859,22 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   目标ID: realOrderId
                 });
               }
-              _context48.next = 52;
+              _context48.next = 71;
               break;
-            case 47:
-              _context48.prev = 47;
-              _context48.t1 = _context48["catch"](39);
-              console.error('[Checkout] 调用Payment模块替换订单ID时发生错误:', _context48.t1);
+            case 66:
+              _context48.prev = 66;
+              _context48.t2 = _context48["catch"](58);
+              console.error('[Checkout] 调用Payment模块替换订单ID时发生错误:', _context48.t2);
 
               // 发生错误时也进行手动替换
               this.store.currentOrder.order_id = realOrderId;
               console.log('[Checkout] 错误恢复：手动设置订单ID:', realOrderId);
-            case 52:
+            case 71:
               // 标记订单已同步
               this.store.isOrderSynced = true;
 
               // 触发订单同步完成事件
-              _context48.next = 55;
+              _context48.next = 74;
               return this.core.effects.emit(CheckoutHooks.OnOrderSynced, {
                 orderUuid: this.store.currentOrder.uuid,
                 realOrderId: realOrderId,
@@ -3855,7 +3883,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 isManual: isManual,
                 response: checkoutResponse
               });
-            case 55:
+            case 74:
               // 验证最终状态
               finalOrderId = this.store.currentOrder.order_id;
               finalIsVirtual = this.isVirtualOrderId(finalOrderId || '');
@@ -3873,11 +3901,11 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
 
               // 返回真实订单ID
               return _context48.abrupt("return", realOrderId);
-            case 60:
+            case 79:
             case "end":
               return _context48.stop();
           }
-        }, _callee48, this, [[39, 47]]);
+        }, _callee48, this, [[26, 34, 40, 44], [58, 66]]);
       }));
       function syncOrderToBackendWithReturn() {
         return _syncOrderToBackendWithReturn.apply(this, arguments);

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

@@ -393,7 +393,11 @@ export declare enum CheckoutHooks {
     /** 订单取消 */
     OnOrderCancelled = "checkout:onOrderCancelled",
     /** 订单状态已清理 */
-    OnOrderCleared = "checkout:onOrderCleared"
+    OnOrderCleared = "checkout:onOrderCleared",
+    /** 下单接口请求开始 */
+    OnOrderSubmitStart = "checkout:onOrderSubmitStart",
+    /** 下单接口请求完成 */
+    OnOrderSubmitEnd = "checkout:onOrderSubmitEnd"
 }
 /**
  * 结账状态数据
@@ -824,4 +828,34 @@ export interface CheckoutEventData {
         } | null;
         timestamp: number;
     };
+    /** 下单接口请求开始事件 */
+    orderSubmitStart: {
+        /** 订单UUID */
+        orderUuid: string;
+        /** 操作类型 */
+        operation: 'create' | 'update';
+        /** 是否手动同步 */
+        isManual: boolean;
+        /** 支付项数量 */
+        paymentItemCount: number;
+        timestamp: number;
+    };
+    /** 下单接口请求完成事件 */
+    orderSubmitEnd: {
+        /** 是否成功 */
+        success: boolean;
+        /** 订单UUID */
+        orderUuid: string;
+        /** 操作类型 */
+        operation: 'create' | 'update';
+        /** 是否手动同步 */
+        isManual: boolean;
+        /** 返回的订单ID（成功时） */
+        orderId?: string;
+        /** 错误信息（失败时） */
+        error?: string;
+        /** 耗时（毫秒） */
+        duration?: number;
+        timestamp: number;
+    };
 }

package/dist/solution/Checkout/types.js

@@ -119,6 +119,8 @@ export var CheckoutHooks = /*#__PURE__*/function (CheckoutHooks) {
   CheckoutHooks["OnShopDiscountChanged"] = "checkout:onShopDiscountChanged";
   CheckoutHooks["OnOrderCancelled"] = "checkout:onOrderCancelled";
   CheckoutHooks["OnOrderCleared"] = "checkout:onOrderCleared";
+  CheckoutHooks["OnOrderSubmitStart"] = "checkout:onOrderSubmitStart";
+  CheckoutHooks["OnOrderSubmitEnd"] = "checkout:onOrderSubmitEnd";
   return CheckoutHooks;
 }({});
 

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

@@ -47,6 +47,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     private setDiscountList;
     private getDiscountList;
     private getCustomerWallet;
+    private bestDiscount;
     private loadPrepareConfig;
 }
 export default ShopDiscountImpl;

package/dist/solution/ShopDiscount/index.js

@@ -50,7 +50,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       customer: null,
       productList: [],
       discount: null,
-      rules: null
+      rules: null,
+      originalDiscountList: []
     };
     return _this;
   }
@@ -360,26 +361,27 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 discountList: this.getDiscountList()
               }, newProductList = _ref3.productList, newDiscountList = _ref3.discountList, isAvailable = _ref3.isAvailable;
               if (!isAvailable) {
-                _context5.next = 20;
+                _context5.next = 21;
                 break;
               }
               this.setDiscountList(newDiscountList || []);
+              this.store.originalDiscountList = newDiscountList || [];
               this.setProductList(newProductList || []);
               if (!(this.isWalkIn() && resultDiscountList.length && ((_this$options$otherPa6 = this.options.otherParams) === null || _this$options$otherPa6 === void 0 ? void 0 : _this$options$otherPa6.platform) === 'shop')) {
-                _context5.next = 20;
+                _context5.next = 21;
                 break;
               }
-              _context5.next = 20;
+              _context5.next = 21;
               return this.getCustomerWallet(resultDiscountList[0].customer_id);
-            case 20:
+            case 21:
               return _context5.abrupt("return", {
                 type: "clientCalc",
                 isAvailable: isAvailable || false,
                 productList: newProductList || this.store.productList || [],
                 discountList: newDiscountList || this.getDiscountList()
               });
-            case 23:
-              _context5.prev = 23;
+            case 24:
+              _context5.prev = 24;
               _context5.t1 = _context5["catch"](0);
               console.error('[ShopDiscount] 扫码出错:', _context5.t1);
               return _context5.abrupt("return", {
@@ -388,11 +390,11 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 productList: this.store.productList || [],
                 discountList: this.getDiscountList()
               });
-            case 27:
+            case 28:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[0, 23]]);
+        }, _callee5, this, [[0, 24]]);
       }));
       function scanCode(_x4, _x5) {
         return _scanCode.apply(this, arguments);
@@ -580,20 +582,52 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
         return _getCustomerWallet.apply(this, arguments);
       }
       return getCustomerWallet;
-    }() // 加载准备配置
+    }()
   }, {
-    key: "loadPrepareConfig",
+    key: "bestDiscount",
     value: function () {
-      var _loadPrepareConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(params) {
-        var _this$getCustomer2, _this$store$discount7, _this$getDiscountList, _this$store$productLi, customerId, goodPassList, scanDiscount, scanDiscountIds, newGoodPassList, newDiscountList, result;
+      var _bestDiscount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+        var _this$store$productLi;
+        var newDiscountList, result;
         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
-              _context8.prev = 0;
+              newDiscountList = this.store.originalDiscountList;
+              this.setDiscountList(newDiscountList);
+              if (!((_this$store$productLi = this.store.productList) !== null && _this$store$productLi !== void 0 && _this$store$productLi.length)) {
+                _context8.next = 6;
+                break;
+              }
+              result = this.calcDiscount(this.store.productList);
+              _context8.next = 6;
+              return this.core.effects.emit(ShopDiscountHooks.onLoadPrepareCalcResult, result);
+            case 6:
+              _context8.next = 8;
+              return this.core.effects.emit(ShopDiscountHooks.onLoadDiscountList, newDiscountList);
+            case 8:
+            case "end":
+              return _context8.stop();
+          }
+        }, _callee8, this);
+      }));
+      function bestDiscount() {
+        return _bestDiscount.apply(this, arguments);
+      }
+      return bestDiscount;
+    }() // 加载准备配置
+  }, {
+    key: "loadPrepareConfig",
+    value: function () {
+      var _loadPrepareConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(params) {
+        var _this$getCustomer2, _this$store$discount7, _this$getDiscountList, _this$store$productLi2, customerId, goodPassList, scanDiscount, scanDiscountIds, newGoodPassList, newDiscountList, result;
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
+            case 0:
+              _context9.prev = 0;
               customerId = params.customerId || ((_this$getCustomer2 = this.getCustomer()) === null || _this$getCustomer2 === void 0 ? void 0 : _this$getCustomer2.id); // if (customerId === 1 || !customerId) {
               //   return
               // }
-              _context8.next = 4;
+              _context9.next = 4;
               return (_this$store$discount7 = this.store.discount) === null || _this$store$discount7 === void 0 ? void 0 : _this$store$discount7.loadPrepareConfig({
                 customer_id: customerId,
                 action: 'create',
@@ -601,7 +635,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 with_discount_card: 1
               });
             case 4:
-              goodPassList = _context8.sent;
+              goodPassList = _context9.sent;
               scanDiscount = (_this$getDiscountList = this.getDiscountList()) === null || _this$getDiscountList === void 0 ? void 0 : _this$getDiscountList.filter(function (item) {
                 return item.isScan;
               }); // goodPassList 里可能有 scanDiscount 重合的部分，goodPassList 需要剔除
@@ -612,29 +646,30 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 return !scanDiscountIds.includes(n.id);
               });
               newDiscountList = [].concat(_toConsumableArray(scanDiscount), _toConsumableArray(newGoodPassList || []));
+              this.store.originalDiscountList = newDiscountList;
               this.setDiscountList(newDiscountList || []);
-              if (!((_this$store$productLi = this.store.productList) !== null && _this$store$productLi !== void 0 && _this$store$productLi.length)) {
-                _context8.next = 14;
+              if (!((_this$store$productLi2 = this.store.productList) !== null && _this$store$productLi2 !== void 0 && _this$store$productLi2.length)) {
+                _context9.next = 15;
                 break;
               }
               result = this.calcDiscount(this.store.productList);
-              _context8.next = 14;
+              _context9.next = 15;
               return this.core.effects.emit(ShopDiscountHooks.onLoadPrepareCalcResult, result);
-            case 14:
-              _context8.next = 16;
+            case 15:
+              _context9.next = 17;
               return this.core.effects.emit(ShopDiscountHooks.onLoadDiscountList, newDiscountList);
-            case 16:
-              _context8.next = 21;
+            case 17:
+              _context9.next = 22;
               break;
-            case 18:
-              _context8.prev = 18;
-              _context8.t0 = _context8["catch"](0);
-              console.error('[ShopDiscount] 加载准备配置出错:', _context8.t0);
-            case 21:
+            case 19:
+              _context9.prev = 19;
+              _context9.t0 = _context9["catch"](0);
+              console.error('[ShopDiscount] 加载准备配置出错:', _context9.t0);
+            case 22:
             case "end":
-              return _context8.stop();
+              return _context9.stop();
           }
-        }, _callee8, this, [[0, 18]]);
+        }, _callee9, this, [[0, 19]]);
       }));
       function loadPrepareConfig(_x8) {
         return _loadPrepareConfig.apply(this, arguments);

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

@@ -1,4 +1,4 @@
-import { DiscountModule } from '../../modules/Discount';
+import { DiscountModule, Discount } from '../../modules/Discount';
 import { RulesModule } from '../../modules/Rules';
 export declare enum ShopDiscountHooks {
     onInited = "shopDiscount:onInited",
@@ -22,4 +22,5 @@ export interface ShopDiscountState {
     discount: DiscountModule | null;
     rules: RulesModule | null;
     productList: Record<string, any>[];
+    originalDiscountList: Discount[];
 }

package/lib/modules/Discount/index.d.ts

@@ -30,3 +30,4 @@ export declare class DiscountModule extends BaseModule implements Module, Discou
     clear(): Promise<void>;
     storeChange(): void;
 }
+export type { Discount } from './types';

package/lib/modules/Order/index.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/modules/Order/index.ts
@@ -25,6 +35,7 @@ module.exports = __toCommonJS(Order_exports);
 var import_BaseModule = require("../BaseModule");
 var import_utils = require("./utils");
 var import_utils2 = require("../Product/utils");
+var import_dayjs = __toESM(require("dayjs"));
 var OrderModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -143,6 +154,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         orderData.bookings = [];
         orderData.relation_products = [];
       }
+      if (!params.order_id && !orderData.schedule_date) {
+        orderData.schedule_date = (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss");
+      }
       console.log("[Order] 调用后端接口创建订单:", {
         url: "/order/checkout",
         orderType: orderData.type,

package/lib/solution/Checkout/index.js

@@ -908,6 +908,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
    * @throws 当前没有活跃订单时抛出错误
    */
   async addPaymentItemAsync(paymentItem) {
+    var _a, _b;
     try {
       if (!this.store.currentOrder) {
         throw (0, import_utils.createCheckoutError)(
@@ -930,12 +931,29 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         paymentItem
       );
       console.log("[Checkout] 支付项添加成功");
-      const currentOrderId = this.store.currentOrder.order_id;
-      const isCurrentOrderReal = currentOrderId && !this.isVirtualOrderId(currentOrderId);
-      console.log("[Checkout] 准备同步订单数据:", {
-        当前订单ID: currentOrderId,
-        是否为真实ID: isCurrentOrderReal
+      const isEftposPayment = ((_a = paymentItem.type) == null ? void 0 : _a.toLowerCase()) === "eftpos" || ((_b = paymentItem.code) == null ? void 0 : _b.toUpperCase().includes("EFTPOS"));
+      console.log("[Checkout] EFTPOS 支付检查:", {
+        paymentCode: paymentItem.code,
+        paymentType: paymentItem.type,
+        isEftposPayment,
+        currentOrderSynced: this.store.isOrderSynced
       });
+      if (isEftposPayment) {
+        console.log("[Checkout] 检测到 EFTPOS 支付，立即同步订单到后端...");
+        try {
+          await this.syncOrderToBackendWithReturn(true);
+          console.log("[Checkout] EFTPOS 支付后订单同步完成 (已标记为手动同步):", {
+            订单ID: this.store.currentOrder.order_id,
+            是否已同步: this.store.isOrderSynced
+          });
+        } catch (error) {
+          console.error("[Checkout] EFTPOS 支付后订单同步失败:", error);
+          await this.handleError(
+            new Error(`EFTPOS 支付后订单同步失败: ${error instanceof Error ? error.message : String(error)}`),
+            import_types.CheckoutErrorType.OrderCreationFailed
+          );
+        }
+      }
       await this.updateStateAmountToRemaining();
       await this.core.effects.emit(import_types.CheckoutHooks.OnPaymentStarted, {
         orderUuid: this.store.currentOrder.uuid,
@@ -1492,10 +1510,10 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         this.store.currentOrder.uuid
       );
       const filteredPaymentItems = allPaymentItems.filter(
-        (payment) => !payment.voucher_id || payment.voucher_id.trim() === ""
+        (payment) => !payment.voucher_id
       );
       const voucherItems = allPaymentItems.filter(
-        (payment) => payment.voucher_id && payment.voucher_id.trim() !== ""
+        (payment) => payment.voucher_id
       );
       console.log("[Checkout] 支付项过滤结果:", {
         总支付项: allPaymentItems.length,
@@ -2023,12 +2041,18 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           false
           // 不包括已撤销的支付项
         );
-        const allPaymentsHaveVoucherId = currentPayments.length > 0 && currentPayments.every(
+        const hasPaymentItems = currentPayments.length > 0;
+        const allPaymentsHaveVoucherId = hasPaymentItems && currentPayments.every(
           (item) => item.status !== "voided" && item.voucher_id
         );
-        console.log("[Checkout] 支付项voucher_id检查:", {
+        const shouldAutoSync = hasPaymentItems && !allPaymentsHaveVoucherId;
+        console.log("[Checkout] 自动同步订单条件检查:", {
           paymentCount: currentPayments.length,
+          hasPaymentItems,
           allHaveVoucherId: allPaymentsHaveVoucherId,
+          isOrderSynced: this.store.isOrderSynced,
+          shouldAutoSync,
+          reason: shouldAutoSync ? "支付完成，需要同步最终支付状态" : "跳过同步",
           paymentItems: currentPayments.map((p) => ({
             uuid: p.uuid,
             code: p.code,
@@ -2037,11 +2061,15 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
             status: p.status
           }))
         });
-        if (allPaymentsHaveVoucherId) {
-          console.log("[Checkout] 所有支付项均为代金券类型，跳过订单同步");
-        } else {
-          console.log("[Checkout] 支付完成但订单未同步，开始同步订单到后端...");
+        if (shouldAutoSync) {
+          console.log("[Checkout] 满足自动同步条件，开始同步订单到后端...");
           await this.syncOrderToBackend();
+        } else {
+          if (!hasPaymentItems) {
+            console.log("[Checkout] 没有支付项，跳过订单同步");
+          } else if (allPaymentsHaveVoucherId) {
+            console.log("[Checkout] 所有支付项均为代金券类型，跳过订单同步");
+          }
         }
         await this.core.effects.emit(import_types.CheckoutHooks.OnOrderPaymentCompleted, {
           orderUuid: this.store.currentOrder.uuid,
@@ -2104,7 +2132,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
    * @returns 后端返回的真实订单ID
    */
   async syncOrderToBackendWithReturn(isManual = false, customPaymentItems) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     if (!this.store.localOrderData || !this.store.currentOrder) {
       throw new Error("缺少必要的订单数据，无法同步到后端");
     }
@@ -2204,7 +2232,38 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
     } else {
       console.log("[Checkout] 创建新订单操作");
     }
-    const checkoutResponse = await this.order.createOrderByCheckout(orderParams);
+    const startTime = Date.now();
+    await this.core.effects.emit(import_types.CheckoutHooks.OnOrderSubmitStart, {
+      orderUuid: this.store.currentOrder.uuid,
+      operation: isUpdateOperation ? "update" : "create",
+      isManual,
+      paymentItemCount: paymentItems.length,
+      timestamp: startTime
+    });
+    let checkoutResponse;
+    let submitSuccess = false;
+    let submitError;
+    try {
+      checkoutResponse = await this.order.createOrderByCheckout(orderParams);
+      submitSuccess = true;
+      console.log("[Checkout] 下单接口调用成功");
+    } catch (error) {
+      submitSuccess = false;
+      submitError = error instanceof Error ? error.message : String(error);
+      console.error("[Checkout] 下单接口调用失败:", submitError);
+      throw error;
+    } finally {
+      await this.core.effects.emit(import_types.CheckoutHooks.OnOrderSubmitEnd, {
+        success: submitSuccess,
+        orderUuid: this.store.currentOrder.uuid,
+        operation: isUpdateOperation ? "update" : "create",
+        isManual,
+        orderId: submitSuccess ? ((_d = checkoutResponse == null ? void 0 : checkoutResponse.data) == null ? void 0 : _d.order_id) || (checkoutResponse == null ? void 0 : checkoutResponse.order_id) : void 0,
+        error: submitError,
+        duration: Date.now() - startTime,
+        timestamp: Date.now()
+      });
+    }
     console.log("[Checkout] 后端返回的响应数据:", {
       status: checkoutResponse == null ? void 0 : checkoutResponse.status,
       code: checkoutResponse == null ? void 0 : checkoutResponse.code,
@@ -2216,7 +2275,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       realOrderId = currentOrderId;
       console.log(`[Checkout] 订单更新成功，订单ID: ${realOrderId}`);
     } else {
-      let extractedOrderId = (_d = checkoutResponse == null ? void 0 : checkoutResponse.data) == null ? void 0 : _d.order_id;
+      let extractedOrderId = (_e = checkoutResponse == null ? void 0 : checkoutResponse.data) == null ? void 0 : _e.order_id;
       if (!extractedOrderId) {
         extractedOrderId = checkoutResponse == null ? void 0 : checkoutResponse.order_id;
       }

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

@@ -393,7 +393,11 @@ export declare enum CheckoutHooks {
     /** 订单取消 */
     OnOrderCancelled = "checkout:onOrderCancelled",
     /** 订单状态已清理 */
-    OnOrderCleared = "checkout:onOrderCleared"
+    OnOrderCleared = "checkout:onOrderCleared",
+    /** 下单接口请求开始 */
+    OnOrderSubmitStart = "checkout:onOrderSubmitStart",
+    /** 下单接口请求完成 */
+    OnOrderSubmitEnd = "checkout:onOrderSubmitEnd"
 }
 /**
  * 结账状态数据
@@ -824,4 +828,34 @@ export interface CheckoutEventData {
         } | null;
         timestamp: number;
     };
+    /** 下单接口请求开始事件 */
+    orderSubmitStart: {
+        /** 订单UUID */
+        orderUuid: string;
+        /** 操作类型 */
+        operation: 'create' | 'update';
+        /** 是否手动同步 */
+        isManual: boolean;
+        /** 支付项数量 */
+        paymentItemCount: number;
+        timestamp: number;
+    };
+    /** 下单接口请求完成事件 */
+    orderSubmitEnd: {
+        /** 是否成功 */
+        success: boolean;
+        /** 订单UUID */
+        orderUuid: string;
+        /** 操作类型 */
+        operation: 'create' | 'update';
+        /** 是否手动同步 */
+        isManual: boolean;
+        /** 返回的订单ID（成功时） */
+        orderId?: string;
+        /** 错误信息（失败时） */
+        error?: string;
+        /** 耗时（毫秒） */
+        duration?: number;
+        timestamp: number;
+    };
 }

package/lib/solution/Checkout/types.js

@@ -71,6 +71,8 @@ var CheckoutHooks = /* @__PURE__ */ ((CheckoutHooks2) => {
   CheckoutHooks2["OnShopDiscountChanged"] = "checkout:onShopDiscountChanged";
   CheckoutHooks2["OnOrderCancelled"] = "checkout:onOrderCancelled";
   CheckoutHooks2["OnOrderCleared"] = "checkout:onOrderCleared";
+  CheckoutHooks2["OnOrderSubmitStart"] = "checkout:onOrderSubmitStart";
+  CheckoutHooks2["OnOrderSubmitEnd"] = "checkout:onOrderSubmitEnd";
   return CheckoutHooks2;
 })(CheckoutHooks || {});
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -47,6 +47,7 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     private setDiscountList;
     private getDiscountList;
     private getCustomerWallet;
+    private bestDiscount;
     private loadPrepareConfig;
 }
 export default ShopDiscountImpl;

package/lib/solution/ShopDiscount/index.js

@@ -50,7 +50,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       customer: null,
       productList: [],
       discount: null,
-      rules: null
+      rules: null,
+      originalDiscountList: []
     };
   }
   // =========== 生命周期方法 ===========
@@ -241,6 +242,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       };
       if (isAvailable) {
         this.setDiscountList(newDiscountList || []);
+        this.store.originalDiscountList = newDiscountList || [];
         this.setProductList(newProductList || []);
         if (this.isWalkIn() && resultDiscountList.length && ((_b = this.options.otherParams) == null ? void 0 : _b.platform) === "shop") {
           await this.getCustomerWallet(
@@ -388,6 +390,22 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       console.error("[ShopDiscount] 获取客户钱包信息出错:", error);
     }
   }
+  async bestDiscount() {
+    var _a;
+    const newDiscountList = this.store.originalDiscountList;
+    this.setDiscountList(newDiscountList);
+    if ((_a = this.store.productList) == null ? void 0 : _a.length) {
+      const result = this.calcDiscount(this.store.productList);
+      await this.core.effects.emit(
+        import_types.ShopDiscountHooks.onLoadPrepareCalcResult,
+        result
+      );
+    }
+    await this.core.effects.emit(
+      import_types.ShopDiscountHooks.onLoadDiscountList,
+      newDiscountList
+    );
+  }
   // 加载准备配置
   async loadPrepareConfig(params) {
     var _a, _b, _c, _d;
@@ -405,6 +423,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       const scanDiscountIds = scanDiscount.map((n) => n.id);
       const newGoodPassList = goodPassList == null ? void 0 : goodPassList.filter((n) => !scanDiscountIds.includes(n.id));
       const newDiscountList = [...scanDiscount, ...newGoodPassList || []];
+      this.store.originalDiscountList = newDiscountList;
       this.setDiscountList(newDiscountList || []);
       if ((_d = this.store.productList) == null ? void 0 : _d.length) {
         const result = this.calcDiscount(this.store.productList);

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

@@ -1,4 +1,4 @@
-import { DiscountModule } from '../../modules/Discount';
+import { DiscountModule, Discount } from '../../modules/Discount';
 import { RulesModule } from '../../modules/Rules';
 export declare enum ShopDiscountHooks {
     onInited = "shopDiscount:onInited",
@@ -22,4 +22,5 @@ export interface ShopDiscountState {
     discount: DiscountModule | null;
     rules: RulesModule | null;
     productList: Record<string, any>[];
+    originalDiscountList: Discount[];
 }

package/package.json

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