@pisell/pisellos 2.2.239 → 2.2.241

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

@@ -416,7 +416,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

@@ -3911,7 +3911,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _runSubmitTempOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(params) {
         var _params$cacheId2, _this$otherParams5, _ref70, _params$businessCode2, _this$otherParams6, _this$otherParams7;
-        var tempOrder, latestSummary, effectiveCacheId, hasPaymentOverride, hasPaymentStatusOverride, hasSmallTicketDataFlagOverride, enhancePayload, payload, result, _payload$payments, _payload$payments2, backendErrorResponse, submittedOrderId, resultRecord;
+        var tempOrder, latestSummary, effectiveCacheId, hasPaymentOverride, hasPaymentStatusOverride, hasSmallTicketDataFlagOverride, enhancePayload, payload, result, _payload$payments, _result, _data, _payload$payments2, backendErrorResponse, submittedOrderId, resultRecord;
         return _regeneratorRuntime().wrap(function _callee27$(_context29) {
           while (1) switch (_context29.prev = _context29.next) {
             case 0:
@@ -3989,20 +3989,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
             case 25:
               result = _context29.sent;
-              _context29.next = 38;
+              // 如果成功需要把当前内存 tempOrder的一部分同步成 result 的
+              if ((_result = result) !== null && _result !== void 0 && _result.success) {
+                tempOrder.order_id = (_data = result.data) === null || _data === void 0 ? void 0 : _data.order_id;
+              }
+              _context29.next = 39;
               break;
-            case 28:
-              _context29.prev = 28;
+            case 29:
+              _context29.prev = 29;
               _context29.t2 = _context29["catch"](21);
               backendErrorResponse = this.extractSubmitErrorResponse(_context29.t2);
               if (!backendErrorResponse) {
-                _context29.next = 35;
+                _context29.next = 36;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(backendErrorResponse, payload);
               return _context29.abrupt("return", backendErrorResponse);
-            case 35:
+            case 36:
               this.store.syncState = 'failed';
               this.logError('submitTempOrder failed', {
                 error: _context29.t2 instanceof Error ? _context29.t2.message : String(_context29.t2),
@@ -4012,40 +4016,40 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 paymentsCount: ((_payload$payments2 = payload.payments) === null || _payload$payments2 === void 0 ? void 0 : _payload$payments2.length) || 0
               });
               throw _context29.t2;
-            case 38:
+            case 39:
               if (!this.isSubmitResponseRejected(result)) {
-                _context29.next = 42;
+                _context29.next = 43;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(result, payload);
               return _context29.abrupt("return", result);
-            case 42:
+            case 43:
               submittedOrderId = this.extractOrderIdFromSubmitResult(result);
               if (!(submittedOrderId !== null && submittedOrderId !== undefined)) {
-                _context29.next = 50;
+                _context29.next = 51;
                 break;
               }
               tempOrder.order_id = submittedOrderId;
               resultRecord = result;
-              _context29.next = 48;
+              _context29.next = 49;
               return this.markLocalOrderSynced(submittedOrderId, (resultRecord === null || resultRecord === void 0 ? void 0 : resultRecord.data) || resultRecord || {});
-            case 48:
-              _context29.next = 51;
+            case 49:
+              _context29.next = 52;
               break;
-            case 50:
+            case 51:
               if (this.isLocalPendingSubmitResult(result)) {
                 this.store.syncState = 'local';
               } else {
                 this.store.syncState = 'submitted';
               }
-            case 51:
-              return _context29.abrupt("return", result);
             case 52:
+              return _context29.abrupt("return", result);
+            case 53:
             case "end":
               return _context29.stop();
           }
-        }, _callee27, this, [[21, 28]]);
+        }, _callee27, this, [[21, 29]]);
       }));
       function runSubmitTempOrder(_x31) {
         return _runSubmitTempOrder.apply(this, arguments);

package/dist/server/index.js

@@ -947,14 +947,19 @@ var Server = /*#__PURE__*/function () {
               });
             case 5:
               shouldLookup = _this.shouldLookupLocalPrintOrder(inputOrder) || _this.shouldLookupLocalPrintOrder(data);
+              _this.logInfo('handleLocalPrintOrder: 是否需要查找本地订单', {
+                shouldLookup: shouldLookup,
+                inputOrder: inputOrder,
+                data: data
+              });
               lookup = shouldLookup ? (_this$getLocalPrintOr = _this.getLocalPrintOrderLookup(inputOrder)) !== null && _this$getLocalPrintOr !== void 0 ? _this$getLocalPrintOr : _this.getLocalPrintOrderLookup(data) : undefined;
               sourceOrder = inputOrder;
               if (!shouldLookup) {
-                _context16.next = 19;
+                _context16.next = 20;
                 break;
               }
               if (!(lookup === undefined)) {
-                _context16.next = 11;
+                _context16.next = 12;
                 break;
               }
               return _context16.abrupt("return", {
@@ -966,9 +971,9 @@ var Server = /*#__PURE__*/function () {
                   order: null
                 }
               });
