@pisell/pisellos 2.2.302 → 2.2.304

package/lib/modules/SalesSummary/utils.js

@@ -837,11 +837,27 @@ function calculateSalesSummary(params) {
     surchargeList,
     scheduleById = {},
     isInScheduleByDate,
-    shopDiscount
+    shopDiscount,
+    virtualSettlementMode = false
   } = params;
   if (!products?.length) return createEmptySalesSummary();
   const summaryProducts = products.filter(product => !isGeneratedVoucherProduct(product));
   if (!summaryProducts.length) return createEmptySalesSummary();
+  if (virtualSettlementMode) {
+    const productQuantity = summaryProducts.reduce((sum, item) => sum + getSafeNum(item.num), 0);
+    const productAmount = summaryProducts.reduce((sum, item) => sum.plus(toDecimal(item.selling_price).times(getSafeNum(item.num))), new _decimal.default(0));
+    const amount = toFixed2(productAmount);
+    return {
+      ...createEmptySalesSummary(),
+      product_quantity: productQuantity,
+      product_original_amount: amount,
+      product_amount: amount,
+      product_expect_amount: amount,
+      expect_amount: amount,
+      total_amount: amount,
+      is_price_include_tax: isPriceIncludeTax
+    };
+  }
   const productQuantity = summaryProducts.reduce((sum, item) => sum + getSafeNum(item.num), 0);
   const productOriginalAmount = summaryProducts.reduce((sum, item) => sum.plus(getUnitOriginalTotal(item).times(getSafeNum(item.num))), new _decimal.default(0));
   const productAmount = summaryProducts.reduce((sum, item) => sum.plus(getUnitPaymentTotal(item).times(getSafeNum(item.num))), new _decimal.default(0));

package/lib/plugins/request.d.ts

@@ -70,6 +70,7 @@ export interface RequestOptions {
     cache?: CacheProps;
     cacheUpdateChange?: (data: any) => void;
     osServer?: boolean;
+    isNocobase?: boolean;
     prefix?: boolean;
     callback?: (res: any) => void;
     subscriberId?: string;
@@ -125,7 +126,7 @@ declare class RequestPluginImpl implements RequestPlugin {
     /**
      * GET 请求
      */
-    get<T = any>(url: string, options?: RequestOptions): Promise<T>;
+    get<T = any>(url: string, dataOrOptions?: any, options?: RequestOptions): Promise<T>;
     /**
      * POST 请求
      */

package/lib/plugins/request.js

@@ -99,9 +99,10 @@ class RequestPluginImpl {
   /**
    * GET 请求
    */
-  get(url, options = {}) {
+  get(url, dataOrOptions = {}, options) {
+    const requestOptions = options ?? dataOrOptions;
     return this.request({
-      ...options,
+      ...requestOptions,
       url,
       method: 'GET'
     });

package/lib/server/index.d.ts

@@ -421,6 +421,7 @@ declare class Server {
     private shouldUseLocalOrderQuery;
     /**
      * 预约查询是否走本地：
+     * - 日历周/月/资源视图通过 compact_fields 显式标识，始终走远端；
      * - 当 sales_time_between 的开始和结束都不是今天时，走远端；
      * - 其余情况走本地。
      */
@@ -514,12 +515,22 @@ declare class Server {
     private buildCheckoutTaskIdempotencyKey;
     private isBlankCheckoutValue;
     private isLocalCheckoutOrderId;
+    private normalizePrintInvoiceLayoutConfig;
+    private extractInvoiceLayoutConfig;
+    private normalizePrintInvoiceTemplateSettings;
+    private extractInvoiceTemplateSettings;
     private applyCheckoutFulfillmentBuzzer;
     private buildCheckoutResourceIdentifierBuzzer;
     private getCheckoutResourceIdentifier;
     private stringifyCheckoutResourceIdentifier;
     private normalizeCheckoutSubmitData;
     private ensureCheckoutOrderNumbers;
+    /**
+     * Notes 允许在本地草稿阶段暂存空订单目标；checkout 的统一出口负责用最终
+     * shop_order_number 完成绑定并校验，保证后端请求、pending、设备任务和打印
+     * 都使用同一份完整快照。
+     */
+    private finalizeCheckoutSalesNotes;
     private dispatchCheckoutSyncTask;
     private dispatchPrintOtherReceiptTask;
     private buildPrintOtherReceiptIdempotencyKey;
@@ -527,7 +538,10 @@ declare class Server {
     private dispatchLocalReceiptPrint;
     private shouldLookupLocalPrintOrder;
     private getLocalPrintOrderLookup;
+    private mergeLocalPrintOrderInput;
     private handleLocalPrintOrder;
+    private normalizeRequestedReceiptLocales;
+    private handleLocalOrderReceiptSnapshot;
     private handleMachinecodeBatchMeta;
     private resolveMachinecodeBatchMetadataLookup;
     private syncMachinecodeRedeemStatusToLocalOrder;
@@ -536,6 +550,11 @@ declare class Server {
     private handleOrderDraftSubmit;
     private handlePendingSyncCheckoutOrder;
     private buildPendingSyncCheckoutOrder;
+    /**
+     * Checkout 与本地小票必须消费同一份规范化子项快照。
+     * 商品/预约只折叠持久化 ID 或协议 UID 相同的行；支付额外兼容 payment_number。
+     */
+    private normalizeCheckoutCollections;
     /**
      * Android 结账自动小票由当前设备设置控制；其它平台保持原有行为。
      */
@@ -565,6 +584,8 @@ declare class Server {
     private shouldLookupPaymentMethodNameByCode;
     private enrichPaymentNamesByCode;
     private withLocalSmallTicketData;
+    private normalizeRemoteSalesOrderErrorCode;
+    private fetchAndPersistSalesOrderByLookup;
     private handleOrderSalesDetail;
     /**
      * 解析 order_ids 入参，兼容 url query / data 字段、字符串(csv) / 数组两种形态。