@pisell/pisellos 2.2.254 → 2.2.256

package/dist/modules/BookingContext/utils/buildCacheItemFromOrderLine.js

@@ -125,6 +125,13 @@ function resolveProductTitle(product, booking, sourceProduct) {
   var metadata = product.metadata || {};
   return (_ref = (_ref2 = (_ref3 = (_ref4 = (_ref5 = (_title = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title) !== null && _title !== void 0 ? _title : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.name) !== null && _ref5 !== void 0 ? _ref5 : metadata.product_title) !== null && _ref4 !== void 0 ? _ref4 : metadata.product_name) !== null && _ref3 !== void 0 ? _ref3 : booking === null || booking === void 0 || (_booking$product = booking.product) === null || _booking$product === void 0 ? void 0 : _booking$product.title) !== null && _ref2 !== void 0 ? _ref2 : booking === null || booking === void 0 || (_booking$detail = booking.detail) === null || _booking$detail === void 0 ? void 0 : _booking$detail.product_title) !== null && _ref !== void 0 ? _ref : '';
 }
+function resolveMainProductPrice(product, fallback) {
+  var _metadata$main_produc;
+  var metadata = product.metadata || {};
+  var value = (_metadata$main_produc = metadata.main_product_original_price) !== null && _metadata$main_produc !== void 0 ? _metadata$main_produc : metadata.source_product_price;
+  var parsed = Number(value);
+  return Number.isFinite(parsed) ? parsed : fallback;
+}
 
 /**
  * catalog 缺 product_resource 时，从 booking.resources 反推最小 product_resource 结构，
@@ -182,6 +189,7 @@ export function buildCacheItemFromOrderLine(input) {
   var resolvedId = (_product$product_id = product.product_id) !== null && _product$product_id !== void 0 ? _product$product_id : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.id;
   var selling = Number((_product$selling_pric = product.selling_price) !== null && _product$selling_pric !== void 0 ? _product$selling_pric : 0);
   var original = Number((_product$original_pri = product.original_price) !== null && _product$original_pri !== void 0 ? _product$original_pri : selling);
+  var mainProductPrice = resolveMainProductPrice(product, selling);
   var startDate = safeFormat(booking.start_date, 'YYYY-MM-DD');
   var endDate = safeFormat(booking.end_date, 'YYYY-MM-DD');
   var startTime = normalizeTimeString(booking.start_time);
@@ -208,7 +216,7 @@ export function buildCacheItemFromOrderLine(input) {
     quantity: (_product$num = product.num) !== null && _product$num !== void 0 ? _product$num : 1,
     product_name: productTitle,
     note: (_ref8 = (_product$note = product.note) !== null && _product$note !== void 0 ? _product$note : booking === null || booking === void 0 || (_booking$detail2 = booking.detail) === null || _booking$detail2 === void 0 ? void 0 : _booking$detail2.note) !== null && _ref8 !== void 0 ? _ref8 : '',
-    price: selling,
+    price: mainProductPrice,
     total: selling,
     origin_total: original,
     resource: resource,

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

@@ -431,7 +431,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<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/index.js

@@ -5385,6 +5385,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               _context43.next = 2;
               return this.request.get("/order/sales/".concat(order_id), {
                 with: ['products', 'bookings']
+              }, {
+                osServer: true
               });
             case 2:
               res = _context43.sent;

package/dist/server/index.js

@@ -4022,6 +4022,7 @@ var Server = /*#__PURE__*/function () {
                 shop_order_number: next.shop_order_number,
                 shop_full_order_number: next.shop_full_order_number
               });
+              // 删除 数据体中的 vouchers,对小票和后端来说他们不需要，这个字段只是单向同步给前端用的，而且目前对订单来说还没什么用
               return _context42.abrupt("return", next);
             case 28:
               _context42.prev = 28;

package/dist/server/modules/order/index.d.ts

