@pisell/pisellos 2.3.5 → 2.3.6

package/dist/core/index.js

@@ -45,7 +45,7 @@ var PisellOSCore = /*#__PURE__*/function () {
       this.serverOptions = options.server;
     }
     this.initialize(options);
-    console.log('constructor12');
+    console.log('constructor1234');
   }
   _createClass(PisellOSCore, [{
     key: "initialize",

package/dist/model/strategy/adapter/promotion/index.js

@@ -1,9 +0,0 @@
-// 导出评估器
-export { PromotionEvaluator } from "./evaluator";
-
-// 导出适配器
-export { PromotionAdapter } from "./adapter";
-export { default } from "./adapter";
-
-// 导出策略配置示例常量
-export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY } from "./examples";

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

@@ -154,10 +154,21 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private calculatePaymentTotal;
     private getDepositAmount;
     private normalizeDepositAmount;
+    private getLastOrderDepositSnapshot;
+    private getLastOrderSubmitSnapshot;
     private applyDepositAmountToSummary;
+    private applyLastOrderDepositSnapshot;
     private isDepositOrder;
     private getOrderExpectedAmount;
     private isDepositCovered;
+    getPaymentCompletion(payments?: OrderPaymentSource[]): {
+        isFullyPaid: boolean;
+        isOrderFullyPaid: boolean;
+        isDepositFullyPaid: boolean;
+        paymentStage: 'deposit' | 'normal';
+        depositAmount: string;
+        orderExpectedAmount: string;
+    };
     private calculateDepositPaidAmount;
     private resolveNextOrderPaymentType;
     private normalizePaymentSource;
@@ -431,7 +442,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/dist/modules/Order/index.js

@@ -1253,6 +1253,35 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function normalizeDepositAmount(amount) {
       return Decimal.max(new Decimal(Number(amount) || 0), 0).toDecimalPlaces(2).toFixed(2);
     }
+  }, {
+    key: "getLastOrderDepositSnapshot",
+    value: function getLastOrderDepositSnapshot() {
+      var _lastOrderInfo$deposi, _lastOrderInfo$summar;
+      var lastOrderInfo = this.store.lastOrderInfo;
+      if (!lastOrderInfo || _typeof(lastOrderInfo) !== 'object') return null;
+      var rawDepositAmount = (_lastOrderInfo$deposi = lastOrderInfo.deposit_amount) !== null && _lastOrderInfo$deposi !== void 0 ? _lastOrderInfo$deposi : (_lastOrderInfo$summar = lastOrderInfo.summary) === null || _lastOrderInfo$summar === void 0 ? void 0 : _lastOrderInfo$summar.deposit_amount;
+      var depositAmount = this.normalizeDepositAmount(rawDepositAmount !== null && rawDepositAmount !== void 0 ? rawDepositAmount : 0);
+      var hasDepositAmount = new Decimal(depositAmount).gt(0);
+      var isDeposit = Number(lastOrderInfo.is_deposit) === 1 || hasDepositAmount;
+      if (!isDeposit || !hasDepositAmount) return null;
+      return {
+        isDeposit: 1,
+        depositAmount: depositAmount
+      };
+    }
+  }, {
+    key: "getLastOrderSubmitSnapshot",
+    value: function getLastOrderSubmitSnapshot() {
+      var lastOrderInfo = this.store.lastOrderInfo;
+      if (!lastOrderInfo || _typeof(lastOrderInfo) !== 'object') return {};
+      var businessCode = lastOrderInfo.business_code;
+      var type = lastOrderInfo.type;
+      return _objectSpread(_objectSpread({}, typeof businessCode === 'string' && businessCode ? {
+        businessCode: businessCode
+      } : {}), typeof type === 'string' && type ? {
+        type: type
+      } : {});
+    }
   }, {
     key: "applyDepositAmountToSummary",
     value: function applyDepositAmountToSummary(tempOrder, summary, amount) {
@@ -1271,6 +1300,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       tempOrder.is_deposit = hasDepositAmount ? 1 : 0;
       return nextSummary;
     }
+  }, {
+    key: "applyLastOrderDepositSnapshot",
+    value: function applyLastOrderDepositSnapshot(tempOrder, summary) {
+      var snapshot = this.getLastOrderDepositSnapshot();
+      if (!snapshot) return summary;
+      var existedDeposit = summary.deposit && _typeof(summary.deposit) === 'object' ? summary.deposit : undefined;
+      var nextSummary = _objectSpread(_objectSpread({}, summary), {}, {
+        deposit_amount: snapshot.depositAmount,
+        deposit: _objectSpread(_objectSpread({}, existedDeposit || {}), {}, {
+          total: snapshot.depositAmount,
+          deposit_policy_ids: (existedDeposit === null || existedDeposit === void 0 ? void 0 : existedDeposit.deposit_policy_ids) || [],
+          hasDeposit: true
+        })
+      });
+      tempOrder.deposit_amount = snapshot.depositAmount;
+      tempOrder.is_deposit = snapshot.isDeposit;
+      return nextSummary;
+    }
   }, {
     key: "isDepositOrder",
     value: function isDepositOrder(tempOrder, depositAmount) {
@@ -1289,6 +1336,32 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (depositAmount.lte(0)) return false;
       return params.paidAmount.gte(depositAmount);
     }
+  }, {
+    key: "getPaymentCompletion",
+    value: function getPaymentCompletion(payments) {
+      var tempOrder = this.ensureTempOrder();
+      var summary = this.store.summary || createEmptySummary();
+      var paymentList = payments || tempOrder.payments || [];
+      var refundAmount = this.getSummaryRefundAmount(summary);
+      var netPaidAmount = Decimal.max(this.calculatePaymentTotal(paymentList).minus(refundAmount), 0);
+      var depositAmount = this.getDepositAmount(tempOrder, summary);
+      var orderExpectedAmount = this.getOrderExpectedAmount(summary);
+      var isDepositFullyPaid = this.isDepositCovered({
+        tempOrder: tempOrder,
+        summary: summary,
+        paidAmount: netPaidAmount
+      });
+      var isOrderFullyPaid = orderExpectedAmount.lte(0) ? true : netPaidAmount.gte(orderExpectedAmount);
+      var paymentStage = this.isDepositOrder(tempOrder, depositAmount) && !isDepositFullyPaid ? 'deposit' : 'normal';
+      return {
+        isFullyPaid: isOrderFullyPaid,
+        isOrderFullyPaid: isOrderFullyPaid,
+        isDepositFullyPaid: isDepositFullyPaid,
+        paymentStage: paymentStage,
+        depositAmount: depositAmount.toFixed(2),
+        orderExpectedAmount: orderExpectedAmount.toFixed(2)
+      };
+    }
   }, {
     key: "calculateDepositPaidAmount",
     value: function calculateDepositPaidAmount(payments) {
@@ -2494,7 +2567,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       });
       tempOrder.deposit_amount = depositAmount;
       tempOrder.is_deposit = hasDepositAmount ? 1 : 0;
-      return nextSummary;
+      return this.applyLastOrderDepositSnapshot(tempOrder, nextSummary);
     }
   }, {
     key: "recalculateSummary",
@@ -4267,8 +4340,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "runSubmitTempOrder",
     value: function () {
       var _runSubmitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29(params) {
-        var _params$cacheId2, _this$otherParams5, _ref71, _params$businessCode2, _this$otherParams6, _this$otherParams7;
-        var tempOrder, latestSummary, effectiveCacheId, hasPaymentOverride, hasPaymentStatusOverride, hasSmallTicketDataFlagOverride, enhancePayload, payload, result, _payload$payments, _payload$payments2, backendErrorResponse, submittedOrderId, resultRecord;
+        var _params$cacheId2, _this$otherParams5, _ref71, _ref72, _submitSnapshot$busin, _this$otherParams6, _this$otherParams7, _submitSnapshot$type;
+        var tempOrder, latestSummary, effectiveCacheId, hasPaymentOverride, hasPaymentStatusOverride, hasSmallTicketDataFlagOverride, enhancePayload, submitSnapshot, payload, result, _payload$payments, _payload$payments2, backendErrorResponse, submittedOrderId, resultRecord;
         return _regeneratorRuntime().wrap(function _callee29$(_context32) {
           while (1) switch (_context32.prev = _context32.next) {
             case 0:
@@ -4309,13 +4382,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 var enhancedPayload = params !== null && params !== void 0 && params.enhancePayload ? params.enhancePayload(nextPayload, ctx) : nextPayload;
                 return enhancedPayload;
               } : undefined;
+              submitSnapshot = this.getLastOrderSubmitSnapshot();
               payload = buildSubmitPayload({
                 tempOrder: tempOrder,
                 cacheId: effectiveCacheId,
                 platform: (params === null || params === void 0 ? void 0 : params.platform) || ((_this$otherParams5 = this.otherParams) === null || _this$otherParams5 === void 0 ? void 0 : _this$otherParams5.platform),
-                businessCode: (_ref71 = (_params$businessCode2 = params === null || params === void 0 ? void 0 : params.businessCode) !== null && _params$businessCode2 !== void 0 ? _params$businessCode2 : (_this$otherParams6 = this.otherParams) === null || _this$otherParams6 === void 0 ? void 0 : _this$otherParams6.businessCode) !== null && _ref71 !== void 0 ? _ref71 : (_this$otherParams7 = this.otherParams) === null || _this$otherParams7 === void 0 ? void 0 : _this$otherParams7.business_code,
+                businessCode: (_ref71 = (_ref72 = (_submitSnapshot$busin = submitSnapshot.businessCode) !== null && _submitSnapshot$busin !== void 0 ? _submitSnapshot$busin : params === null || params === void 0 ? void 0 : params.businessCode) !== null && _ref72 !== void 0 ? _ref72 : (_this$otherParams6 = this.otherParams) === null || _this$otherParams6 === void 0 ? void 0 : _this$otherParams6.businessCode) !== null && _ref71 !== void 0 ? _ref71 : (_this$otherParams7 = this.otherParams) === null || _this$otherParams7 === void 0 ? void 0 : _this$otherParams7.business_code,
                 channel: params === null || params === void 0 ? void 0 : params.channel,
-                type: params === null || params === void 0 ? void 0 : params.type,
+                type: (_submitSnapshot$type = submitSnapshot.type) !== null && _submitSnapshot$type !== void 0 ? _submitSnapshot$type : params === null || params === void 0 ? void 0 : params.type,
                 summary: latestSummary,
                 request_unique_idempotency_token: params === null || params === void 0 ? void 0 : params.request_unique_idempotency_token,
                 enhance: enhancePayload
@@ -4327,10 +4401,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (!payload.created_at) {
                 payload.created_at = dayjs().format('YYYY-MM-DD HH:mm:ss');
               }
-              _context32.next = 21;
+              _context32.next = 22;
               return this.saveDraft();
-            case 21:
-              _context32.prev = 21;
+            case 22:
+              _context32.prev = 22;
               this.logInfo('submitTempOrder calling sales checkout', {
                 orderId: payload.order_id,
                 externalSaleNumber: payload.external_sale_number,
@@ -4340,26 +4414,26 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 smallTicketDataFlag: payload.small_ticket_data_flag,
                 syncMode: payload.sync_mode
               });
-              _context32.next = 25;
+              _context32.next = 26;
               return this.submitSalesOrder({
                 query: payload
               });
-            case 25:
+            case 26:
               result = _context32.sent;
-              _context32.next = 38;
+              _context32.next = 39;
               break;
-            case 28:
-              _context32.prev = 28;
-              _context32.t2 = _context32["catch"](21);
+            case 29:
+              _context32.prev = 29;
+              _context32.t2 = _context32["catch"](22);
               backendErrorResponse = this.extractSubmitErrorResponse(_context32.t2);
               if (!backendErrorResponse) {
-                _context32.next = 35;
+                _context32.next = 36;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(backendErrorResponse, payload);
               return _context32.abrupt("return", backendErrorResponse);
-            case 35:
+            case 36:
               this.store.syncState = 'failed';
               this.logError('submitTempOrder failed', {
                 error: _context32.t2 instanceof Error ? _context32.t2.message : String(_context32.t2),
@@ -4369,15 +4443,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 paymentsCount: ((_payload$payments2 = payload.payments) === null || _payload$payments2 === void 0 ? void 0 : _payload$payments2.length) || 0
               });
               throw _context32.t2;
-            case 38:
+            case 39:
               if (!this.isSubmitResponseRejected(result)) {
-                _context32.next = 42;
+                _context32.next = 43;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(result, payload);
               return _context32.abrupt("return", result);
-            case 42:
+            case 43:
               submittedOrderId = this.extractOrderIdFromSubmitResult(result);
               this.logInfo('runSubmitTempOrder: 提交成功', {
                 submittedOrderId: submittedOrderId,
@@ -4385,29 +4459,29 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 tempOrder: tempOrder
               });
               if (!(submittedOrderId !== null && submittedOrderId !== undefined)) {
-                _context32.next = 51;
+                _context32.next = 52;
                 break;
               }
               tempOrder.order_id = submittedOrderId;
               resultRecord = result;
-              _context32.next = 49;
+              _context32.next = 50;
               return this.markLocalOrderSynced(submittedOrderId, (resultRecord === null || resultRecord === void 0 ? void 0 : resultRecord.data) || resultRecord || {});
-            case 49:
-              _context32.next = 52;
+            case 50:
+              _context32.next = 53;
               break;
-            case 51:
+            case 52:
               if (this.isLocalPendingSubmitResult(result)) {
                 this.store.syncState = 'local';
               } else {
                 this.store.syncState = 'submitted';
               }
-            case 52:
-              return _context32.abrupt("return", result);
             case 53:
+              return _context32.abrupt("return", result);
+            case 54:
             case "end":
               return _context32.stop();
           }
-        }, _callee29, this, [[21, 28]]);
+        }, _callee29, this, [[22, 29]]);
       }));
       function runSubmitTempOrder(_x32) {
         return _runSubmitTempOrder.apply(this, arguments);
@@ -4510,41 +4584,35 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "syncPaymentsToOrder",
     value: function () {
       var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31(params) {
-        var tempOrder, mappedPayments, paymentTotal, targetAmount, isFullyPaid, paymentStatus, paymentSyncIdempotencyToken, submitResult;
+        var tempOrder, mappedPayments, completion, paymentStatus, paymentSyncIdempotencyToken, submitResult;
         return _regeneratorRuntime().wrap(function _callee31$(_context34) {
           while (1) switch (_context34.prev = _context34.next) {
             case 0:
               tempOrder = this.ensureTempOrder();
               mappedPayments = mapPaymentItemsToOrderPayments(params.payments || []);
-              paymentTotal = this.calculatePaymentTotal(mappedPayments);
-              targetAmount = this.getPaymentTargetAmount();
-              isFullyPaid = targetAmount.lte(0) ? true : paymentTotal.gte(targetAmount);
-              paymentStatus = isFullyPaid ? params.paymentStatus || 'paid' : 'partially_paid';
+              completion = this.getPaymentCompletion(mappedPayments);
+              paymentStatus = completion.isOrderFullyPaid ? params.paymentStatus || 'paid' : 'partially_paid';
               tempOrder.payments = mappedPayments;
               tempOrder.payment_status = paymentStatus;
               this.persistTempOrder();
-              _context34.next = 11;
+              _context34.next = 9;
               return this.saveDraft();
-            case 11:
+            case 9:
               if (params.submitWhenPaid) {
-                _context34.next = 13;
+                _context34.next = 11;
                 break;
               }
-              return _context34.abrupt("return", {
-                isFullyPaid: isFullyPaid
-              });
-            case 13:
+              return _context34.abrupt("return", completion);
+            case 11:
               if (!(this.store.syncState === 'submitting')) {
-                _context34.next = 15;
+                _context34.next = 13;
                 break;
               }
-              return _context34.abrupt("return", {
-                isFullyPaid: isFullyPaid
-              });
-            case 15:
+              return _context34.abrupt("return", completion);
+            case 13:
               this.store.syncState = 'submitting';
               paymentSyncIdempotencyToken = this.buildPaymentSyncIdempotencyToken(tempOrder, mappedPayments);
-              _context34.next = 19;
+              _context34.next = 17;
               return this.submitTempOrder({
                 payments: mappedPayments,
                 paymentStatus: paymentStatus,
@@ -4558,13 +4626,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   return nextPayload;
                 }
               });
-            case 19:
+            case 17:
               submitResult = _context34.sent;
-              return _context34.abrupt("return", {
-                isFullyPaid: isFullyPaid,
+              return _context34.abrupt("return", _objectSpread(_objectSpread({}, completion), {}, {
                 submitResult: submitResult
-              });
-            case 21:
+              }));
+            case 19:
             case "end":
               return _context34.stop();
           }
@@ -5200,7 +5267,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _step22;
       try {
         for (_iterator22.s(); !(_step22 = _iterator22.n()).done;) {
-          var _product$metadata8, _ref72, _ref73, _existed$origin, _rawProduct$metadata;
+          var _product$metadata8, _ref73, _ref74, _existed$origin, _rawProduct$metadata;
           var _step22$value = _slicedToArray(_step22.value, 2),
             index = _step22$value[0],
             product = _step22$value[1];
@@ -5208,7 +5275,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 = (_ref72 = (_ref73 = (_existed$origin = existed.origin) !== null && _existed$origin !== void 0 ? _existed$origin : rawProduct._origin) !== null && _ref73 !== void 0 ? _ref73 : (_rawProduct$metadata = rawProduct.metadata) === null || _rawProduct$metadata === void 0 ? void 0 : _rawProduct$metadata.origin) !== null && _ref72 !== void 0 ? _ref72 : rawProduct;
+          var origin = (_ref73 = (_ref74 = (_existed$origin = existed.origin) !== null && _existed$origin !== void 0 ? _existed$origin : rawProduct._origin) !== null && _ref74 !== void 0 ? _ref74 : (_rawProduct$metadata = rawProduct.metadata) === null || _rawProduct$metadata === void 0 ? void 0 : _rawProduct$metadata.origin) !== null && _ref73 !== void 0 ? _ref73 : rawProduct;
           var originSnapshot = cloneDeep(origin);
           var productOptionString = this.buildHydratedProductOptionString(rawProduct) || this.buildHydratedProductOptionString(product);
           if (productOptionString && originSnapshot && _typeof(originSnapshot) === 'object') {
@@ -5318,10 +5385,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "normalizeHydratedProductOptionItem",
     value: function normalizeHydratedProductOptionItem(optionItem) {
-      var _ref74, _optionItem$num, _ref75, _optionItem$add_price;
-      var rawNum = (_ref74 = (_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 && _ref74 !== void 0 ? _ref74 : 1;
+      var _ref75, _optionItem$num, _ref76, _optionItem$add_price;
+      var rawNum = (_ref75 = (_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 && _ref75 !== void 0 ? _ref75 : 1;
       var parsedNum = Number(rawNum);
-      var rawPrice = (_ref75 = (_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 && _ref75 !== void 0 ? _ref75 : 0;
+      var rawPrice = (_ref76 = (_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 && _ref76 !== void 0 ? _ref76 : 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,
@@ -5448,10 +5515,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             _step27;
           try {
             for (_iterator27.s(); !(_step27 = _iterator27.n()).done;) {
-              var _ref76, _bundle$num3;
+              var _ref77, _bundle$num3;
               var bundle = _step27.value;
               var isPersistedBundleProduct = isPersistedProduct || Boolean((bundle === null || bundle === void 0 ? void 0 : bundle.order_detail_id) || (bundle === null || bundle === void 0 ? void 0 : bundle.orderDetailId) || (bundle === null || bundle === void 0 ? void 0 : bundle.booking_id));
-              var bundleQty = new Decimal(Number(qty) || 1).times(Number((_ref76 = (_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 && _ref76 !== void 0 ? _ref76 : 1) || 1).toNumber();
+              var bundleQty = new Decimal(Number(qty) || 1).times(Number((_ref77 = (_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 && _ref77 !== void 0 ? _ref77 : 1) || 1).toNumber();
               var _iterator28 = _createForOfIteratorHelper((bundle === null || bundle === void 0 ? void 0 : bundle.discount_list) || []),
                 _step28;
               try {

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

@@ -540,6 +540,11 @@ export interface SyncPaymentsToOrderParams {
 }
 export interface SyncPaymentsToOrderResult<T = any> {
     isFullyPaid: boolean;
+    isOrderFullyPaid: boolean;
+    isDepositFullyPaid: boolean;
+    paymentStage: 'deposit' | 'normal';
+    depositAmount: string;
+    orderExpectedAmount: string;
     submitResult?: T;
 }
 export interface OrderIdentitySnapshot {

package/dist/server/index.js

@@ -1205,7 +1205,7 @@ var Server = /*#__PURE__*/function () {
               _context17.prev = 41;
               _context17.t0 = _context17["catch"](21);
               errorMessage = _context17.t0 instanceof Error ? _context17.t0.message : String(_context17.t0);
-              _this.logError('handleOrderSalesDetail: 请求失败', {
+              _this.logInfo('handleOrderSalesDetail: 请求失败', {
                 lookup: lookup,
                 backendPath: backendPath,
                 error: errorMessage
@@ -4684,9 +4684,9 @@ var Server = /*#__PURE__*/function () {
   }, {
     key: "shouldBuildSmallTicketData",
     value: function shouldBuildSmallTicketData(order) {
-      var _order$payment_info, _ref54, _order$small_ticket_d;
+      var _ref54, _order$small_ticket_d;
       if (!order || _typeof(order) !== 'object') return false;
-      if (hasSmallTicketData((_order$payment_info = order.payment_info) === null || _order$payment_info === void 0 ? void 0 : _order$payment_info.small_ticket_data)) return false;
+      // if (hasSmallTicketData(order.payment_info?.small_ticket_data)) return false;
       return Number((_ref54 = (_order$small_ticket_d = order.small_ticket_data_flag) !== null && _order$small_ticket_d !== void 0 ? _order$small_ticket_d : order.smallTicketDataFlag) !== null && _ref54 !== void 0 ? _ref54 : 0) === 1;
     }
   }, {

package/dist/solution/BaseSales/index.js

@@ -2261,7 +2261,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _syncPaymentsToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(params) {
         var _ref18, _params$businessCode, _this$otherParams18, _this$otherParams19, _params$channel;
-        var businessCode, channel, syncParams, syncState, payments, syncResult;
+        var businessCode, channel, syncParams, syncState, payments, syncResult, latestPayments, amountSnapshot, orderSnapshot, syncPayload;
         return _regeneratorRuntime().wrap(function _callee24$(_context24) {
           while (1) switch (_context24.prev = _context24.next) {
             case 0:
@@ -2299,21 +2299,38 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               return this.store.order.syncPaymentsToOrder(syncParams);
             case 14:
               syncResult = _context24.sent;
-              _context24.next = 17;
-              return this.effectsEmit(BaseSalesHookNames.onPaymentSyncEnd, {
+              latestPayments = this.store.order.getOrderPayments();
+              amountSnapshot = this.store.order.getOrderAmountSnapshot();
+              orderSnapshot = this.store.order.getOrderSnapshot();
+              syncPayload = {
                 ok: true,
                 syncResult: syncResult,
-                payments: this.store.order.getOrderPayments(),
+                payments: latestPayments,
                 params: syncParams,
-                amountSnapshot: this.store.order.getOrderAmountSnapshot(),
-                orderSnapshot: this.store.order.getOrderSnapshot()
-              });
-            case 17:
+                amountSnapshot: amountSnapshot,
+                orderSnapshot: orderSnapshot,
+                isFullyPaid: syncResult.isFullyPaid,
+                isOrderFullyPaid: syncResult.isOrderFullyPaid,
+                isDepositFullyPaid: syncResult.isDepositFullyPaid,
+                paymentStage: syncResult.paymentStage,
+                depositAmount: syncResult.depositAmount,
+                orderExpectedAmount: syncResult.orderExpectedAmount
+              };
+              _context24.next = 21;
+              return this.effectsEmit(BaseSalesHookNames.onPaymentSyncEnd, syncPayload);
+            case 21:
+              if (!(syncResult.isDepositFullyPaid && !syncResult.isOrderFullyPaid)) {
+                _context24.next = 24;
+                break;
+              }
+              _context24.next = 24;
+              return this.effectsEmit(BaseSalesHookNames.onDepositPaymentSyncEnd, syncPayload);
+            case 24:
               return _context24.abrupt("return", syncResult);
-            case 20:
-              _context24.prev = 20;
+            case 27:
+              _context24.prev = 27;
               _context24.t0 = _context24["catch"](11);
-              _context24.next = 24;
+              _context24.next = 31;
               return this.effectsEmit(BaseSalesHookNames.onPaymentSyncEnd, {
                 ok: false,
                 error: _context24.t0,
@@ -2322,13 +2339,13 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 amountSnapshot: this.store.order.getOrderAmountSnapshot(),
                 orderSnapshot: this.store.order.getOrderSnapshot()
               });
-            case 24:
+            case 31:
               throw _context24.t0;
-            case 25:
+            case 32:
             case "end":
               return _context24.stop();
           }
-        }, _callee24, this, [[11, 20]]);
+        }, _callee24, this, [[11, 27]]);
       }));
       function syncPaymentsToOrder(_x20) {
         return _syncPaymentsToOrder.apply(this, arguments);
@@ -2393,7 +2410,8 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
       var amountSnapshot = this.store.order.getOrderAmountSnapshot();
       var syncState = this.store.order.getOrderSyncState();
       if (amountSnapshot && syncState !== 'submitting') {
-        var paymentStatus = Number(amountSnapshot.amountGap || 0) <= 0 ? 'paid' : 'partially_paid';
+        var completion = this.store.order.getPaymentCompletion(payments);
+        var paymentStatus = completion.isOrderFullyPaid ? 'paid' : 'partially_paid';
         void this.syncPaymentsToOrder({
           payments: payments,
           paymentStatus: paymentStatus,

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

@@ -14,6 +14,7 @@ export declare const BaseSalesHookNames: {
     readonly onCartValidationChanged: "onCartValidationChanged";
     readonly onPaymentSyncStart: "onPaymentSyncStart";
     readonly onPaymentSyncEnd: "onPaymentSyncEnd";
+    readonly onDepositPaymentSyncEnd: "onDepositPaymentSyncEnd";
 };
 export type BaseSalesHookName = typeof BaseSalesHookNames[keyof typeof BaseSalesHookNames];
 export declare function createBaseSalesHook(moduleName: string, hookName: BaseSalesHookName): string;

package/dist/solution/BaseSales/types.js

@@ -9,7 +9,8 @@ export var BaseSalesHookNames = {
   onRefresh: 'onRefresh',
   onCartValidationChanged: 'onCartValidationChanged',
   onPaymentSyncStart: 'onPaymentSyncStart',
-  onPaymentSyncEnd: 'onPaymentSyncEnd'
+  onPaymentSyncEnd: 'onPaymentSyncEnd',
+  onDepositPaymentSyncEnd: 'onDepositPaymentSyncEnd'
 };
 export function createBaseSalesHook(moduleName, hookName) {
   return "".concat(moduleName, ":").concat(hookName);

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 5 | 3 | 4 | 6;
+        weekNum: 0 | 1 | 2 | 6 | 3 | 4 | 5;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/core/index.js

@@ -50,7 +50,7 @@ var PisellOSCore = class {
       this.serverOptions = options.server;
     }
     this.initialize(options);
-    console.log("constructor12");
+    console.log("constructor1234");
   }
   initialize(options) {
     if (options == null ? void 0 : options.plugins) {

package/lib/model/strategy/adapter/promotion/index.js

@@ -0,0 +1,49 @@
+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)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  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/model/strategy/adapter/promotion/index.ts
+var promotion_exports = {};
+__export(promotion_exports, {
+  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter: () => import_adapter.PromotionAdapter,
+  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
+  default: () => import_adapter2.default
+});
+module.exports = __toCommonJS(promotion_exports);
+var import_evaluator = require("./evaluator");
+var import_adapter = require("./adapter");
+var import_adapter2 = __toESM(require("./adapter"));
+var import_examples = require("./examples");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter,
+  PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY
+});

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

@@ -154,10 +154,21 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private calculatePaymentTotal;
     private getDepositAmount;
     private normalizeDepositAmount;
+    private getLastOrderDepositSnapshot;
+    private getLastOrderSubmitSnapshot;
     private applyDepositAmountToSummary;
+    private applyLastOrderDepositSnapshot;
     private isDepositOrder;
     private getOrderExpectedAmount;
     private isDepositCovered;
+    getPaymentCompletion(payments?: OrderPaymentSource[]): {
+        isFullyPaid: boolean;
+        isOrderFullyPaid: boolean;
+        isDepositFullyPaid: boolean;
+        paymentStage: 'deposit' | 'normal';
+        depositAmount: string;
+        orderExpectedAmount: string;
+    };
     private calculateDepositPaidAmount;
     private resolveNextOrderPaymentType;
     private normalizePaymentSource;
@@ -431,7 +442,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/lib/modules/Order/index.js

@@ -825,6 +825,33 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   normalizeDepositAmount(amount) {
     return import_decimal.default.max(new import_decimal.default(Number(amount) || 0), 0).toDecimalPlaces(2).toFixed(2);
   }
+  getLastOrderDepositSnapshot() {
+    var _a;
+    const lastOrderInfo = this.store.lastOrderInfo;
+    if (!lastOrderInfo || typeof lastOrderInfo !== "object")
+      return null;
+    const rawDepositAmount = lastOrderInfo.deposit_amount ?? ((_a = lastOrderInfo.summary) == null ? void 0 : _a.deposit_amount);
+    const depositAmount = this.normalizeDepositAmount(rawDepositAmount ?? 0);
+    const hasDepositAmount = new import_decimal.default(depositAmount).gt(0);
+    const isDeposit = Number(lastOrderInfo.is_deposit) === 1 || hasDepositAmount;
+    if (!isDeposit || !hasDepositAmount)
+      return null;
+    return {
+      isDeposit: 1,
+      depositAmount
+    };
+  }
+  getLastOrderSubmitSnapshot() {
+    const lastOrderInfo = this.store.lastOrderInfo;
+    if (!lastOrderInfo || typeof lastOrderInfo !== "object")
+      return {};
+    const businessCode = lastOrderInfo.business_code;
+    const type = lastOrderInfo.type;
+    return {
+      ...typeof businessCode === "string" && businessCode ? { businessCode } : {},
+      ...typeof type === "string" && type ? { type } : {}
+    };
+  }
   applyDepositAmountToSummary(tempOrder, summary, amount) {
     const depositAmount = this.normalizeDepositAmount(amount);
     const hasDepositAmount = new import_decimal.default(depositAmount).gt(0);
@@ -843,6 +870,25 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     tempOrder.is_deposit = hasDepositAmount ? 1 : 0;
     return nextSummary;
   }
+  applyLastOrderDepositSnapshot(tempOrder, summary) {
+    const snapshot = this.getLastOrderDepositSnapshot();
+    if (!snapshot)
+      return summary;
+    const existedDeposit = summary.deposit && typeof summary.deposit === "object" ? summary.deposit : void 0;
+    const nextSummary = {
+      ...summary,
+      deposit_amount: snapshot.depositAmount,
+      deposit: {
+        ...existedDeposit || {},
+        total: snapshot.depositAmount,
+        deposit_policy_ids: (existedDeposit == null ? void 0 : existedDeposit.deposit_policy_ids) || [],
+        hasDeposit: true
+      }
+    };
+    tempOrder.deposit_amount = snapshot.depositAmount;
+    tempOrder.is_deposit = snapshot.isDeposit;
+    return nextSummary;
+  }
   isDepositOrder(tempOrder, depositAmount) {
     return tempOrder.is_deposit === 1 || depositAmount.gt(0);
   }
@@ -857,6 +903,33 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return false;
     return params.paidAmount.gte(depositAmount);
   }
+  getPaymentCompletion(payments) {
+    const tempOrder = this.ensureTempOrder();
+    const summary = this.store.summary || (0, import_utils.createEmptySummary)();
+    const paymentList = payments || tempOrder.payments || [];
+    const refundAmount = this.getSummaryRefundAmount(summary);
+    const netPaidAmount = import_decimal.default.max(
+      this.calculatePaymentTotal(paymentList).minus(refundAmount),
+      0
+    );
+    const depositAmount = this.getDepositAmount(tempOrder, summary);
+    const orderExpectedAmount = this.getOrderExpectedAmount(summary);
+    const isDepositFullyPaid = this.isDepositCovered({
+      tempOrder,
+      summary,
+      paidAmount: netPaidAmount
+    });
+    const isOrderFullyPaid = orderExpectedAmount.lte(0) ? true : netPaidAmount.gte(orderExpectedAmount);
+    const paymentStage = this.isDepositOrder(tempOrder, depositAmount) && !isDepositFullyPaid ? "deposit" : "normal";
+    return {
+      isFullyPaid: isOrderFullyPaid,
+      isOrderFullyPaid,
+      isDepositFullyPaid,
+      paymentStage,
+      depositAmount: depositAmount.toFixed(2),
+      orderExpectedAmount: orderExpectedAmount.toFixed(2)
+    };
+  }
   calculateDepositPaidAmount(payments) {
     return (payments || []).reduce((sum, payment) => {
       const paymentRecord = payment;
@@ -1802,7 +1875,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     };
     tempOrder.deposit_amount = depositAmount;
     tempOrder.is_deposit = hasDepositAmount ? 1 : 0;
-    return nextSummary;
+    return this.applyLastOrderDepositSnapshot(tempOrder, nextSummary);
   }
   async recalculateSummary(options) {
     const tempOrder = (options == null ? void 0 : options.createIfMissing) ? this.ensureTempOrder() : this.store.tempOrder;
@@ -3128,13 +3201,14 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       const enhancedPayload = (params == null ? void 0 : params.enhancePayload) ? params.enhancePayload(nextPayload, ctx) : nextPayload;
       return enhancedPayload;
     } : void 0;
+    const submitSnapshot = this.getLastOrderSubmitSnapshot();
     const payload = (0, import_utils.buildSubmitPayload)({
       tempOrder,
       cacheId: effectiveCacheId,
       platform: (params == null ? void 0 : params.platform) || ((_a = this.otherParams) == null ? void 0 : _a.platform),
-      businessCode: (params == null ? void 0 : params.businessCode) ?? ((_b = this.otherParams) == null ? void 0 : _b.businessCode) ?? ((_c = this.otherParams) == null ? void 0 : _c.business_code),
+      businessCode: submitSnapshot.businessCode ?? (params == null ? void 0 : params.businessCode) ?? ((_b = this.otherParams) == null ? void 0 : _b.businessCode) ?? ((_c = this.otherParams) == null ? void 0 : _c.business_code),
       channel: params == null ? void 0 : params.channel,
-      type: params == null ? void 0 : params.type,
+      type: submitSnapshot.type ?? (params == null ? void 0 : params.type),
       summary: latestSummary,
       request_unique_idempotency_token: params == null ? void 0 : params.request_unique_idempotency_token,
       enhance: enhancePayload
@@ -3272,19 +3346,17 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const mappedPayments = (0, import_utils.mapPaymentItemsToOrderPayments)(
       params.payments || []
     );
-    const paymentTotal = this.calculatePaymentTotal(mappedPayments);
-    const targetAmount = this.getPaymentTargetAmount();
-    const isFullyPaid = targetAmount.lte(0) ? true : paymentTotal.gte(targetAmount);
-    const paymentStatus = isFullyPaid ? params.paymentStatus || "paid" : "partially_paid";
+    const completion = this.getPaymentCompletion(mappedPayments);
+    const paymentStatus = completion.isOrderFullyPaid ? params.paymentStatus || "paid" : "partially_paid";
     tempOrder.payments = mappedPayments;
     tempOrder.payment_status = paymentStatus;
     this.persistTempOrder();
     await this.saveDraft();
     if (!params.submitWhenPaid) {
-      return { isFullyPaid };
+      return completion;
     }
     if (this.store.syncState === "submitting") {
-      return { isFullyPaid };
+      return completion;
     }
     this.store.syncState = "submitting";
     const paymentSyncIdempotencyToken = this.buildPaymentSyncIdempotencyToken(
@@ -3305,7 +3377,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         return nextPayload;
       }
     });
-    return { isFullyPaid, submitResult };
+    return { ...completion, submitResult };
   }
   createOrder(params) {
     var _a;

package/lib/modules/Order/types.d.ts

@@ -540,6 +540,11 @@ export interface SyncPaymentsToOrderParams {
 }
 export interface SyncPaymentsToOrderResult<T = any> {
     isFullyPaid: boolean;
+    isOrderFullyPaid: boolean;
+    isDepositFullyPaid: boolean;
+    paymentStage: 'deposit' | 'normal';
+    depositAmount: string;
+    orderExpectedAmount: string;
     submitResult?: T;
 }
 export interface OrderIdentitySnapshot {

package/lib/server/index.js

@@ -737,7 +737,7 @@ var Server = class {
         };
       } catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
-        this.logError("handleOrderSalesDetail: 请求失败", {
+        this.logInfo("handleOrderSalesDetail: 请求失败", {
           lookup,
           backendPath,
           error: errorMessage
@@ -2925,11 +2925,8 @@ var Server = class {
     );
   }
   shouldBuildSmallTicketData(order) {
-    var _a;
     if (!order || typeof order !== "object")
       return false;
-    if ((0, import_small_ticket.hasSmallTicketData)((_a = order.payment_info) == null ? void 0 : _a.small_ticket_data))
-      return false;
     return Number(order.small_ticket_data_flag ?? order.smallTicketDataFlag ?? 0) === 1;
   }
   shouldPrintSyncedOrder(params) {

package/lib/solution/BaseSales/index.js

@@ -1480,14 +1480,27 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     });
     try {
       const syncResult = await this.store.order.syncPaymentsToOrder(syncParams);
-      await this.effectsEmit(import_types.BaseSalesHookNames.onPaymentSyncEnd, {
+      const latestPayments = this.store.order.getOrderPayments();
+      const amountSnapshot = this.store.order.getOrderAmountSnapshot();
+      const orderSnapshot = this.store.order.getOrderSnapshot();
+      const syncPayload = {
         ok: true,
         syncResult,
-        payments: this.store.order.getOrderPayments(),
+        payments: latestPayments,
         params: syncParams,
-        amountSnapshot: this.store.order.getOrderAmountSnapshot(),
-        orderSnapshot: this.store.order.getOrderSnapshot()
-      });
+        amountSnapshot,
+        orderSnapshot,
+        isFullyPaid: syncResult.isFullyPaid,
+        isOrderFullyPaid: syncResult.isOrderFullyPaid,
+        isDepositFullyPaid: syncResult.isDepositFullyPaid,
+        paymentStage: syncResult.paymentStage,
+        depositAmount: syncResult.depositAmount,
+        orderExpectedAmount: syncResult.orderExpectedAmount
+      };
+      await this.effectsEmit(import_types.BaseSalesHookNames.onPaymentSyncEnd, syncPayload);
+      if (syncResult.isDepositFullyPaid && !syncResult.isOrderFullyPaid) {
+        await this.effectsEmit(import_types.BaseSalesHookNames.onDepositPaymentSyncEnd, syncPayload);
+      }
       return syncResult;
     } catch (error) {
       await this.effectsEmit(import_types.BaseSalesHookNames.onPaymentSyncEnd, {
@@ -1550,7 +1563,8 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     const amountSnapshot = this.store.order.getOrderAmountSnapshot();
     const syncState = this.store.order.getOrderSyncState();
     if (amountSnapshot && syncState !== "submitting") {
-      const paymentStatus = Number(amountSnapshot.amountGap || 0) <= 0 ? "paid" : "partially_paid";
+      const completion = this.store.order.getPaymentCompletion(payments);
+      const paymentStatus = completion.isOrderFullyPaid ? "paid" : "partially_paid";
       void this.syncPaymentsToOrder({
         payments,
         paymentStatus,

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

@@ -14,6 +14,7 @@ export declare const BaseSalesHookNames: {
     readonly onCartValidationChanged: "onCartValidationChanged";
     readonly onPaymentSyncStart: "onPaymentSyncStart";
     readonly onPaymentSyncEnd: "onPaymentSyncEnd";
+    readonly onDepositPaymentSyncEnd: "onDepositPaymentSyncEnd";
 };
 export type BaseSalesHookName = typeof BaseSalesHookNames[keyof typeof BaseSalesHookNames];
 export declare function createBaseSalesHook(moduleName: string, hookName: BaseSalesHookName): string;

package/lib/solution/BaseSales/types.js

@@ -30,7 +30,8 @@ var BaseSalesHookNames = {
   onRefresh: "onRefresh",
   onCartValidationChanged: "onCartValidationChanged",
   onPaymentSyncStart: "onPaymentSyncStart",
-  onPaymentSyncEnd: "onPaymentSyncEnd"
+  onPaymentSyncEnd: "onPaymentSyncEnd",
+  onDepositPaymentSyncEnd: "onDepositPaymentSyncEnd"
 };
 function createBaseSalesHook(moduleName, hookName) {
   return `${moduleName}:${hookName}`;

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 5 | 3 | 4 | 6;
+        weekNum: 0 | 1 | 2 | 6 | 3 | 4 | 5;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/package.json

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