@pisell/pisellos 2.2.158 → 2.2.159

package/dist/solution/Sales/index.js

@@ -888,9 +888,17 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
                 return _this7.getBookingOrderPaymentStatus(booking) === 'unpaid' || _this7.getBookingOrderPaymentStatus(booking) === 'payment_processing';
               });
               bookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, matchedBookingList));
-              completedBookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, completedBookingList, {
-                includeCompleted: true
-              }));
+              completedBookings = completedBookingList.map(function (booking) {
+                return _objectSpread(_objectSpread({}, booking), {}, {
+                  status: 'compelete',
+                  isTimeout: false,
+                  timeoutTime: undefined,
+                  progressPercent: 100,
+                  lateTime: undefined,
+                  reserved_status: undefined,
+                  remainingReserveTime: undefined
+                });
+              });
               unpaidBookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, unpaidBookingList));
               orderCount = this.countBookingOrders(matchedBookingList);
               bookingCount = matchedBookingList.length;

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

@@ -16,7 +16,7 @@ export declare enum SalesHooks {
  * 当前不要直接把 OrderData 当作最终 UI 数据结构。
  */
 export type Reservation = OrderData;
-export type SalesBookingStatus = 'reserved' | 'occupied' | 'locked' | undefined;
+export type SalesBookingStatus = 'reserved' | 'occupied' | 'locked' | 'completed' | undefined;
 export type SalesReservedStatus = 'not_arrived' | 'late' | undefined;
 export interface SalesResourceMatchedBooking extends Omit<BookingData, 'status'> {
     status: SalesBookingStatus;

package/lib/solution/Sales/index.js

@@ -632,12 +632,18 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
       current,
       this.normalizeResourceBookings(current, deviceCurrent, matchedBookingList)
     );
-    const completedBookings = this.pickBookingsForCurrentPoint(
-      current,
-      this.normalizeResourceBookings(current, deviceCurrent, completedBookingList, {
-        includeCompleted: true
-      })
-    );
+    const completedBookings = completedBookingList.map((booking) => {
+      return {
+        ...booking,
+        status: "compelete",
+        isTimeout: false,
+        timeoutTime: void 0,
+        progressPercent: 100,
+        lateTime: void 0,
+        reserved_status: void 0,
+        remainingReserveTime: void 0
+      };
+    });
     const unpaidBookings = this.pickBookingsForCurrentPoint(
       current,
       this.normalizeResourceBookings(current, deviceCurrent, unpaidBookingList)

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

@@ -16,7 +16,7 @@ export declare enum SalesHooks {
  * 当前不要直接把 OrderData 当作最终 UI 数据结构。
  */
 export type Reservation = OrderData;
-export type SalesBookingStatus = 'reserved' | 'occupied' | 'locked' | undefined;
+export type SalesBookingStatus = 'reserved' | 'occupied' | 'locked' | 'completed' | undefined;
 export type SalesReservedStatus = 'not_arrived' | 'late' | undefined;
 export interface SalesResourceMatchedBooking extends Omit<BookingData, 'status'> {
     status: SalesBookingStatus;

package/package.json

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