@pisell/pisellos 2.2.161 → 2.2.163

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

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

@@ -2995,6 +2995,7 @@ var Server = /*#__PURE__*/function () {
         if (field === undefined || field === null || field === '') return;
         searchParams.append('with[]', String(field));
       });
+      searchParams.append('lookup_mode', 'multi');
       var query = searchParams.toString();
       return "/shop/order/sales/".concat(encodeURIComponent(orderId)).concat(query ? "?".concat(query) : '');
     }

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 | 5 | 4 | 2 | 3 | 6;
+        weekNum: 0 | 1 | 2 | 6 | 3 | 5 | 4;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -330,7 +330,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: "sold_out" | "lots_of_space" | "filling_up_fast";
+        status: "lots_of_space" | "filling_up_fast" | "sold_out";
     }[];
     /**
      * 找到多个资源的公共可用时间段

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

@@ -81,6 +81,7 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
     private getBookingStatus;
     private getResourceId;
     private getBookingAppointmentStatus;
+    private isBookingIncludedInStats;
     private getBookingOrderPaymentStatus;
     private countBookingOrders;
     private countCompletedBookings;

package/dist/solution/Sales/index.js

@@ -403,6 +403,12 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       var _ref4, _booking$appointment_2;
       return String((_ref4 = (_booking$appointment_2 = booking.appointment_status) !== null && _booking$appointment_2 !== void 0 ? _booking$appointment_2 : booking.status) !== null && _ref4 !== void 0 ? _ref4 : '');
     }
+  }, {
+    key: "isBookingIncludedInStats",
+    value: function isBookingIncludedInStats(booking) {
+      var appointmentStatus = this.getBookingAppointmentStatus(booking);
+      return appointmentStatus !== 'new' && appointmentStatus !== 'rejected' && appointmentStatus !== 'cancelled';
+    }
   }, {
     key: "getBookingOrderPaymentStatus",
     value: function getBookingOrderPaymentStatus(booking) {
@@ -789,9 +795,12 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
                 var resourceId = _this6.getResourceId(resource);
                 var rawMatchedBookings = rawBookingMap.get(String(resourceId)) || [];
                 var matchedBookings = bookingMap.get(String(resourceId)) || [];
-                var orderCount = _this6.countBookingOrders(rawMatchedBookings);
-                var bookingCount = rawMatchedBookings.length;
-                var compeleteBookingCount = _this6.countCompletedBookings(rawMatchedBookings);
+                var statsBookings = rawMatchedBookings.filter(function (booking) {
+                  return _this6.isBookingIncludedInStats(booking);
+                });
+                var orderCount = _this6.countBookingOrders(statsBookings);
+                var bookingCount = statsBookings.length;
+                var compeleteBookingCount = _this6.countCompletedBookings(statsBookings);
                 var bookings = _this6.pickBookingsForCurrentPoint(current, matchedBookings);
                 return _objectSpread(_objectSpread({}, resource), {}, {
                   resource_id: resourceId,
@@ -831,7 +840,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
           _resourceResponse$dat4,
           _this7 = this,
           _params$bookingList;
-        var current, deviceCurrent, resourceResponse, resourceList, targetResource, resourceId, matchedBookingList, completedBookingList, unpaidBookingList, bookings, completedBookings, unpaidBookings, orderCount, bookingCount, compeleteBookingCount;
+        var current, deviceCurrent, resourceResponse, resourceList, targetResource, resourceId, matchedBookingList, statsBookingList, completedBookingList, unpaidBookingList, bookings, completedBookings, unpaidBookings, orderCount, bookingCount, compeleteBookingCount;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
@@ -881,6 +890,9 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
               matchedBookingList = params.bookingList.filter(function (booking) {
                 return _this7.isBookingMatchedResource(booking, resourceId);
               });
+              statsBookingList = matchedBookingList.filter(function (booking) {
+                return _this7.isBookingIncludedInStats(booking);
+              });
               completedBookingList = matchedBookingList.filter(function (booking) {
                 return _this7.getBookingAppointmentStatus(booking) === 'completed';
               });
@@ -900,9 +912,9 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
                 });
               });
               unpaidBookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, unpaidBookingList));
-              orderCount = this.countBookingOrders(matchedBookingList);
-              bookingCount = matchedBookingList.length;
-              compeleteBookingCount = completedBookingList.length;
+              orderCount = this.countBookingOrders(statsBookingList);
+              bookingCount = statsBookingList.length;
+              compeleteBookingCount = this.countCompletedBookings(statsBookingList);
               this.logger.addLog({
                 type: 'info',
                 title: 'getResourceBookingItem',
@@ -928,7 +940,7 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
                 completedBookings: completedBookings,
                 unpaidBookings: unpaidBookings
               }));
-            case 27:
+            case 28:
             case "end":
               return _context6.stop();
           }

package/lib/model/strategy/adapter/promotion/index.js

@@ -1,49 +0,0 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/model/strategy/adapter/promotion/index.ts
-var promotion_exports = {};
-__export(promotion_exports, {
-  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
-  PromotionAdapter: () => import_adapter.PromotionAdapter,
-  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
-  default: () => import_adapter2.default
-});
-module.exports = __toCommonJS(promotion_exports);
-var import_evaluator = require("./evaluator");
-var import_adapter = require("./adapter");
-var import_adapter2 = __toESM(require("./adapter"));
-var import_examples = require("./examples");
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  BUY_X_GET_Y_FREE_STRATEGY,
-  PromotionAdapter,
-  PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY
-});

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

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

@@ -1870,6 +1870,7 @@ var Server = class {
         return;
       searchParams.append("with[]", String(field));
     });
+    searchParams.append("lookup_mode", "multi");
     const query = searchParams.toString();
     return `/shop/order/sales/${encodeURIComponent(orderId)}${query ? `?${query}` : ""}`;
   }

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 | 5 | 4 | 2 | 3 | 6;
+        weekNum: 0 | 1 | 2 | 6 | 3 | 5 | 4;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -330,7 +330,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: "sold_out" | "lots_of_space" | "filling_up_fast";
+        status: "lots_of_space" | "filling_up_fast" | "sold_out";
     }[];
     /**
      * 找到多个资源的公共可用时间段

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

@@ -81,6 +81,7 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
     private getBookingStatus;
     private getResourceId;
     private getBookingAppointmentStatus;
+    private isBookingIncludedInStats;
     private getBookingOrderPaymentStatus;
     private countBookingOrders;
     private countCompletedBookings;

package/lib/solution/Sales/index.js

@@ -250,6 +250,10 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
   getBookingAppointmentStatus(booking) {
     return String(booking.appointment_status ?? booking.status ?? "");
   }
+  isBookingIncludedInStats(booking) {
+    const appointmentStatus = this.getBookingAppointmentStatus(booking);
+    return appointmentStatus !== "new" && appointmentStatus !== "rejected" && appointmentStatus !== "cancelled";
+  }
   getBookingOrderPaymentStatus(booking) {
     var _a;
     return String(((_a = booking.order) == null ? void 0 : _a.payment_status) ?? "");
@@ -571,9 +575,10 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
       const resourceId = this.getResourceId(resource);
       const rawMatchedBookings = rawBookingMap.get(String(resourceId)) || [];
       const matchedBookings = bookingMap.get(String(resourceId)) || [];
-      const orderCount = this.countBookingOrders(rawMatchedBookings);
-      const bookingCount = rawMatchedBookings.length;
-      const compeleteBookingCount = this.countCompletedBookings(rawMatchedBookings);
+      const statsBookings = rawMatchedBookings.filter((booking) => this.isBookingIncludedInStats(booking));
+      const orderCount = this.countBookingOrders(statsBookings);
+      const bookingCount = statsBookings.length;
+      const compeleteBookingCount = this.countCompletedBookings(statsBookings);
       const bookings = this.pickBookingsForCurrentPoint(current, matchedBookings);
       return {
         ...resource,
@@ -622,6 +627,7 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
     const matchedBookingList = params.bookingList.filter(
       (booking) => this.isBookingMatchedResource(booking, resourceId)
     );
+    const statsBookingList = matchedBookingList.filter((booking) => this.isBookingIncludedInStats(booking));
     const completedBookingList = matchedBookingList.filter(
       (booking) => this.getBookingAppointmentStatus(booking) === "completed"
     );
@@ -648,9 +654,9 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
       current,
       this.normalizeResourceBookings(current, deviceCurrent, unpaidBookingList)
     );
-    const orderCount = this.countBookingOrders(matchedBookingList);
-    const bookingCount = matchedBookingList.length;
-    const compeleteBookingCount = completedBookingList.length;
+    const orderCount = this.countBookingOrders(statsBookingList);
+    const bookingCount = statsBookingList.length;
+    const compeleteBookingCount = this.countCompletedBookings(statsBookingList);
     this.logger.addLog({
       type: "info",
       title: "getResourceBookingItem",

package/package.json

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