@pisell/pisellos 2.2.217 → 2.2.219

package/dist/server/index.js

@@ -4126,8 +4126,18 @@ var Server = /*#__PURE__*/function () {
                 title: title
               });
             case 15:
+              if (pendingResult.data.order_id) {
+                _context44.next = 17;
+                break;
+              }
+              return _context44.abrupt("return", _objectSpread(_objectSpread({}, pendingResult), {}, {
+                data: _objectSpread(_objectSpread({}, pendingResult.data), {}, {
+                  order_id: pendingResult.data.external_sale_number
+                })
+              }));
+            case 17:
               return _context44.abrupt("return", pendingResult);
-            case 16:
+            case 18:
             case "end":
               return _context44.stop();
           }
@@ -4143,7 +4153,7 @@ var Server = /*#__PURE__*/function () {
     value: function () {
       var _handlePendingSyncCheckoutOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee45(params) {
         var _this10 = this;
-        var backendPath, data, title, reason, pendingOrder, _pendingOrder$payment, _pendingOrder$order_i, _pendingOrder$summary, _pendingOrder$summary2, _pendingOrder$summary3, changeGivenAmount, errorMessage;
+        var backendPath, data, title, reason, pendingOrder, _pendingOrder$payment, _pendingOrder$summary, _pendingOrder$summary2, _pendingOrder$summary3, changeGivenAmount, errorMessage;
         return _regeneratorRuntime().wrap(function _callee45$(_context45) {
           while (1) switch (_context45.prev = _context45.next) {
             case 0:
@@ -4201,8 +4211,7 @@ var Server = /*#__PURE__*/function () {
                 code: 200,
                 status: true,
                 message: '',
-                data: {
-                  order_id: (_pendingOrder$order_i = pendingOrder === null || pendingOrder === void 0 ? void 0 : pendingOrder.order_id) !== null && _pendingOrder$order_i !== void 0 ? _pendingOrder$order_i : pendingOrder === null || pendingOrder === void 0 ? void 0 : pendingOrder.external_sale_number,
+                data: _objectSpread(_objectSpread({}, pendingOrder), {}, {
                   amount_gap: pendingOrder === null || pendingOrder === void 0 || (_pendingOrder$summary = pendingOrder.summary) === null || _pendingOrder$summary === void 0 ? void 0 : _pendingOrder$summary.amount_gap,
                   expect_amount: pendingOrder === null || pendingOrder === void 0 || (_pendingOrder$summary2 = pendingOrder.summary) === null || _pendingOrder$summary2 === void 0 ? void 0 : _pendingOrder$summary2.expect_amount,
                   total_amount: pendingOrder === null || pendingOrder === void 0 || (_pendingOrder$summary3 = pendingOrder.summary) === null || _pendingOrder$summary3 === void 0 ? void 0 : _pendingOrder$summary3.total_amount,
@@ -4210,7 +4219,7 @@ var Server = /*#__PURE__*/function () {
                   payment_info: {
                     current_change_given_amount: changeGivenAmount
                   }
-                }
+                })
               });
             case 18:
               _context45.prev = 18;

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

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

package/dist/solution/BookingTicket/index.js

@@ -802,7 +802,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                 _context11.next = 6;
                 break;
               }
-              throw new Error('refreshSalesDetail: tempOrder.order_id 缺失');
+              return _context11.abrupt("return", {});
             case 6:
               return _context11.abrupt("return", this.loadSalesDetail({
                 orderId: Number(orderId),

package/lib/server/index.js

@@ -2548,6 +2548,15 @@ var Server = class {
         title
       });
     }
+    if (!pendingResult.data.order_id) {
+      return {
+        ...pendingResult,
+        data: {
+          ...pendingResult.data,
+          order_id: pendingResult.data.external_sale_number
+        }
+      };
+    }
     return pendingResult;
   }
   async handlePendingSyncCheckoutOrder(params) {
@@ -2596,7 +2605,7 @@ var Server = class {
         status: true,
         message: "",
         data: {
-          order_id: (pendingOrder == null ? void 0 : pendingOrder.order_id) ?? (pendingOrder == null ? void 0 : pendingOrder.external_sale_number),
+          ...pendingOrder,
           amount_gap: (_b = pendingOrder == null ? void 0 : pendingOrder.summary) == null ? void 0 : _b.amount_gap,
           expect_amount: (_c = pendingOrder == null ? void 0 : pendingOrder.summary) == null ? void 0 : _c.expect_amount,
           total_amount: (_d = pendingOrder == null ? void 0 : pendingOrder.summary) == null ? void 0 : _d.total_amount,

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

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

package/lib/solution/BookingTicket/index.js

@@ -473,7 +473,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     }
     const orderId = tempOrder.order_id;
     if (orderId === void 0 || orderId === null) {
-      throw new Error("refreshSalesDetail: tempOrder.order_id 缺失");
+      return {};
     }
     return this.loadSalesDetail({
       orderId: Number(orderId),

package/package.json

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