@pisell/pisellos 2.2.158 → 2.2.160

package/dist/server/index.js

@@ -755,7 +755,8 @@ var Server = /*#__PURE__*/function () {
               _context9.prev = 20;
               _context9.next = 23;
               return _this.app.request.get(backendPath, undefined, {
-                isShopApi: true
+                isShopApi: true,
+                customToast: function customToast() {}
               });
             case 23:
               response = _context9.sent;

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

@@ -300,8 +300,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               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) return false;
-                return _this3.getIdKey(id) === key;
+                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 (localOrder) {
                 _context4.next = 10;

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

@@ -165,7 +165,10 @@ 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));
+          return request === null || request === void 0 ? void 0 : request.get("/order/sales/".concat(code), undefined, {
+            customToast: function customToast() {},
+            osServer: true
+          });
         case 3:
           res = _context4.sent;
           console.log('searchOrder>>>>>>>', res);

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/model/strategy/adapter/promotion/index.js

@@ -0,0 +1,49 @@
+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/server/index.js

@@ -481,7 +481,9 @@ var Server = class {
       const backendPath = this.buildOrderSalesDetailBackendPath(orderId, data);
       try {
         const response = await this.app.request.get(backendPath, void 0, {
-          isShopApi: true
+          isShopApi: true,
+          customToast: () => {
+          }
         });
         const fresh = (response == null ? void 0 : response.data) ?? response;
         if (!fresh || typeof fresh !== "object" || fresh.order_id == null) {

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

@@ -193,9 +193,12 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     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)
+      if (id !== void 0 && id !== null && this.getIdKey(id) === key)
+        return true;
+      const shopOrderNumber = order == null ? void 0 : order.shop_order_number;
+      if (!shopOrderNumber)
         return false;
-      return this.getIdKey(id) === key;
+      return this.getIdKey(shopOrderNumber) === key;
     });
     if (!localOrder)
       return null;

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

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

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