@pisell/pisellos 2.2.160 → 2.2.162

package/dist/server/index.js

@@ -754,7 +754,9 @@ var Server = /*#__PURE__*/function () {
               backendPath = _this.buildOrderSalesDetailBackendPath(orderId, data);
               _context9.prev = 20;
               _context9.next = 23;
-              return _this.app.request.get(backendPath, undefined, {
+              return _this.app.request.get(backendPath, {
+                lookup_mode: 'multi'
+              }, {
                 isShopApi: true,
                 customToast: function customToast() {}
               });

package/dist/server/modules/order/index.js

@@ -299,11 +299,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 6:
               orders = _context4.sent;
               localOrder = orders.find(function (order) {
-                var id = order === null || order === void 0 ? void 0 : order.order_id;
-                if (id !== undefined && id !== null && _this3.getIdKey(id) === key) return true;
                 var shopOrderNumber = order === null || order === void 0 ? void 0 : order.shop_order_number;
-                if (!shopOrderNumber) return false;
-                return _this3.getIdKey(shopOrderNumber) === key;
+                if (shopOrderNumber && _this3.getIdKey(shopOrderNumber) === key) return true;
+                var id = order === null || order === void 0 ? void 0 : order.order_id;
+                if (id === undefined || id === null) return false;
+                return _this3.getIdKey(id) === key;
               });
               if (localOrder) {
                 _context4.next = 10;

package/dist/solution/BookingTicket/utils/scan/cloudSearch.js

@@ -165,7 +165,9 @@ export var searchOrder = /*#__PURE__*/function () {
         case 0:
           _context4.prev = 0;
           _context4.next = 3;
-          return request === null || request === void 0 ? void 0 : request.get("/order/sales/".concat(code), undefined, {
+          return request === null || request === void 0 ? void 0 : request.get("/order/sales/".concat(code), {
+            lookup_mode: 'multi'
+          }, {
             customToast: function customToast() {},
             osServer: true
           });

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/server/index.js

@@ -480,7 +480,9 @@ var Server = class {
       }
       const backendPath = this.buildOrderSalesDetailBackendPath(orderId, data);
       try {
-        const response = await this.app.request.get(backendPath, void 0, {
+        const response = await this.app.request.get(backendPath, {
+          lookup_mode: "multi"
+        }, {
           isShopApi: true,
           customToast: () => {
           }

package/lib/server/modules/order/index.js

@@ -192,13 +192,13 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return memoryOrder;
     const orders = await this.loadOrdersFromSQLite();
     const localOrder = orders.find((order) => {
-      const id = order == null ? void 0 : order.order_id;
-      if (id !== void 0 && id !== null && this.getIdKey(id) === key)
-        return true;
       const shopOrderNumber = order == null ? void 0 : order.shop_order_number;
-      if (!shopOrderNumber)
+      if (shopOrderNumber && this.getIdKey(shopOrderNumber) === key)
+        return true;
+      const id = order == null ? void 0 : order.order_id;
+      if (id === void 0 || id === null)
         return false;
-      return this.getIdKey(shopOrderNumber) === key;
+      return this.getIdKey(id) === key;
     });
     if (!localOrder)
       return null;

package/lib/solution/BookingTicket/utils/scan/cloudSearch.js

@@ -112,7 +112,9 @@ var searchProduct = async (request, code) => {
 };
 var searchOrder = async (request, code) => {
   try {
-    const res = await (request == null ? void 0 : request.get(`/order/sales/${code}`, void 0, { customToast: () => {
+    const res = await (request == null ? void 0 : request.get(`/order/sales/${code}`, {
+      lookup_mode: "multi"
+    }, { customToast: () => {
     }, osServer: true }));
     console.log("searchOrder>>>>>>>", res);
     if ((res == null ? void 0 : res.code) == 200 && !!(res == null ? void 0 : res.data)) {

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.160",
+  "version": "2.2.162",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",