@pisell/pisellos 0.0.516 → 0.0.518

package/dist/modules/Cart/utils/cartProduct.js

@@ -382,7 +382,7 @@ export var formatBundleToOrigin = function formatBundleToOrigin(bundle) {
       option: formatOptionsToOrigin(getBundleValueByKey('option')),
       discount_list: d.discount_list,
       "bundle_selling_price": d === null || d === void 0 ? void 0 : d.price,
-      "custom_price": d === null || d === void 0 ? void 0 : d.price,
+      // "custom_price": d?.price,
       metadata: {
         custom_product_bundle_map_id: d._id,
         product_discount_difference: product_discount_difference

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

@@ -82,7 +82,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/dist/modules/Order/utils.js

@@ -202,7 +202,7 @@ export function createDefaultOrderRulesHooks() {
         num: (_values$quantity2 = values.quantity) !== null && _values$quantity2 !== void 0 ? _values$quantity2 : product.num,
         product_bundle: nextBundle,
         metadata: _objectSpread(_objectSpread({}, metadataAny), {}, {
-          source_product_price: nextSourceSellingPrice,
+          source_product_price: nextSourceOriginalPrice,
           main_product_selling_price: nextMainSellingPrice,
           main_product_original_price: nextMainOriginalPrice,
           price_schema_version: 2
@@ -334,13 +334,16 @@ function toBundleCustomPriceString(value) {
 function formatSubmitBundleItems(bundle) {
   if (!Array.isArray(bundle)) return [];
   return bundle.map(function (b) {
-    var _rawBundle$bundle_sel, _rawBundle$price_type, _ref5, _rawBundle$custom_pri, _rawBundle$surcharge_, _rawBundle$is_charge_, _rawBundle$bundle_var, _rawBundle$extension_, _rawBundle$extension_2, _rawBundle$price_type2, _ref6, _rawBundle$custom_pri2;
+    var _rawBundle$bundle_sel, _rawBundle$price_type, _rawBundle$surcharge_, _rawBundle$is_charge_, _rawBundle$bundle_var, _rawBundle$extension_, _rawBundle$extension_2, _rawBundle$price_type2, _ref5, _rawBundle$custom_pri;
     var rawBundle = b && _typeof(b) === 'object' ? b : {};
     var existedMetadata = rawBundle.metadata && _typeof(rawBundle.metadata) === 'object' ? rawBundle.metadata : {};
     var sellingPriceNum = toBundleNumber((_rawBundle$bundle_sel = rawBundle.bundle_selling_price) !== null && _rawBundle$bundle_sel !== void 0 ? _rawBundle$bundle_sel : rawBundle.price, 0);
     var priceNum = toBundleNumber(rawBundle.price, sellingPriceNum);
     var priceType = (_rawBundle$price_type = rawBundle.price_type) !== null && _rawBundle$price_type !== void 0 ? _rawBundle$price_type : '';
-    var customPriceStr = toBundleCustomPriceString((_ref5 = (_rawBundle$custom_pri = rawBundle.custom_price) !== null && _rawBundle$custom_pri !== void 0 ? _rawBundle$custom_pri : rawBundle.bundle_selling_price) !== null && _ref5 !== void 0 ? _ref5 : rawBundle.price);
+    // const customPriceStr = toBundleCustomPriceString(
+    //   rawBundle.custom_price ?? rawBundle.bundle_selling_price ?? rawBundle.price,
+    // );
+
     var relationSurchargeIds = Array.isArray(rawBundle.relation_surcharge_ids) ? rawBundle.relation_surcharge_ids : Array.isArray(existedMetadata.relation_surcharge_ids) ? existedMetadata.relation_surcharge_ids : [];
     var surchargeFee = toBundleNumber((_rawBundle$surcharge_ = rawBundle.surcharge_fee) !== null && _rawBundle$surcharge_ !== void 0 ? _rawBundle$surcharge_ : existedMetadata.surcharge_fee, 0);
     var productDiscountDifference = toBundleNumber(existedMetadata.product_discount_difference, 0);
@@ -354,8 +357,8 @@ function formatSubmitBundleItems(bundle) {
       price: priceNum,
       price_type: priceType,
       price_type_ext: (_rawBundle$price_type2 = rawBundle.price_type_ext) !== null && _rawBundle$price_type2 !== void 0 ? _rawBundle$price_type2 : '',
-      custom_price: customPriceStr,
-      custom_price_type: (_ref6 = (_rawBundle$custom_pri2 = rawBundle.custom_price_type) !== null && _rawBundle$custom_pri2 !== void 0 ? _rawBundle$custom_pri2 : priceType) !== null && _ref6 !== void 0 ? _ref6 : '',
+      // custom_price: customPriceStr,
+      custom_price_type: (_ref5 = (_rawBundle$custom_pri = rawBundle.custom_price_type) !== null && _rawBundle$custom_pri !== void 0 ? _rawBundle$custom_pri : priceType) !== null && _ref5 !== void 0 ? _ref5 : '',
       bundle_selling_price: sellingPriceNum,
       option: formatSubmitOptionItems(rawBundle.option),
       bundle_group_id: rawBundle === null || rawBundle === void 0 ? void 0 : rawBundle.group_id,
@@ -517,7 +520,7 @@ export function createDefaultTempOrder(params) {
   };
 }
 export function buildSubmitPayload(params) {
-  var _ref7, _ref8, _ref9, _tempOrder$is_price_i, _tempOrder$is_deposit;
+  var _ref6, _ref7, _ref8, _tempOrder$is_price_i, _tempOrder$is_deposit;
   var tempOrder = params.tempOrder,
     cacheId = params.cacheId,
     _params$now = params.now,
@@ -565,10 +568,10 @@ export function buildSubmitPayload(params) {
   var payload = _objectSpread(_objectSpread({}, tempOrderRest), {}, {
     platform: normalizeSubmitPlatform(platform !== null && platform !== void 0 ? platform : tempOrder.platform),
     request_unique_idempotency_token: cacheId,
-    type: (_ref7 = type !== null && type !== void 0 ? type : tempOrder.type) !== null && _ref7 !== void 0 ? _ref7 : 'table-order',
-    business_code: (_ref8 = businessCode !== null && businessCode !== void 0 ? businessCode : tempOrder.business_code) !== null && _ref8 !== void 0 ? _ref8 : 'table-order',
+    type: (_ref6 = type !== null && type !== void 0 ? type : tempOrder.type) !== null && _ref6 !== void 0 ? _ref6 : 'table-order',
+    business_code: (_ref7 = businessCode !== null && businessCode !== void 0 ? businessCode : tempOrder.business_code) !== null && _ref7 !== void 0 ? _ref7 : 'table-order',
     sales_channel: tempOrder.sales_channel || 'my_pisel',
-    order_sales_channel: (_ref9 = channel !== null && channel !== void 0 ? channel : tempOrder.order_sales_channel) !== null && _ref9 !== void 0 ? _ref9 : 'online_store',
+    order_sales_channel: (_ref8 = channel !== null && channel !== void 0 ? channel : tempOrder.order_sales_channel) !== null && _ref8 !== void 0 ? _ref8 : 'online_store',
     status: tempOrder.status || 'normal',
     payment_status: tempOrder.payment_status || 'payment_processing',
     // shipping_status: tempOrder.shipping_status || 'unfulfilled',
@@ -592,10 +595,10 @@ export function buildSubmitPayload(params) {
     // holder: tempOrder.holder || null,
     // summary,
     metadata: function () {
-      var _ref10 = tempOrder.metadata || {},
-        _collectPax = _ref10.collect_pax,
-        _tableOccupancyDuration = _ref10.table_occupancy_duration,
-        rest = _objectWithoutProperties(_ref10, _excluded3);
+      var _ref9 = tempOrder.metadata || {},
+        _collectPax = _ref9.collect_pax,
+        _tableOccupancyDuration = _ref9.table_occupancy_duration,
+        rest = _objectWithoutProperties(_ref9, _excluded3);
       return _objectSpread({}, rest);
     }(),
     products: (tempOrder.products || []).map(function (product) {

package/dist/modules/ProductList/index.js

@@ -128,10 +128,11 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 with_count: with_count,
                 // client_schedule_ids: schedule_ids,
                 schedule_date: schedule_date,
+                // application_code: this.otherParams?.channel === 'online_store' ? 'online-store' : this.otherParams?.channel,
+                application_code: 'online-store',
                 with_schedule: with_schedule,
                 schedule_datetime: schedule_datetime,
                 // application_code: this.otherParams?.channel,
-                application_code: 'online-store',
                 is_eject: 1
               }, {
                 osServer: true,

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

@@ -19,7 +19,7 @@ export declare class QuotationModule extends BaseModule implements Module {
      * Look up the quotation price for a specific product (+ optional variant) at a given datetime.
      * Returns the price as a string (e.g. "300.00"), or null if no quotation applies.
      *
-     * Priority: iterates quotations already sorted by `sort` ascending (lowest = highest priority).
+     * Priority: iterates quotations already sorted by `sort` descending (highest = highest priority).
      * First matching quotation whose schedule covers `datetime` and whose product_data contains
      * the requested productId wins.
      */

package/dist/modules/Quotation/index.js

@@ -89,7 +89,7 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
               res = _context2.sent;
               list = (res === null || res === void 0 || (_data = res.data) === null || _data === void 0 ? void 0 : _data.list) || (res === null || res === void 0 ? void 0 : res.list) || [];
               list.sort(function (a, b) {
-                return a.sort - b.sort;
+                return b.sort - a.sort;
               });
               this.store.list = list;
             case 9:
@@ -113,7 +113,7 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
      * Look up the quotation price for a specific product (+ optional variant) at a given datetime.
      * Returns the price as a string (e.g. "300.00"), or null if no quotation applies.
      *
-     * Priority: iterates quotations already sorted by `sort` ascending (lowest = highest priority).
+     * Priority: iterates quotations already sorted by `sort` descending (highest = highest priority).
      * First matching quotation whose schedule covers `datetime` and whose product_data contains
      * the requested productId wins.
      */

package/dist/modules/Rules/index.js

@@ -1256,6 +1256,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               } : {
                 _id: product._id.split('___')[0] + '___' + index,
                 total: total,
+                original_price: product.original_price,
                 price: product.price,
                 main_product_selling_price: main_product_selling_price,
                 options: restoredOptions

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

@@ -11,10 +11,12 @@ export declare class ScanOrderLoggerModule extends BaseModule implements Module,
     protected defaultName: string;
     protected defaultVersion: string;
     private store;
+    private window?;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     setContext(context: ScanOrderLoggerContext): void;
     setProvider(provider: ScanOrderLoggerProviderType): void;
     setProviderConfig(providerConfig: ScanOrderLoggerProviderConfig): void;
+    private getCurrentHost;
     private buildRecord;
     addLog(params: ScanOrderLogInput): Promise<void>;
 }

package/dist/modules/ScanOrderLogger/index.js

@@ -46,6 +46,7 @@ export var ScanOrderLoggerModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "defaultName", 'scanOrderLogger');
     _defineProperty(_assertThisInitialized(_this), "defaultVersion", '1.0.0');
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
+    _defineProperty(_assertThisInitialized(_this), "window", void 0);
     return _this;
   }
   _createClass(ScanOrderLoggerModule, [{
@@ -64,6 +65,7 @@ export var ScanOrderLoggerModule = /*#__PURE__*/function (_BaseModule) {
               options = _args.length > 1 && _args[1] !== undefined ? _args[1] : {};
               this.core = core;
               this.store = options.store;
+              this.window = core.getPlugin('window') || undefined;
               provider = ((_options$otherParams = options.otherParams) === null || _options$otherParams === void 0 ? void 0 : _options$otherParams.provider) || 'feishu';
               providerConfig = ((_options$otherParams2 = options.otherParams) === null || _options$otherParams2 === void 0 ? void 0 : _options$otherParams2.providerConfig) || {};
               context = ((_options$otherParams3 = options.otherParams) === null || _options$otherParams3 === void 0 ? void 0 : _options$otherParams3.context) || {};
@@ -73,7 +75,7 @@ export var ScanOrderLoggerModule = /*#__PURE__*/function (_BaseModule) {
                 grafana: _objectSpread(_objectSpread({}, defaultProviderConfig.grafana), providerConfig.grafana || {})
               });
               this.store.context = context;
-            case 9:
+            case 10:
             case "end":
               return _context.stop();
           }
@@ -102,16 +104,27 @@ export var ScanOrderLoggerModule = /*#__PURE__*/function (_BaseModule) {
         grafana: _objectSpread(_objectSpread({}, this.store.providerConfig.grafana || {}), providerConfig.grafana || {})
       });
     }
+  }, {
+    key: "getCurrentHost",
+    value: function getCurrentHost() {
+      var _this$window;
+      var host = (_this$window = this.window) === null || _this$window === void 0 || (_this$window = _this$window.location) === null || _this$window === void 0 ? void 0 : _this$window.host;
+      if (typeof host === 'string' && host.length > 0) return host;
+      return undefined;
+    }
   }, {
     key: "buildRecord",
     value: function buildRecord(params) {
+      var host = this.getCurrentHost();
       return {
         level: params.level || 'info',
         title: params.title,
         timestamp: params.timestamp || dayjs().format('YYYY-MM-DD HH:mm:ss'),
         payload: params.payload || {},
         extra: params.extra || {},
-        context: this.store.context || {}
+        context: _objectSpread(_objectSpread({}, this.store.context || {}), host ? {
+          host: host
+        } : {})
       };
     }
   }, {

package/dist/modules/ScanOrderLogger/providers/feishu.js

@@ -142,62 +142,80 @@ function _flushQueue() {
 export var feishuLoggerProvider = {
   send: function send(payload) {
     return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _payload$providerConf, _payload$providerConf2, _payload$providerConf3;
-      var webhook, throttleMs;
+      var _payload$providerConf, _payload$providerConf2, _payload$providerConf3, _payload$providerConf4;
+      var webhook, errorHook, throttleMs;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             cachedProviderConfig = payload.providerConfig;
             webhook = (_payload$providerConf = payload.providerConfig) === null || _payload$providerConf === void 0 || (_payload$providerConf = _payload$providerConf.feishu) === null || _payload$providerConf === void 0 ? void 0 : _payload$providerConf.webhook;
-            if (webhook) {
-              _context.next = 5;
+            errorHook = (_payload$providerConf2 = payload.providerConfig) === null || _payload$providerConf2 === void 0 || (_payload$providerConf2 = _payload$providerConf2.feishu) === null || _payload$providerConf2 === void 0 ? void 0 : _payload$providerConf2.errorHook;
+            if (!(typeof fetch !== 'function')) {
+              _context.next = 6;
               break;
             }
-            console.warn('[ScanOrderLogger] Feishu webhook 未配置，跳过日志上报');
+            console.warn('[ScanOrderLogger] 当前环境不支持 fetch，跳过 Feishu 日志上报');
             return _context.abrupt("return");
-          case 5:
-            if (isWebhookUsable(webhook)) {
-              _context.next = 7;
+          case 6:
+            if (!(payload.record.level === 'error' && isWebhookUsable(errorHook))) {
+              _context.next = 16;
               break;
             }
+            _context.prev = 7;
+            _context.next = 10;
+            return postToFeishu(errorHook, buildFeishuBody([payload.record]));
+          case 10:
+            _context.next = 15;
+            break;
+          case 12:
+            _context.prev = 12;
+            _context.t0 = _context["catch"](7);
+            console.warn('[ScanOrderLogger] Feishu errorHook 上报失败', _context.t0);
+          case 15:
             return _context.abrupt("return");
-          case 7:
-            if (!(typeof fetch !== 'function')) {
-              _context.next = 10;
+          case 16:
+            if (webhook) {
+              _context.next = 19;
               break;
             }
-            console.warn('[ScanOrderLogger] 当前环境不支持 fetch，跳过 Feishu 日志上报');
+            console.warn('[ScanOrderLogger] Feishu webhook 未配置，跳过日志上报');
             return _context.abrupt("return");
-          case 10:
-            throttleMs = (_payload$providerConf2 = (_payload$providerConf3 = payload.providerConfig) === null || _payload$providerConf3 === void 0 || (_payload$providerConf3 = _payload$providerConf3.feishu) === null || _payload$providerConf3 === void 0 ? void 0 : _payload$providerConf3.throttleMs) !== null && _payload$providerConf2 !== void 0 ? _payload$providerConf2 : DEFAULT_THROTTLE_MS;
-            if (!(throttleMs <= 0)) {
+          case 19:
+            if (isWebhookUsable(webhook)) {
               _context.next = 21;
               break;
             }
-            _context.prev = 12;
-            _context.next = 15;
+            return _context.abrupt("return");
+          case 21:
+            throttleMs = (_payload$providerConf3 = (_payload$providerConf4 = payload.providerConfig) === null || _payload$providerConf4 === void 0 || (_payload$providerConf4 = _payload$providerConf4.feishu) === null || _payload$providerConf4 === void 0 ? void 0 : _payload$providerConf4.throttleMs) !== null && _payload$providerConf3 !== void 0 ? _payload$providerConf3 : DEFAULT_THROTTLE_MS;
+            if (!(throttleMs <= 0)) {
+              _context.next = 32;
+              break;
+            }
+            _context.prev = 23;
+            _context.next = 26;
             return postToFeishu(webhook, buildFeishuBody([payload.record]));
-          case 15:
-            _context.next = 20;
+          case 26:
+            _context.next = 31;
             break;
-          case 17:
-            _context.prev = 17;
-            _context.t0 = _context["catch"](12);
-            console.warn('[ScanOrderLogger] Feishu 日志上报失败', _context.t0);
-          case 20:
+          case 28:
+            _context.prev = 28;
+            _context.t1 = _context["catch"](23);
+            console.warn('[ScanOrderLogger] Feishu 日志上报失败', _context.t1);
+          case 31:
             return _context.abrupt("return");
-          case 21:
+          case 32:
             pendingQueue.push(payload.record);
             if (!flushTimer) {
               flushTimer = setTimeout(function () {
                 void flushQueue();
               }, throttleMs);
             }
-          case 23:
+          case 34:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[12, 17]]);
+      }, _callee, null, [[7, 12], [23, 28]]);
     }))();
   }
 };

package/dist/modules/ScanOrderLogger/types.d.ts

@@ -2,6 +2,7 @@ export type ScanOrderLogLevel = 'info' | 'warning' | 'error' | 'debug';
 export type ScanOrderLoggerProviderType = 'feishu' | 'grafana';
 export interface ScanOrderLoggerProviderFeishuConfig {
     webhook?: string;
+    errorHook?: string;
     /**
      * 节流窗口毫秒数，默认 3000ms
      * - >0：首条日志进入队列并启动定时器，窗口结束后合并成一条 Feishu post 统一发送

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

@@ -302,7 +302,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     autoSelectAllProductResources(resources_code: string, timeSlots?: TimeSliceItem): {
         errorList: any[];
     };
-    getTimeSlotByAllResources(resources_code: string): any[];
+    getTimeSlotByAllResources(resources_code: string, split?: number): any[];
     getTimeSlotByAllResourcesForDate({ resources_code, startDate, endDate }: {
         resources_code: string;
         startDate: string;
@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 5 | 3 | 2 | 4 | 6;
+        weekNum: 0 | 2 | 1 | 3 | 5 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/dist/solution/BookingByStep/index.js

@@ -2073,6 +2073,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         _cartItems$,
         _cartItems$2,
         _this$shopStore$get;
+      var split = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 10;
       var dateRange = this.store.date.getDateRange();
       // 取出购物车中所有一已选择的第一步资源
       var resources = [];
@@ -2256,7 +2257,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         resourcesMap: resourcesMap,
         duration: duration,
         currentDate: dateRange[0].date,
-        split: 10,
+        split: split,
         resourcesUseableMap: resourcesUseableMap,
         capacity: maxCapacity,
         cut_off_time: maxCutOffTime,

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

@@ -131,7 +131,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

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

@@ -5,6 +5,7 @@ import type { UpdateProductInOrderParams } from '../../modules/Order/types';
 import type { Discount } from '../../modules/Discount/types';
 import { type CartItemSummary, type PaxInfo, type QuantityCheckResult, type QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
 import type { StrategyConfig } from '../../model/strategy/type';
+import type { ProductData } from '../../modules/Product/types';
 export * from './types';
 interface ScanOrderItemRuleRuntimeConfig {
     strategyConfigs?: StrategyConfig[];
@@ -36,11 +37,14 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     private customerLoginRefreshIdInFlight;
     private static readonly PISELL1_LOGIN_SUCCESS;
     private getScanOrderLoggerContext;
+    private safeStringify;
+    private pickErrorMessage;
     private serializeError;
     private addScanOrderLog;
     private logMethodStart;
     private logMethodSuccess;
     private logMethodError;
+    private assertProductListLoaded;
     addLog(params: ScanOrderAddLogParams): Promise<void>;
     private normalizeCustomerId;
     private resolveCustomerIdFromLoginPayload;
@@ -86,6 +90,8 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     onCustomerLogin(params: {
         customerId: number;
     }): Promise<void>;
+    private findReservationRuleResource;
+    private buildScanOrderResourceMetadata;
     private buildSubmitPayloadEnhancer;
     submitScanOrder<T = any>(): Promise<T>;
     addProductToOrder(product: Partial<ScanOrderOrderProduct> & ScanOrderOrderProductIdentity): Promise<ScanOrderOrderProduct[]>;
@@ -120,7 +126,7 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
         orderAmount: number;
         orderItems: any[];
     }>;
-    getProductList(): Promise<any>;
+    getProductList(): Promise<ProductData[]>;
     getOtherParams(): Record<string, any>;
     setOtherParams(params: Record<string, any>, { cover }?: {
         cover?: boolean;