@pisell/pisellos 2.2.241 → 2.2.243

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, _result, _data, _payload$payments2, backendErrorResponse, submittedOrderId, resultRecord;
+        var tempOrder, latestSummary, effectiveCacheId, hasPaymentOverride, hasPaymentStatusOverride, hasSmallTicketDataFlagOverride, enhancePayload, payload, result, _payload$payments, _payload$payments2, backendErrorResponse, submittedOrderId, resultRecord;
         return _regeneratorRuntime().wrap(function _callee27$(_context29) {
           while (1) switch (_context29.prev = _context29.next) {
             case 0:
@@ -3989,24 +3989,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
             case 25:
               result = _context29.sent;
-              // 如果成功需要把当前内存 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;
+              _context29.next = 38;
               break;
-            case 29:
-              _context29.prev = 29;
+            case 28:
+              _context29.prev = 28;
               _context29.t2 = _context29["catch"](21);
               backendErrorResponse = this.extractSubmitErrorResponse(_context29.t2);
               if (!backendErrorResponse) {
-                _context29.next = 36;
+                _context29.next = 35;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(backendErrorResponse, payload);
               return _context29.abrupt("return", backendErrorResponse);
-            case 36:
+            case 35:
               this.store.syncState = 'failed';
               this.logError('submitTempOrder failed', {
                 error: _context29.t2 instanceof Error ? _context29.t2.message : String(_context29.t2),
@@ -4016,16 +4012,21 @@ 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 39:
+            case 38:
               if (!this.isSubmitResponseRejected(result)) {
-                _context29.next = 43;
+                _context29.next = 42;
                 break;
               }
               this.store.syncState = 'failed';
               this.logSubmitBackendRejected(result, payload);
               return _context29.abrupt("return", result);
-            case 43:
+            case 42:
               submittedOrderId = this.extractOrderIdFromSubmitResult(result);
+              this.logInfo('runSubmitTempOrder: 提交成功', {
+                submittedOrderId: submittedOrderId,
+                result: result,
+                tempOrder: tempOrder
+              });
               if (!(submittedOrderId !== null && submittedOrderId !== undefined)) {
                 _context29.next = 51;
                 break;
@@ -4049,7 +4050,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case "end":
               return _context29.stop();
           }
-        }, _callee27, this, [[21, 29]]);
+        }, _callee27, this, [[21, 28]]);
       }));
       function runSubmitTempOrder(_x31) {
         return _runSubmitTempOrder.apply(this, arguments);

package/dist/server/index.js

@@ -4181,12 +4181,11 @@ var Server = /*#__PURE__*/function () {
             case 4:
               _context45.prev = 4;
               printIdentity = this.getPrintOrderIdentity(params.syncedOrder);
-              printIdentity = "".concat(printIdentity, "_").concat(Date.now());
-              _context45.next = 9;
+              _context45.next = 8;
               return this.getShortNumberOrDeviceId();
-            case 9:
+            case 8:
               deviceId = _context45.sent;
-              _context45.next = 12;
+              _context45.next = 11;
               return deviceTask.dispatch({
                 action: 'print_all',
                 device_id: (_params$deviceId = params.deviceId) !== null && _params$deviceId !== void 0 ? _params$deviceId : deviceId,
@@ -4210,20 +4209,20 @@ var Server = /*#__PURE__*/function () {
                 source_type: 'order',
                 source_id: printIdentity
               });
-            case 12:
-              _context45.next = 17;
+            case 11:
+              _context45.next = 16;
               break;
-            case 14:
-              _context45.prev = 14;
+            case 13:
+              _context45.prev = 13;
               _context45.t0 = _context45["catch"](4);
               this.logError('dispatchPrintOtherReceiptTask: 派发失败', {
                 error: _context45.t0 instanceof Error ? _context45.t0.message : String(_context45.t0)
               });
-            case 17:
+            case 16:
             case "end":
               return _context45.stop();
           }
-        }, _callee45, this, [[4, 14]]);
+        }, _callee45, this, [[4, 13]]);
       }));
       function dispatchPrintOtherReceiptTask(_x49) {
         return _dispatchPrintOtherReceiptTask.apply(this, arguments);

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, _f;
+    var _a, _b, _c, _d, _e;
     const tempOrder = this.ensureTempOrder();
     this.persistTempOrder();
     const latestSummary = await this.recalculateSummary({ createIfMissing: true }) || this.store.summary || (0, import_utils.createEmptySummary)();
@@ -2906,9 +2906,6 @@ 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) {
@@ -2922,7 +2919,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         orderId: payload.order_id,
         externalSaleNumber: payload.external_sale_number,
         paymentStatus: payload.payment_status,
-        paymentsCount: ((_f = payload.payments) == null ? void 0 : _f.length) || 0
+        paymentsCount: ((_e = payload.payments) == null ? void 0 : _e.length) || 0
       });
       throw error;
     }
@@ -2932,6 +2929,11 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return result;
     }
     const submittedOrderId = this.extractOrderIdFromSubmitResult(result);
+    this.logInfo("runSubmitTempOrder: 提交成功", {
+      submittedOrderId,
+      result,
+      tempOrder
+    });
     if (submittedOrderId !== null && submittedOrderId !== void 0) {
       tempOrder.order_id = submittedOrderId;
       const resultRecord = result;

package/lib/server/index.js

@@ -2615,7 +2615,6 @@ var Server = class {
     }
     try {
       let printIdentity = this.getPrintOrderIdentity(params.syncedOrder);
-      printIdentity = `${printIdentity}_${Date.now()}`;
       const deviceId = await this.getShortNumberOrDeviceId();
       await deviceTask.dispatch({
         action: "print_all",

package/package.json

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