@@ -32,10 +32,10 @@ export declare class OrderModule extends BaseModule implements Module {
     private emitOrdersChanged;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     /**
-   * 记录信息日志
-   * @param title 日志标题
-   * @param metadata 日志元数据
-   */
+     * 记录信息日志
+     * @param title 日志标题
+     * @param metadata 日志元数据
+     */
     private logInfo;
     /**
      * 记录错误日志

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

@@ -172,10 +172,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       return initialize;
     }()
     /**
-    * 记录信息日志
-    * @param title 日志标题
-    * @param metadata 日志元数据
-    */
+     * 记录信息日志
+     * @param title 日志标题
+     * @param metadata 日志元数据
+     */
   }, {
     key: "logInfo",
     value: function logInfo(title, metadata) {

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 | 2 | 1 | 6 | 3 | 4 | 5;
+        weekNum: 0 | 2 | 1 | 5 | 3 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/modules/BookingContext/utils/buildCacheItemFromOrderLine.js

@@ -136,6 +136,12 @@ function resolveProductTitle(product, booking, sourceProduct) {
   const metadata = product.metadata || {};
   return (sourceProduct == null ? void 0 : sourceProduct.title) ?? (sourceProduct == null ? void 0 : sourceProduct.name) ?? metadata.product_title ?? metadata.product_name ?? ((_a = booking == null ? void 0 : booking.product) == null ? void 0 : _a.title) ?? ((_b = booking == null ? void 0 : booking.detail) == null ? void 0 : _b.product_title) ?? "";
 }
+function resolveMainProductPrice(product, fallback) {
+  const metadata = product.metadata || {};
+  const value = metadata.main_product_original_price ?? metadata.source_product_price;
+  const parsed = Number(value);
+  return Number.isFinite(parsed) ? parsed : fallback;
+}
 function synthesizeProductResourceFromBooking(booking) {
   const rows = booking == null ? void 0 : booking.resources;
   if (!Array.isArray(rows) || rows.length === 0)
@@ -172,6 +178,7 @@ function buildCacheItemFromOrderLine(input) {
   const resolvedId = product.product_id ?? (sourceProduct == null ? void 0 : sourceProduct.id);
   const selling = Number(product.selling_price ?? 0);
   const original = Number(product.original_price ?? selling);
+  const mainProductPrice = resolveMainProductPrice(product, selling);
   const startDate = safeFormat(booking.start_date, "YYYY-MM-DD");
   const endDate = safeFormat(booking.end_date, "YYYY-MM-DD");
   const startTime = normalizeTimeString(booking.start_time);
@@ -198,7 +205,7 @@ function buildCacheItemFromOrderLine(input) {
     quantity: product.num ?? 1,
     product_name: productTitle,
     note: product.note ?? ((_b = booking == null ? void 0 : booking.detail) == null ? void 0 : _b.note) ?? "",
-    price: selling,
+    price: mainProductPrice,
     total: selling,
     origin_total: original,
     resource,

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

@@ -431,7 +431,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/lib/modules/Order/index.js

@@ -3892,6 +3892,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   async getOrderInfo(order_id) {
     const res = await this.request.get(`/order/sales/${order_id}`, {
       with: ["products", "bookings"]
+    }, {
+      osServer: true
     });
     return res;
   }

package/lib/server/modules/order/index.d.ts

@@ -32,10 +32,10 @@ export declare class OrderModule extends BaseModule implements Module {
     private emitOrdersChanged;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     /**
-   * 记录信息日志
-   * @param title 日志标题
-   * @param metadata 日志元数据
-   */
+     * 记录信息日志
+     * @param title 日志标题
+     * @param metadata 日志元数据
+     */
     private logInfo;
     /**
      * 记录错误日志

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

@@ -110,10 +110,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     });
   }
   /**
-  * 记录信息日志
-  * @param title 日志标题
-  * @param metadata 日志元数据
-  */
+   * 记录信息日志
+   * @param title 日志标题
+   * @param metadata 日志元数据
+   */
   logInfo(title, metadata) {
     try {
       if (this.logger) {

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 | 2 | 1 | 6 | 3 | 4 | 5;
+        weekNum: 0 | 2 | 1 | 5 | 3 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/package.json

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