@pisell/pisellos 0.0.568 → 0.10.1

package/dist/solution/VenueBooking/sales-section-4-annotated.json

@@ -71,8 +71,6 @@
         "num__comment": "数量；int；↕；必填。统一使用 num，不再使用 product_quantity。",
         "product_variant_id": 0,
         "product_variant_id__comment": "多规格 ID；int；↕；可选。",
-        "product_option_item": [],
-        "product_option_item__comment": "选项配置；array；↕；可选。",
         "selling_price": "50.00",
         "selling_price__comment": "销售单价（交易快照）；string；←；服务端返回，不能依赖基准数据回填。",
         "original_price": "60.00",

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

@@ -7,9 +7,7 @@ export declare enum VenueBookingHooks {
     onDestroy = "venueBooking:onDestroy",
     onRetryInit = "venueBooking:onRetryInit",
     onRefresh = "venueBooking:onRefresh",
-    onCartValidationChanged = "venueBooking:onCartValidationChanged",
-    /** 登录客户的智能定价、营销配置与订单汇总已完成刷新 */
-    onSmartPricingUpdated = "venueBooking:onSmartPricingUpdated"
+    onCartValidationChanged = "venueBooking:onCartValidationChanged"
 }
 export type VenueBookingStatus = 'idle' | 'initializing' | 'ready' | 'error';
 export interface VenueBookingEntryContext {

package/dist/solution/VenueBooking/types.js

@@ -4,7 +4,6 @@ export var VenueBookingHooks = /*#__PURE__*/function (VenueBookingHooks) {
   VenueBookingHooks["onRetryInit"] = "venueBooking:onRetryInit";
   VenueBookingHooks["onRefresh"] = "venueBooking:onRefresh";
   VenueBookingHooks["onCartValidationChanged"] = "venueBooking:onCartValidationChanged";
-  VenueBookingHooks["onSmartPricingUpdated"] = "venueBooking:onSmartPricingUpdated";
   return VenueBookingHooks;
 }({});
 

package/dist/solution/VenueBooking/utils/dateSummary.d.ts

@@ -1,11 +1,11 @@
 import type { VenueBookingSlotConfig, VenueResourceRawData, VenueDateSummaryItem, ResourceProductMapping } from '../types';
+import type { QuotationModule } from '../../../modules/Quotation';
 export declare function buildDateRangeSummary(params: {
     startDate: string;
     endDate: string;
     config: VenueBookingSlotConfig;
     rawResources: VenueResourceRawData[];
     resourceProductMap: Map<number | string, ResourceProductMapping[]>;
+    quotationModule?: QuotationModule;
     resolveConfig?: (date: string) => VenueBookingSlotConfig;
-    /** 按日期构建 slot 智能定价 Map */
-    buildSlotPriceMap?: (date: string, config: VenueBookingSlotConfig, productIds: number[]) => Map<string, string | null>;
 }): VenueDateSummaryItem[];

package/dist/solution/VenueBooking/utils/dateSummary.js

@@ -6,31 +6,41 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import dayjs from 'dayjs';
-import { buildTimeSlotGrid } from "./timeSlot";
+import { buildTimeSlotGrid, generateTimeLabels } from "./timeSlot";
 export function buildDateRangeSummary(params) {
   var startDate = params.startDate,
     endDate = params.endDate,
     config = params.config,
     rawResources = params.rawResources,
     resourceProductMap = params.resourceProductMap,
-    resolveConfig = params.resolveConfig,
-    buildSlotPriceMap = params.buildSlotPriceMap;
+    quotationModule = params.quotationModule,
+    resolveConfig = params.resolveConfig;
   var result = [];
-  var productIds = buildSlotPriceMap ? _toConsumableArray(new Set(_toConsumableArray(resourceProductMap.values()).flat().map(function (m) {
+  var productIds = quotationModule ? _toConsumableArray(new Set(_toConsumableArray(resourceProductMap.values()).flat().map(function (m) {
     return m.productId;
   }))) : [];
   var cursor = dayjs(startDate);
   var end = dayjs(endDate);
-  while (!cursor.isAfter(end)) {
-    var _date = cursor.format('YYYY-MM-DD');
-    var effectiveConfig = (resolveConfig === null || resolveConfig === void 0 ? void 0 : resolveConfig(_date)) || config;
-    var slotPriceMap = buildSlotPriceMap && productIds.length ? buildSlotPriceMap(_date, effectiveConfig, productIds) : undefined;
+  var _loop = function _loop() {
+    var date = cursor.format('YYYY-MM-DD');
+    var effectiveConfig = (resolveConfig === null || resolveConfig === void 0 ? void 0 : resolveConfig(date)) || config;
+    var quotationPriceMap;
+    if (quotationModule && productIds.length) {
+      var timeLabels = generateTimeLabels(effectiveConfig);
+      var timePoints = timeLabels.map(function (label) {
+        return "".concat(date, " ").concat(label);
+      });
+      quotationPriceMap = quotationModule.buildProductPriceMap({
+        productIds: productIds,
+        timePoints: timePoints
+      });
+    }
     var grid = buildTimeSlotGrid({
-      date: _date,
+      date: date,
       config: effectiveConfig,
       rawResources: rawResources,
       resourceProductMap: resourceProductMap,
-      slotPriceMap: slotPriceMap
+      quotationPriceMap: quotationPriceMap
     });
     var totalSlots = 0;
     var availableSlots = 0;
@@ -68,7 +78,7 @@ export function buildDateRangeSummary(params) {
     } finally {
       _iterator.f();
     }
-    var status = void 0;
+    var status;
     if (totalSlots === 0) {
       status = 'unavailable';
     } else if (availableSlots === 0) {
@@ -79,13 +89,16 @@ export function buildDateRangeSummary(params) {
       status = 'available';
     }
     result.push({
-      date: _date,
+      date: date,
       status: status,
       startingPrice: lowestPrice !== null ? lowestPrice.toFixed(2) : null,
       totalSlots: totalSlots,
       availableSlots: availableSlots
     });
     cursor = cursor.add(1, 'day');
+  };
+  while (!cursor.isAfter(end)) {
+    _loop();
   }
   return result;
 }

package/dist/solution/VenueBooking/utils/slotMerge.d.ts

@@ -5,6 +5,12 @@ export declare function mergeConsecutiveSlots(slots: VenueSlotSelection[]): Merg
 export declare function buildPriceBreakdown(params: {
     group: MergedSlotGroup;
     productId: number;
+    quotation?: {
+        getQuotationShelfId: (p: {
+            productId: number;
+            datetime: string;
+        }) => number;
+    };
 }): PriceBreakdownEntry[];
 export interface BuildVenueBookingParams {
     group: MergedSlotGroup;

package/dist/solution/VenueBooking/utils/slotMerge.js

@@ -51,7 +51,9 @@ export function mergeConsecutiveSlots(slots) {
   return groups;
 }
 export function buildPriceBreakdown(params) {
-  var group = params.group;
+  var group = params.group,
+    productId = params.productId,
+    quotation = params.quotation;
   if (!group.slots.length) return [];
   var entries = [];
   var _iterator = _createForOfIteratorHelper(group.slots),
@@ -60,10 +62,14 @@ export function buildPriceBreakdown(params) {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
       var slot = _step.value;
       var unitPrice = Number(slot.price || '0');
+      var shelfId = quotation ? quotation.getQuotationShelfId({
+        productId: productId,
+        datetime: slot.startTime
+      }) : 0;
       var startHm = dayjs(slot.startTime, 'YYYY-MM-DD HH:mm').format('YYYY-MM-DD HH:mm');
       var endHm = dayjs(slot.endTime, 'YYYY-MM-DD HH:mm').format('YYYY-MM-DD HH:mm');
       var last = entries[entries.length - 1];
-      if (last && last.unit_price === unitPrice && last.quotation_shelf_id === 0 && last.end_time === startHm) {
+      if (last && last.unit_price === unitPrice && last.quotation_shelf_id === shelfId && last.end_time === startHm) {
         last.end_time = endHm;
         last.quantity += 1;
       } else {
@@ -71,7 +77,7 @@ export function buildPriceBreakdown(params) {
           start_time: startHm,
           end_time: endHm,
           unit_price: unitPrice,
-          quotation_shelf_id: 0,
+          quotation_shelf_id: shelfId,
           quantity: 1
         });
       }

package/dist/solution/VenueBooking/utils/timeSlot.d.ts

@@ -27,8 +27,6 @@ export declare function buildTimeSlotGrid(params: {
     config: VenueBookingSlotConfig;
     rawResources: VenueResourceRawData[];
     resourceProductMap: Map<number | string, ResourceProductMapping[]>;
-    /** @deprecated 使用 slotPriceMap */
     quotationPriceMap?: Map<string, string | null>;
-    slotPriceMap?: Map<string, string | null>;
 }): VenueTimeSlotGrid;
 export {};

package/dist/solution/VenueBooking/utils/timeSlot.js

@@ -230,7 +230,6 @@ function buildProductSlots(params) {
     now = params.now,
     crossDay = params.crossDay,
     quotationPriceMap = params.quotationPriceMap,
-    slotPriceMap = params.slotPriceMap,
     childRawResources = params.childRawResources,
     childTimesCache = params.childTimesCache,
     childEventsCache = params.childEventsCache,
@@ -240,7 +239,7 @@ function buildProductSlots(params) {
     _step7;
   try {
     for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-      var _resolvedPriceMap$get;
+      var _quotationPriceMap$ge;
       var label = _step7.value;
       var _label$split$map = label.split(':').map(Number),
         _label$split$map2 = _slicedToArray(_label$split$map, 1),
@@ -299,12 +298,11 @@ function buildProductSlots(params) {
       }
       var isBookable = status === 'available' || status === 'partially_occupied';
       var slotStartStr = slotStart.format('YYYY-MM-DD HH:mm');
-      var resolvedPriceMap = slotPriceMap !== null && slotPriceMap !== void 0 ? slotPriceMap : quotationPriceMap;
       slots.push({
         startTime: slotStartStr,
         endTime: slotEnd.format('YYYY-MM-DD HH:mm'),
         status: status,
-        price: isBookable ? (_resolvedPriceMap$get = resolvedPriceMap === null || resolvedPriceMap === void 0 ? void 0 : resolvedPriceMap.get("".concat(mapping.productId, ":").concat(slotStartStr))) !== null && _resolvedPriceMap$get !== void 0 ? _resolvedPriceMap$get : mapping.price : null,
+        price: isBookable ? (_quotationPriceMap$ge = quotationPriceMap === null || quotationPriceMap === void 0 ? void 0 : quotationPriceMap.get("".concat(mapping.productId, ":").concat(slotStartStr))) !== null && _quotationPriceMap$ge !== void 0 ? _quotationPriceMap$ge : mapping.price : null,
         resourceId: resource.resourceId,
         resourceFormId: resource.formId,
         capacity: status === 'past' || status === 'unavailable' ? null : resCapacity,
@@ -324,9 +322,7 @@ export function buildTimeSlotGrid(params) {
     config = params.config,
     rawResources = params.rawResources,
     resourceProductMap = params.resourceProductMap,
-    quotationPriceMap = params.quotationPriceMap,
-    slotPriceMap = params.slotPriceMap;
-  var resolvedPriceMap = slotPriceMap !== null && slotPriceMap !== void 0 ? slotPriceMap : quotationPriceMap;
+    quotationPriceMap = params.quotationPriceMap;
   var timeLabels = generateTimeLabels(config);
   var now = dayjs();
   var crossDay = isBusinessHoursCrossDay(config);
@@ -381,8 +377,7 @@ export function buildTimeSlotGrid(params) {
           resCapacity: resCapacity,
           now: now,
           crossDay: crossDay,
-          quotationPriceMap: resolvedPriceMap,
-          slotPriceMap: resolvedPriceMap,
+          quotationPriceMap: quotationPriceMap,
           childRawResources: childRawResources,
           childTimesCache: childTimesCache,
           childEventsCache: childEventsCache,

package/dist/solution/index.d.ts

@@ -6,4 +6,6 @@ export * from './RegisterAndLogin';
 export * from './Checkout';
 export * from './Sales';
 export * from './ScanOrder';
+export * from './BaseSales';
 export * from './VenueBooking';
+export * from './UnifiedBookingSales';

package/dist/solution/index.js

@@ -6,4 +6,6 @@ export * from "./RegisterAndLogin";
 export * from "./Checkout";
 export * from "./Sales";
 export * from "./ScanOrder";
-export * from "./VenueBooking";
+export * from "./BaseSales";
+export * from "./VenueBooking";
+export * from "./UnifiedBookingSales";

package/dist/types/index.d.ts

@@ -15,6 +15,16 @@ export interface Module {
     name: string;
     version: string;
     initialize: (core: PisellCore, options: ModuleOptions) => Promise<void> | void;
+    /**
+     * 父级解决方案运行时更新 otherParams 后，显式通知子模块刷新自己的运行态参数。
+     *
+     * @example
+     * await module.updateOtherParams?.({ channel: 'pos' }, { changedParams: { channel: 'pos' } });
+     */
+    updateOtherParams?: (params: Record<string, any>, meta?: {
+        changedParams?: Record<string, any>;
+        cover?: boolean;
+    }) => Promise<void> | void;
     destroy?: () => Promise<void> | void;
     exports?: Record<string, any>;
     isSolution?: boolean;
@@ -39,8 +49,8 @@ export interface PisellCore {
     getModuleExports: <T = any>(name: string) => T | null;
     hasModule: (name: string) => boolean;
     effects: {
-        on: (event: string, callback: (payload: any) => void, force?: boolean) => void;
-        once: (event: string, callback: (payload: any) => void, force?: boolean) => void;
+        on: (event: string, callback: (payload: any) => void) => () => void;
+        once: (event: string, callback: (payload: any) => void) => () => void;
         only: (event: string, callback: (payload: any) => void) => () => void;
         off: (event: string, callback: (payload: any) => void) => void;
         emit: (event: string, payload: any, value?: any) => Promise<{

package/dist/utils/task.js

@@ -94,7 +94,7 @@ var Tasks = /*#__PURE__*/function () {
               // 遍历任务队列
             case 6:
               if (!(this.taskQueue.length > 0)) {
-                _context.next = 29;
+                _context.next = 32;
                 break;
               }
               // 获取任务，但是不删除
@@ -109,7 +109,7 @@ var Tasks = /*#__PURE__*/function () {
               // 获取任务对应的action
               action = this.actions.get(task.type); // 如果找到对应的action，则执行
               if (!action) {
-                _context.next = 26;
+                _context.next = 28;
                 break;
               }
               _context.prev = 13;
@@ -118,33 +118,36 @@ var Tasks = /*#__PURE__*/function () {
                 uuid: task === null || task === void 0 ? void 0 : task.uuid
               }));
             case 16:
-              _context.next = 21;
+              console.log('task_success>>>>>>>', task);
+              _context.next = 22;
               break;
-            case 18:
-              _context.prev = 18;
+            case 19:
+              _context.prev = 19;
               _context.t0 = _context["catch"](13);
               console.error('task_error>>>>>>>', _context.t0);
-            case 21:
-              _context.prev = 21;
+            case 22:
+              _context.prev = 22;
               // 将任务删除
               _task = this.taskQueue.shift();
-              return _context.finish(21);
-            case 24:
-              _context.next = 27;
-              break;
+              console.log('task_shift>>>>>>>', _task);
+              return _context.finish(22);
             case 26:
+              _context.next = 30;
+              break;
+            case 28:
               // 如果找不到对应的action，则删除任务
               _task2 = this.taskQueue.shift();
-            case 27:
+              console.log('task_action_not_found>>>>>>>', _task2);
+            case 30:
               _context.next = 6;
               break;
-            case 29:
+            case 32:
               this.isRunning = false;
-            case 30:
+            case 33:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[13, 18, 21, 24]]);
+        }, _callee, this, [[13, 19, 22, 26]]);
       }));
       function run() {
         return _run.apply(this, arguments);

package/dist/utils/watch.js

@@ -203,6 +203,7 @@ var Watch = /*#__PURE__*/function () {
     key: "getLastEnableEventKey",
     value: function getLastEnableEventKey(watchKey) {
       var enableList = this.enableListMap.get(watchKey);
+      console.log('enableList', enableList);
       if (!enableList) {
         return undefined;
       }

package/lib/apis/picoding.js

@@ -1,2 +0,0 @@
-// picoding 相关公共 api
-"use strict";