@pisell/pisellos 2.2.243 → 2.2.245

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

@@ -80,7 +80,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     await this.core.effects.emit(import_types.OrderHooks.onOrdersChanged, payload);
   }
   async initialize(core, options) {
-    var _a, _b;
+    var _a;
     this.core = core;
     this.store = options == null ? void 0 : options.store;
     if (!this.store.map)
@@ -91,48 +91,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       this.dbManager = app.sqlite;
       this.logger = app.logger;
       this.storage = app.storage;
-      const coreData = app.data.store.getStore().getDataByModel("core");
-      if (!((_a = this.store.createdAtQuery) == null ? void 0 : _a.sales_time_between) && (coreData == null ? void 0 : coreData.core)) {
-        const today = (0, import_dayjs.default)();
-        if (coreData == null ? void 0 : coreData.core.operating_day_boundary) {
-          const operatingDayBoundary = coreData.core.operating_day_boundary;
-          if (operatingDayBoundary.type === "start_time") {
-            const boundaryTime = String(operatingDayBoundary.time || "").trim();
-            const boundaryStart = (0, import_dayjs.default)(`${today.format("YYYY-MM-DD")} ${boundaryTime}`);
-            if (boundaryStart.isValid()) {
-              const isAfterBoundary = today.isAfter(boundaryStart);
-              const queryStart = isAfterBoundary ? today.startOf("day") : today.subtract(1, "day").startOf("day");
-              const queryEnd = isAfterBoundary ? today.add(1, "day").endOf("day") : today.endOf("day");
-              this.store.createdAtQuery = {
-                sales_time_between: [
-                  queryStart.format("YYYY-MM-DD HH:mm:ss"),
-                  queryEnd.format("YYYY-MM-DD HH:mm:ss")
-                ]
-              };
-            } else {
-              this.store.createdAtQuery = {
-                sales_time_between: [
-                  today.startOf("day").format("YYYY-MM-DD HH:mm:ss"),
-                  today.endOf("day").format("YYYY-MM-DD HH:mm:ss")
-                ]
-              };
-            }
-          } else {
-            this.store.createdAtQuery = {
-              sales_time_between: [
-                today.startOf("day").format("YYYY-MM-DD HH:mm:ss"),
-                today.endOf("day").format("YYYY-MM-DD HH:mm:ss")
-              ]
-            };
-          }
-        } else {
-          this.store.createdAtQuery = {
-            sales_time_between: [today.startOf("day").format("YYYY-MM-DD HH:mm:ss"), today.endOf("day").format("YYYY-MM-DD HH:mm:ss")]
-          };
-        }
-      }
+      this.updateCreateStore();
     }
-    if (Array.isArray((_b = options == null ? void 0 : options.initialState) == null ? void 0 : _b.list)) {
+    if (Array.isArray((_a = options == null ? void 0 : options.initialState) == null ? void 0 : _a.list)) {
       this.store.list = options.initialState.list.map((order) => this.normalizeOrderForMemoryList(order));
       this.syncOrdersMap();
       this.emitOrdersChanged([], "initialState");
@@ -347,6 +308,53 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       bodyOrderId: (normalizedBody == null ? void 0 : normalizedBody.order_id) ?? null
     };
   }
