@pisell/pisellos 0.0.568 → 0.0.570

package/lib/modules/SalesSummary/index.js

@@ -22,54 +22,120 @@ Object.keys(_types).forEach(function (key) {
     }
   });
 });
+const salesSummaryDataKeys = {
+  isPriceIncludeTax: 'is_price_include_tax',
+  taxRate: 'tax_rate',
+  taxTitle: 'tax_title',
+  taxCountryCode: 'tax_country_code'
+};
+const DEFAULT_SURCHARGE_CHANNEL = 'online-store';
 class SalesSummaryModule extends _BaseModule.BaseModule {
   defaultName = 'salesSummary';
   defaultVersion = '1.0.0';
-  shopStore;
+  appPlugin;
   store;
   request;
+  surchargeListModuleName = 'surchargeList';
+  otherParams = {};
+  surchargeListChannel = DEFAULT_SURCHARGE_CHANNEL;
   constructor(name, version) {
     super(name, version);
   }
   async initialize(core, options) {
     this.core = core;
     this.store = options.store;
-    this.shopStore = this.core.getPlugin('shopStore');
+    this.appPlugin = this.core.getPlugin('app');
     this.request = this.core.getPlugin('request');
+    this.otherParams = options.otherParams || {};
     this.store.surchargeList = options.initialState?.surchargeList || [];
     this.store.summary = options.initialState?.summary || (0, _utils.createEmptySalesSummary)();
-    if (!this.shopStore) {
-      throw new Error('SalesSummaryModule 需要 shopStore 插件支持');
-    }
+    this.surchargeListModuleName = this.otherParams?.surchargeListModuleName || 'surchargeList';
+
+    // if (!this.appPlugin) {
+    //   throw new Error('SalesSummaryModule 需要 app 插件支持');
+    // }
     if (!this.request) {
       throw new Error('SalesSummaryModule 需要 request 插件支持');
     }
     await this.getSurchargeList();
   }
-  async getSurchargeList() {
+
+  /**
+   * 更新父级解决方案透传的运行态参数，并在 surcharge 模块名或渠道变化时刷新附加费列表。
+   *
+   * @example
+   * await salesSummaryModule.updateOtherParams({ channel: 'pos', surchargeListModuleName: 'custom_surchargeList' });
+   */
+  async updateOtherParams(params) {
+    const previousChannel = this.resolveChannel();
+    const nextSurchargeListModuleName = params?.surchargeListModuleName || 'surchargeList';
+    const nextChannel = this.resolveChannel(params);
+    const shouldReload = nextSurchargeListModuleName !== this.surchargeListModuleName || nextChannel !== previousChannel;
+    this.otherParams = params || {};
+    this.surchargeListModuleName = nextSurchargeListModuleName;
+    if (shouldReload) {
+      await this.getSurchargeList(nextChannel);
+    }
+  }
+  resolveChannel(params = this.otherParams) {
+    return params?.channel || DEFAULT_SURCHARGE_CHANNEL;
+  }
+  async getSurchargeList(channel = this.resolveChannel()) {
     try {
+      const surchargeListModule = this.core.getModule(this.surchargeListModuleName);
+      if (surchargeListModule?.getSurchargeList) {
+        this.store.surchargeList = await surchargeListModule.getSurchargeList({
+          channel
+        });
+        this.surchargeListChannel = channel;
+        return;
+      }
       const surchargeList = await this.request.get('/order/custom-surcharge/available/v2', {
-        channel: 'online-store',
+        channel,
         is_assemble_product_data: 1,
         is_assemble_schedule_data: 1,
         with: ['relationSchedule']
       });
       this.store.surchargeList = surchargeList?.data || [];
+      this.surchargeListChannel = channel;
     } catch (error) {
       console.warn('[SalesSummaryModule] 加载附加费配置失败', error);
       this.store.surchargeList = [];
+      this.surchargeListChannel = channel;
     }
   }
+  getAppData(key) {
+    const getData = this.appPlugin?.getData?.();
+    if (typeof getData === 'function') return getData(key);
+    const app = this.appPlugin?.getApp?.();
+    if (!app) return undefined;
+    const coreData = app?.models?.getStore?.().getDataByModel?.('core', 'core');
+    return coreData?.[key];
+  }
+  getTaxConfig() {
+    return {
+      isPriceIncludeTax: this.getAppData(salesSummaryDataKeys.isPriceIncludeTax),
+      taxRate: this.getAppData(salesSummaryDataKeys.taxRate),
+      taxTitle: this.getAppData(salesSummaryDataKeys.taxTitle),
+      taxCountryCode: this.getAppData(salesSummaryDataKeys.taxCountryCode)
+    };
+  }
   async getSummary(params) {
     const {
       products = [],
       isPriceIncludeTax,
-      taxRate
+      taxRate,
+      shopDiscount,
+      channel
     } = params;
-    const shopInfo = this.shopStore.get('core')?.core?.shop || {};
+    const summaryChannel = channel || this.resolveChannel();
+    if (summaryChannel !== this.surchargeListChannel) {
+      await this.getSurchargeList(summaryChannel);
+    }
+    const taxConfig = this.getTaxConfig();
     const summarySchedule = this.core.getModule(`${this.name.split('_')[0]}_schedule`);
-    const needScheduleIds = this.store.surchargeList.map(item => item.available_schedule_ids).flat();
-    const scheduleList = summarySchedule?.getScheduleListByIds(needScheduleIds);
+    const needScheduleIds = (this.store.surchargeList?.map(item => item.available_schedule_ids)?.flat() || []).filter(id => id !== undefined && id !== null && id !== '');
+    const scheduleList = needScheduleIds.length > 0 ? summarySchedule?.getScheduleListByIds(needScheduleIds) : [];
     const scheduleById = {};
     if (Array.isArray(scheduleList)) {
       for (const item of scheduleList) {
@@ -78,16 +144,18 @@ class SalesSummaryModule extends _BaseModule.BaseModule {
     }
     const summary = (0, _utils.calculateSalesSummary)({
       products,
-      isPriceIncludeTax: isPriceIncludeTax ?? shopInfo?.is_price_include_tax ?? 1,
-      taxRate: taxRate ?? shopInfo?.tax_rate,
+      isPriceIncludeTax: isPriceIncludeTax ?? taxConfig.isPriceIncludeTax ?? 1,
+      taxRate: taxRate ?? taxConfig.taxRate,
       surchargeList: this.store.surchargeList,
       scheduleById,
-      isInScheduleByDate: _Schedule.ScheduleModule.isInScheduleByDate
+      isInScheduleByDate: _Schedule.ScheduleModule.isInScheduleByDate,
+      shopDiscount
     });
     const summaryWithTaxMeta = {
       ...summary,
-      tax_title: shopInfo?.tax_title || '',
-      tax_rate: taxRate ?? shopInfo?.tax_rate
+      tax_title: taxConfig.taxTitle || '',
+      tax_rate: taxRate ?? taxConfig.taxRate,
+      tax_country_code: taxConfig.taxCountryCode || ''
     };
     this.store.summary = summaryWithTaxMeta;
     return summaryWithTaxMeta;

package/lib/modules/SalesSummary/types.d.ts

@@ -1,4 +1,5 @@
 export interface SalesSummaryProduct {
+    order_detail_id?: number | string | null;
     product_id: number | null;
     product_variant_id: number;
     num: number;
@@ -8,7 +9,9 @@ export interface SalesSummaryProduct {
     original_price: string;
     tax_fee: string;
     is_charge_tax?: number;
-    product_option_item?: any[];
+    product_sku?: Record<string, any> & {
+        option?: any[];
+    };
     discount_list?: any[];
     product_bundle?: any[];
     metadata?: Record<string, any>;
@@ -40,6 +43,9 @@ export interface SalesSummaryData {
     deposit?: DepositInfo;
     expect_amount: string;
     total_amount: string;
+    total_refund_amount: string;
+    customer_paid_amount: string;
+    order_paid_amount: string;
     amount_gap: string;
     rounding_amount: string;
     pay_service_charge_amount: string;
@@ -56,5 +62,7 @@ export interface SalesSummaryModuleAPI {
         products: SalesSummaryProduct[];
         isPriceIncludeTax?: number;
         taxRate?: number;
+        shopDiscount?: string | number;
+        channel?: string;
     }): Promise<SalesSummaryData>;
 }

package/lib/modules/SalesSummary/utils.d.ts

@@ -1,4 +1,4 @@
-import type { DepositInfo, SalesSummaryData, SalesSummaryProduct } from './types';
+import type { SalesSummaryData, SalesSummaryProduct } from './types';
 export declare function createEmptySalesSummary(): SalesSummaryData;
 export declare function calculateSalesSummary(params: {
     products: SalesSummaryProduct[];
@@ -7,24 +7,5 @@ export declare function calculateSalesSummary(params: {
     surchargeList: any[];
     scheduleById?: Record<string, any>;
     isInScheduleByDate?: any;
-}): SalesSummaryData | {
-    product_quantity: number;
-    product_original_amount: string;
-    product_amount: string;
-    product_expect_amount: string;
-    product_tax_fee: string;
-    shipping_fee: string;
-    shipping_tax_fee: string;
-    tax_fee: string;
-    surcharge_fee: string;
-    surcharges: any;
-    discount_amount: string;
-    deposit_amount: string;
-    deposit: DepositInfo | undefined;
-    expect_amount: string;
-    total_amount: string;
-    amount_gap: string;
-    rounding_amount: string;
-    pay_service_charge_amount: string;
-    is_price_include_tax: number;
-};
+    shopDiscount?: string | number;
+}): SalesSummaryData;