-            case 11:
+            case 12:
               if ((_this$order = _this.order) !== null && _this$order !== void 0 && _this$order.getLocalOrderByLookup) {
-                _context16.next = 13;
+                _context16.next = 14;
                 break;
               }
               return _context16.abrupt("return", {
@@ -980,13 +985,13 @@ var Server = /*#__PURE__*/function () {
                   order: null
                 }
               });
-            case 13:
-              _context16.next = 15;
+            case 14:
+              _context16.next = 16;
               return _this.order.getLocalOrderByLookup(lookup);
-            case 15:
+            case 16:
               localOrder = _context16.sent;
               if (localOrder) {
-                _context16.next = 18;
+                _context16.next = 19;
                 break;
               }
               return _context16.abrupt("return", {
@@ -998,29 +1003,33 @@ var Server = /*#__PURE__*/function () {
                   order: null
                 }
               });
-            case 18:
+            case 19:
               sourceOrder = _objectSpread(_objectSpread(_objectSpread({}, localOrder), inputOrder), {}, {
                 order_id: (_ref40 = (_localOrder$order_id = localOrder.order_id) !== null && _localOrder$order_id !== void 0 ? _localOrder$order_id : inputOrder.order_id) !== null && _ref40 !== void 0 ? _ref40 : inputOrder.orderId,
                 external_sale_number: (_ref41 = (_external_sale_number = localOrder.external_sale_number) !== null && _external_sale_number !== void 0 ? _external_sale_number : inputOrder.external_sale_number) !== null && _ref41 !== void 0 ? _ref41 : inputOrder.externalSaleNumber
               });
-            case 19:
-              _context16.next = 21;
+            case 20:
+              _context16.next = 22;
               return _this.ensureCheckoutOrderNumbers(_objectSpread(_objectSpread({}, sourceOrder), {}, {
                 small_ticket_data_flag: 1
               }), 'handleLocalPrintOrder');
-            case 21:
+            case 22:
               checkoutData = _context16.sent;
               printableOrder = _objectSpread(_objectSpread({}, checkoutData), {}, {
                 need_sync: (_need_sync = checkoutData.need_sync) !== null && _need_sync !== void 0 ? _need_sync : 1
               });
-              _context16.next = 25;
+              _this.logInfo('handleLocalPrintOrder: 本地打印小票，构建触发任务前', {
+                checkoutData: checkoutData,
+                printableOrder: printableOrder
+              });
+              _context16.next = 27;
               return _this.dispatchLocalReceiptPrint({
                 checkoutData: checkoutData,
                 order: printableOrder,
                 response: null,
                 requireFullyPaid: false
               });
-            case 25:
+            case 27:
               printResult = _context16.sent;
               return _context16.abrupt("return", {
                 code: 200,
@@ -1031,8 +1040,8 @@ var Server = /*#__PURE__*/function () {
                   order: printResult.order
                 }
               });
-            case 29:
-              _context16.prev = 29;
+            case 31:
+              _context16.prev = 31;
               _context16.t0 = _context16["catch"](1);
               message = _context16.t0 instanceof Error ? _context16.t0.message : String(_context16.t0);
               _this.logError('handleLocalPrintOrder: 本地打印小票失败', {
@@ -1047,11 +1056,11 @@ var Server = /*#__PURE__*/function () {
                   order: null
                 }
               });
-            case 34:
+            case 36:
             case "end":
               return _context16.stop();
           }