+  updateCreateStore() {
+    var _a;
+    const appPlugin = this.core.getPlugin("app");
+    const app = appPlugin == null ? void 0 : appPlugin.getApp();
+    if (app) {
+      const coreData = app.data.store.getStore().getDataByModel("core");
+      if (!((_a = this.store.createdAtQuery) == null ? void 0 : _a.sales_time_between) && (coreData == null ? void 0 : coreData.core)) {
+        const today = (0, import_dayjs.default)();
+        if (coreData == null ? void 0 : coreData.core.operating_day_boundary) {
+          const operatingDayBoundary = coreData.core.operating_day_boundary;
+          if (operatingDayBoundary.type === "start_time") {
+            const boundaryTime = String(operatingDayBoundary.time || "").trim();
+            const boundaryStart = (0, import_dayjs.default)(`${today.format("YYYY-MM-DD")} ${boundaryTime}`);
+            if (boundaryStart.isValid()) {
+              const isAfterBoundary = today.isAfter(boundaryStart);
+              const queryStart = isAfterBoundary ? today.startOf("day") : today.subtract(1, "day").startOf("day");
+              const queryEnd = isAfterBoundary ? today.add(1, "day").endOf("day") : today.endOf("day");
+              this.store.createdAtQuery = {
+                sales_time_between: [
+                  queryStart.format("YYYY-MM-DD HH:mm:ss"),
+                  queryEnd.format("YYYY-MM-DD HH:mm:ss")
+                ]
+              };
+            } else {
+              this.store.createdAtQuery = {
+                sales_time_between: [
+                  today.startOf("day").format("YYYY-MM-DD HH:mm:ss"),
+                  today.endOf("day").format("YYYY-MM-DD HH:mm:ss")
+                ]
+              };
+            }
+          } else {
+            this.store.createdAtQuery = {
+              sales_time_between: [
+                today.startOf("day").format("YYYY-MM-DD HH:mm:ss"),
+                today.endOf("day").format("YYYY-MM-DD HH:mm:ss")
+              ]
+            };
+          }
+        } else {
+          this.store.createdAtQuery = {
+            sales_time_between: [today.startOf("day").format("YYYY-MM-DD HH:mm:ss"), today.endOf("day").format("YYYY-MM-DD HH:mm:ss")]
+          };
+        }
+      }
+    }
+  }
   getOrderSyncThrottleMs() {
     const raw = localStorage.getItem(ORDER_SYNC_THROTTLE_MS_STORAGE_KEY);
     if (raw !== null) {
@@ -449,6 +457,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
     this.logInfo("silentRefresh 开始");
     try {
+      this.updateCreateStore();
       const orders = await this.loadOrdersByServer();
       if (orders.length > 0) {
         this.store.list = (0, import_lodash_es.cloneDeep)(orders);
@@ -1141,6 +1150,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const topLevelUid = record.unique_identification_number;
     if (!this.isBlankIdentityValue(topLevelUid))
       return `uid:${String(topLevelUid)}`;
+    const orderDetailId = record.order_detail_id;
+    if (!this.isBlankIdentityValue(orderDetailId))
+      return `detail:${String(orderDetailId)}`;
     const bookingUid = record.booking_uid;
     if (!this.isBlankIdentityValue(bookingUid))
       return `booking:${String(bookingUid)}`;

package/lib/server/utils/small-ticket.js

@@ -200,6 +200,8 @@ function buildProducts(order, locale, productMap) {
 function resolveProductTitle(params) {
   const { product, productMap, locale } = params;
   const ownTitle = getProductTitleSource(product, locale);
+  if (ownTitle)
+    return ownTitle;
   const productId = product.product_id ?? product.id;
   const fallbackProduct = resolveProductFromMap(productId, productMap);
   if (!fallbackProduct)
@@ -356,7 +358,9 @@ function resolveTitleValue(value, locale) {
     return stringify(value);
   const dashedLocale = locale.replace("_", "-");
   const underscoredLocale = locale.replace("-", "_");
-  return stringify(value[locale] ?? value[dashedLocale] ?? value[underscoredLocale] ?? "");
+  return stringify(
+    value[locale] ?? value[dashedLocale] ?? value[underscoredLocale] ?? value.original ?? value.auto ?? ""
+  );
 }
 function resolveOptionTitleFromParentProduct(params) {
   const { option, parentProduct, locale } = params;
@@ -517,7 +521,7 @@ function buildFees(params) {
         summary.product_quantity || products.reduce((sum, product) => sum + product.product_quantity, 0),
         0
       ),
-      has_pay: formatMoney(sumPayments(order.payments), currencySymbol),
+      has_pay: formatMoney(calculateReceiptPaidAmount(order, summary), currencySymbol),
       payment_method: "",
       tax_title: stringify(summary.tax_title || order.tax_title || shopInfo.tax_title),
       total_refund_amount: formatMoney(summary.total_refund_amount || order.total_refund_amount, currencySymbol),
@@ -738,6 +742,21 @@ function formatMoney(value, currencySymbol) {
   const amount = new import_decimal.default(toMoneyNumber(value));
   return `${currencySymbol}${amount.toFixed(2)}`;
 }
+function calculateReceiptPaidAmount(order, summary) {
+  const paidAmount = sumPayments(order.payments);
+  const payProcessingFee = new import_decimal.default(
+    toMoneyNumber(summary.pay_service_charge_amount ?? order.pay_service_charge_amount)
+  );
+  if (payProcessingFee.lte(0))
+    return paidAmount;
+  const totalAmount = new import_decimal.default(toMoneyNumber(summary.total_amount ?? order.total_amount));
+  if (totalAmount.gt(0) && paidAmount.gte(totalAmount))
+    return paidAmount;
+  const paidAmountWithFee = paidAmount.plus(payProcessingFee);
+  if (totalAmount.gt(0) && paidAmountWithFee.gt(totalAmount))
+    return totalAmount;
+  return paidAmountWithFee;
+}
 function sumPayments(payments) {
   return normalizeArray(payments).filter((payment) => isPrintablePayment(payment)).reduce((sum, payment) => {
     return sum.plus(toMoneyNumber(payment.amount ?? payment.origin_amount));

package/lib/solution/BaseSales/index.d.ts

@@ -2,7 +2,7 @@ import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
 import { BaseSalesOrderProduct, BaseSalesOrderProductIdentity, BaseSalesPaymentStatus, BaseSalesUpdateOrderProductQuantityParams, BaseSalesCalculateProductBookingPriceParams, BaseSalesProductBookingPriceResult, BaseSalesScanCodeResult } from './types';
 import { OrderModule } from '../../modules/Order';
-import type { AddProductBookingInput, LoadSalesDetailParams, OrderPaymentData, OrderPaymentSource, SendCustomerPayLinkParams, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, UpdateTempOrderCustomerInput, UpdateOrderBookingParams, UpdateOrderProductParams, OrderTempOrder, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions } from '../../modules/Order/types';
+import type { AddProductBookingInput, LoadSalesDetailParams, OrderPaymentData, OrderPaymentSource, SendCustomerPayLinkParams, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, UpdateTempOrderCustomerInput, UpdateOrderBookingParams, UpdateOrderProductParams, OrderTempOrder, OrderSummary, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions } from '../../modules/Order/types';
 import type { SubmitPayloadEnhancer } from '../../modules/Order/utils';
 import type { Discount } from '../../modules/Discount/types';
 import { RequestPlugin, WindowPlugin } from '../../plugins';
@@ -143,6 +143,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     updateTempOrderNote(note: string, sync: boolean): string | Promise<string>;
     updateRemoteOrderNote(orderId: number | string, note: string): void;
     updateTempOrderShopDiscount(amount: string | number): string;
+    updateTempOrderDepositAmount(amount: string | number): OrderSummary;
     updateTempOrderContactsInfo(contactsInfo: Record<string, any> | null): Record<string, any> | null;
     /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化。 */
     setEnableTempOrderPersist(enabled: boolean): void;
@@ -158,7 +159,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
      */
     clearOrderCartLines(): Promise<OrderTempOrder>;
     getOrderProducts(): import("../../modules/Order/types").OrderProduct[];
-    getSummary(): Promise<import("../../modules/Order/types").OrderSummary>;
+    getSummary(): Promise<OrderSummary>;
     private getHistoricalProductDiscountList;
     private isPersistedOrderProduct;
     private mergeHistoricalDiscountList;

package/lib/solution/BaseSales/index.js

@@ -718,6 +718,11 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       throw new Error("order 模块未初始化");
     return this.store.order.updateTempOrderShopDiscount(amount);
   }
+  updateTempOrderDepositAmount(amount) {
+    if (!this.store.order)
+      throw new Error("order 模块未初始化");
+    return this.store.order.updateTempOrderDepositAmount(amount);
+  }
   updateTempOrderContactsInfo(contactsInfo) {
     if (!this.store.order)
       throw new Error("order 模块未初始化");

package/lib/solution/BaseSales/types.d.ts

@@ -48,6 +48,9 @@ export interface BaseSalesProductSku {
     option: any[];
     [key: string]: any;
 }
+export interface BaseSalesLocalizedText {
+    [locale: string]: string | null;
+}
 export interface BaseSalesUpdateOrderProductQuantityParams extends BaseSalesOrderProductIdentity {
     num: number;
 }
@@ -78,6 +81,8 @@ export interface BaseSalesOrderProduct extends BaseSalesOrderProductIdentity {
     product_bundle: any[];
     /** 关联 booking.metadata.unique_identification_number */
     booking_uid?: string;
+    /** 多语言商品标题快照，随 tempOrder 提交到 checkout。 */
+    product_title?: BaseSalesLocalizedText;
     /**
      * 行级扩展 metadata。价格相关的权威字段：
      *
@@ -132,6 +137,7 @@ export interface BaseSalesSummary {
     deposit?: {
         total: string;
         deposit_policy_ids: number[];
+        deposit_policy_data?: any[];
         hasDeposit: boolean;
     };
     expect_amount: string;

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 | 6 | 4;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

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

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

@@ -106,7 +106,8 @@ async function applyGlobalScan(host, formatted, bridge) {
       return { status: "failed", reason: "invalid_data" };
     }
     const snapshot = host.getOrderCustomerSnapshot();
-    if ((0, import_cartView.isWalkInCustomer)(snapshot)) {
+    const scannedCustomerIsWalkIn = (0, import_cartView.isWalkInCustomer)(data);
+    if ((0, import_cartView.isWalkInCustomer)(snapshot) || scannedCustomerIsWalkIn) {
       if (!(bridge == null ? void 0 : bridge.applyPromotionCode)) {
         return { status: "failed", reason: "no_bridge" };
       }

package/package.json

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