@pisell/pisellos 2.2.218 → 2.2.220

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

@@ -334,7 +334,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private logSubmitBackendRejected;
     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/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/server/modules/order/index.js

@@ -1237,9 +1237,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }, {
         field: 'shop_order_number',
         value: record.shop_order_number
-      }, {
-        field: 'shop_full_order_number',
-        value: record.shop_full_order_number
       }];
       var entries = [];
       var _loop2 = function _loop2() {
@@ -1351,7 +1348,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               type: (_message$type = message.type) !== null && _message$type !== void 0 ? _message$type : null,
               pendingCount: _this12.pendingSyncMessages.length,
               throttleMs: throttleMs,
-              pubsubReceivedAt: new Date(pubsubReceivedAt).toISOString()
+              pubsubReceivedAt: new Date(pubsubReceivedAt).toISOString(),
+              fullMessage: JSON.stringify(message)
             });
             _this12.scheduleOrderSyncThrottle();
           }
@@ -1874,9 +1872,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var secondary = preferred === existing ? incoming : existing;
       var merged = _objectSpread(_objectSpread({}, secondary), preferred);
       var fieldsToPreserve = ['order_id', 'external_sale_number', 'order_number', 'shop_order_number', 'shop_full_order_number'];
+      var incomingPatchFields = ['payment_status', 'status', 'shipping_status', 'updated_at', 'summary', 'payments'];
       var mergedRecord = merged;
       var preferredRecord = preferred;
       var secondaryRecord = secondary;
+      var incomingRecord = incoming;
       for (var _i3 = 0, _fieldsToPreserve = fieldsToPreserve; _i3 < _fieldsToPreserve.length; _i3++) {
         var field = _fieldsToPreserve[_i3];
         if (!this.isBlankIdentityValue(preferredRecord[field])) {
@@ -1887,6 +1887,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           mergedRecord[field] = secondaryRecord[field];
         }
       }
+      for (var _i4 = 0, _incomingPatchFields = incomingPatchFields; _i4 < _incomingPatchFields.length; _i4++) {
+        var _field = _incomingPatchFields[_i4];
+        if (!Object.prototype.hasOwnProperty.call(incomingRecord, _field)) continue;
+        if (incomingRecord[_field] === undefined || incomingRecord[_field] === null) continue;
+        if (typeof incomingRecord[_field] === 'string' && incomingRecord[_field] === '') continue;
+        mergedRecord[_field] = cloneDeep(incomingRecord[_field]);
+      }
       if (!this.isPendingSyncOrder(preferred) || !this.isPendingSyncOrder(secondary)) {
         merged.need_sync = 0;
       }

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

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/lib/modules/Order/index.d.ts

@@ -334,7 +334,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private logSubmitBackendRejected;
     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/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/server/modules/order/index.js

@@ -694,8 +694,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       { field: "order_id", value: order.order_id },
       { field: "external_sale_number", value: record.external_sale_number },
       { field: "order_number", value: record.order_number },
-      { field: "shop_order_number", value: record.shop_order_number },
-      { field: "shop_full_order_number", value: record.shop_full_order_number }
+      { field: "shop_order_number", value: record.shop_order_number }
     ];
     const entries = [];
     for (const candidate of candidates) {
@@ -787,7 +786,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
             type: message.type ?? null,
             pendingCount: this.pendingSyncMessages.length,
             throttleMs,
-            pubsubReceivedAt: new Date(pubsubReceivedAt).toISOString()
+            pubsubReceivedAt: new Date(pubsubReceivedAt).toISOString(),
+            fullMessage: JSON.stringify(message)
           });
           this.scheduleOrderSyncThrottle();
         }
@@ -1129,9 +1129,18 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       "shop_order_number",
       "shop_full_order_number"
     ];
+    const incomingPatchFields = [
+      "payment_status",
+      "status",
+      "shipping_status",
+      "updated_at",
+      "summary",
+      "payments"
+    ];
     const mergedRecord = merged;
     const preferredRecord = preferred;
     const secondaryRecord = secondary;
+    const incomingRecord = incoming;
     for (const field of fieldsToPreserve) {
       if (!this.isBlankIdentityValue(preferredRecord[field])) {
         mergedRecord[field] = preferredRecord[field];
@@ -1141,6 +1150,15 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         mergedRecord[field] = secondaryRecord[field];
       }
     }
+    for (const field of incomingPatchFields) {
+      if (!Object.prototype.hasOwnProperty.call(incomingRecord, field))
+        continue;
+      if (incomingRecord[field] === void 0 || incomingRecord[field] === null)
+        continue;
+      if (typeof incomingRecord[field] === "string" && incomingRecord[field] === "")
+        continue;
+      mergedRecord[field] = (0, import_lodash_es.cloneDeep)(incomingRecord[field]);
+    }
     if (!this.isPendingSyncOrder(preferred) || !this.isPendingSyncOrder(secondary)) {
       merged.need_sync = 0;
     }

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

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/package.json

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