-        }, _callee16, null, [[1, 29]]);
+        }, _callee16, null, [[1, 31]]);
       }));
       return function (_x16) {
         return _ref39.apply(this, arguments);
@@ -4172,11 +4181,12 @@ var Server = /*#__PURE__*/function () {
             case 4:
               _context45.prev = 4;
               printIdentity = this.getPrintOrderIdentity(params.syncedOrder);
-              _context45.next = 8;
+              printIdentity = "".concat(printIdentity, "_").concat(Date.now());
+              _context45.next = 9;
               return this.getShortNumberOrDeviceId();
-            case 8:
+            case 9:
               deviceId = _context45.sent;
-              _context45.next = 11;
+              _context45.next = 12;
               return deviceTask.dispatch({
                 action: 'print_all',
                 device_id: (_params$deviceId = params.deviceId) !== null && _params$deviceId !== void 0 ? _params$deviceId : deviceId,
@@ -4200,20 +4210,20 @@ var Server = /*#__PURE__*/function () {
                 source_type: 'order',
                 source_id: printIdentity
               });
-            case 11:
-              _context45.next = 16;
+            case 12:
+              _context45.next = 17;
               break;
-            case 13:
-              _context45.prev = 13;
+            case 14:
+              _context45.prev = 14;
               _context45.t0 = _context45["catch"](4);
               this.logError('dispatchPrintOtherReceiptTask: 派发失败', {
                 error: _context45.t0 instanceof Error ? _context45.t0.message : String(_context45.t0)
               });
-            case 16:
+            case 17:
             case "end":
               return _context45.stop();
           }
-        }, _callee45, this, [[4, 13]]);
+        }, _callee45, this, [[4, 14]]);
       }));
       function dispatchPrintOtherReceiptTask(_x49) {
         return _dispatchPrintOtherReceiptTask.apply(this, arguments);
@@ -4265,7 +4275,11 @@ var Server = /*#__PURE__*/function () {
                 order: printableOrder
               });
             case 7:
-              debugger;
+              this.logInfo('dispatchLocalReceiptPrint: 构建触发任务前', {
+                checkoutData: params.checkoutData,
+                printableOrder: printableOrder,
+                response: params.response
+              });
               _context46.next = 10;
               return this.dispatchPrintOtherReceiptTask({
                 checkoutData: params.checkoutData,

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 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 1 | 6 | 3 | 4 | 5;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

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

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

@@ -416,7 +416,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

@@ -2852,7 +2852,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     });
   }
   async runSubmitTempOrder(params) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     const tempOrder = this.ensureTempOrder();
     this.persistTempOrder();
     const latestSummary = await this.recalculateSummary({ createIfMissing: true }) || this.store.summary || (0, import_utils.createEmptySummary)();
@@ -2906,6 +2906,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       result = await this.submitSalesOrder({
         query: payload
       });
+      if (result == null ? void 0 : result.success) {
+        tempOrder.order_id = (_e = result.data) == null ? void 0 : _e.order_id;
+      }
     } catch (error) {
       const backendErrorResponse = this.extractSubmitErrorResponse(error);
       if (backendErrorResponse) {
@@ -2919,7 +2922,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         orderId: payload.order_id,
         externalSaleNumber: payload.external_sale_number,
         paymentStatus: payload.payment_status,
-        paymentsCount: ((_e = payload.payments) == null ? void 0 : _e.length) || 0
+        paymentsCount: ((_f = payload.payments) == null ? void 0 : _f.length) || 0
       });
       throw error;
     }

package/lib/server/index.js

@@ -580,6 +580,11 @@ var Server = class {
           };
         }
         const shouldLookup = this.shouldLookupLocalPrintOrder(inputOrder) || this.shouldLookupLocalPrintOrder(data);
+        this.logInfo("handleLocalPrintOrder: 是否需要查找本地订单", {
+          shouldLookup,
+          inputOrder,
+          data
+        });
         const lookup = shouldLookup ? this.getLocalPrintOrderLookup(inputOrder) ?? this.getLocalPrintOrderLookup(data) : void 0;
         let sourceOrder = inputOrder;
         if (shouldLookup) {
@@ -626,6 +631,10 @@ var Server = class {
           ...checkoutData,
           need_sync: checkoutData.need_sync ?? 1
         };
+        this.logInfo("handleLocalPrintOrder: 本地打印小票，构建触发任务前", {
+          checkoutData,
+          printableOrder
+        });
         const printResult = await this.dispatchLocalReceiptPrint({
           checkoutData,
           order: printableOrder,
@@ -2605,7 +2614,8 @@ var Server = class {
       return;
     }
     try {
-      const printIdentity = this.getPrintOrderIdentity(params.syncedOrder);
+      let printIdentity = this.getPrintOrderIdentity(params.syncedOrder);
+      printIdentity = `${printIdentity}_${Date.now()}`;
       const deviceId = await this.getShortNumberOrDeviceId();
       await deviceTask.dispatch({
         action: "print_all",
@@ -2656,7 +2666,11 @@ var Server = class {
     if (!(0, import_small_ticket.hasSmallTicketData)((_a = printableOrder.payment_info) == null ? void 0 : _a.small_ticket_data)) {
       return { printed: false, order: printableOrder };
     }
-    debugger;
+    this.logInfo("dispatchLocalReceiptPrint: 构建触发任务前", {
+      checkoutData: params.checkoutData,
+      printableOrder,
+      response: params.response
+    });
     await this.dispatchPrintOtherReceiptTask({
       checkoutData: params.checkoutData,
       syncedOrder: printableOrder,

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 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 1 | 6 | 3 | 4 | 5;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

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

package/package.json

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