@pisell/pisellos 2.2.244 → 2.2.246

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

@@ -53,6 +53,7 @@ type ProductDetail = {
     vouchersApplicable?: boolean;
     holder_id?: number;
     startDate?: any;
+    main_product_selling_price?: number | string;
 };
 export interface RulesParamsHooks {
     getProduct: (product: Record<string, any>) => ProductDetail;

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

@@ -8,8 +8,16 @@ export declare class SalesSummaryModule extends BaseModule implements Module, Sa
     private appPlugin;
     private store;
     private request;
+    private surchargeListModuleName;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
+    /**
+     * 更新父级解决方案透传的运行态参数，并在 surcharge 模块名变化时刷新附加费列表。
+     *
+     * @example
+     * await salesSummaryModule.updateOtherParams({ surchargeListModuleName: 'custom_surchargeList' });
+     */
+    updateOtherParams(params: Record<string, any>): Promise<void>;
     getSurchargeList(): Promise<void>;
     private getAppData;
     private getTaxConfig;
@@ -43,30 +51,5 @@ export declare class SalesSummaryModule extends BaseModule implements Module, Sa
         rounding_amount: string;
         pay_service_charge_amount: string;
         is_price_include_tax?: number | undefined;
-    } | {
-        tax_title: string;
-        tax_rate: number | undefined;
-        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: import("./types").DepositInfo | undefined;
-        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;
-        is_price_include_tax: number;
     }>;
 }

package/lib/modules/SalesSummary/index.js

@@ -30,22 +30,25 @@ __reExport(SalesSummary_exports, require("./types"), module.exports);
 var salesSummaryDataKeys = {
   isPriceIncludeTax: "is_price_include_tax",
   taxRate: "tax_rate",
-  taxTitle: "tax_title"
+  taxTitle: "tax_title",
+  taxCountryCode: "tax_country_code"
 };
 var SalesSummaryModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
     this.defaultName = "salesSummary";
     this.defaultVersion = "1.0.0";
+    this.surchargeListModuleName = "surchargeList";
   }
   async initialize(core, options) {
-    var _a, _b;
+    var _a, _b, _c;
     this.core = core;
     this.store = options.store;
     this.appPlugin = this.core.getPlugin("app");
     this.request = this.core.getPlugin("request");
     this.store.surchargeList = ((_a = options.initialState) == null ? void 0 : _a.surchargeList) || [];
     this.store.summary = ((_b = options.initialState) == null ? void 0 : _b.summary) || (0, import_utils.createEmptySalesSummary)();
+    this.surchargeListModuleName = ((_c = options.otherParams) == null ? void 0 : _c.surchargeListModuleName) || "surchargeList";
     if (!this.appPlugin) {
       throw new Error("SalesSummaryModule 需要 app 插件支持");
     }
@@ -54,11 +57,32 @@ var SalesSummaryModule = class extends import_BaseModule.BaseModule {
     }
     await this.getSurchargeList();
   }
+  /**
+   * 更新父级解决方案透传的运行态参数，并在 surcharge 模块名变化时刷新附加费列表。
+   *
+   * @example
+   * await salesSummaryModule.updateOtherParams({ surchargeListModuleName: 'custom_surchargeList' });
+   */
+  async updateOtherParams(params) {
+    const nextSurchargeListModuleName = (params == null ? void 0 : params.surchargeListModuleName) || "surchargeList";
+    if (nextSurchargeListModuleName === this.surchargeListModuleName)
+      return;
+    this.surchargeListModuleName = nextSurchargeListModuleName;
+    await this.getSurchargeList();
+  }
   async getSurchargeList() {
     try {
+      const surchargeListModule = this.core.getModule(
+        this.surchargeListModuleName
+      );
+      if (surchargeListModule == null ? void 0 : surchargeListModule.getSurchargeList) {
+        this.store.surchargeList = await surchargeListModule.getSurchargeList();
+        return;
+      }
       const surchargeList = await this.request.get(
         "/order/custom-surcharge/available/v2",
         {
+          // TODO 真实的渠道
           channel: "online-store",
           is_assemble_product_data: 1,
           is_assemble_schedule_data: 1,
@@ -84,16 +108,18 @@ var SalesSummaryModule = class extends import_BaseModule.BaseModule {
     return {
       isPriceIncludeTax: this.getAppData(salesSummaryDataKeys.isPriceIncludeTax),
       taxRate: this.getAppData(salesSummaryDataKeys.taxRate),
-      taxTitle: this.getAppData(salesSummaryDataKeys.taxTitle)
+      taxTitle: this.getAppData(salesSummaryDataKeys.taxTitle),
+      taxCountryCode: this.getAppData(salesSummaryDataKeys.taxCountryCode)
     };
   }
   async getSummary(params) {
+    var _a, _b;
     const { products = [], isPriceIncludeTax, taxRate, shopDiscount } = params;
     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 needScheduleIds = (_b = (_a = this.store.surchargeList) == null ? void 0 : _a.map((item) => item.available_schedule_ids)) == null ? void 0 : _b.flat();
     const scheduleList = summarySchedule == null ? void 0 : summarySchedule.getScheduleListByIds(needScheduleIds);
     const scheduleById = {};
     if (Array.isArray(scheduleList)) {

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>;

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[];
@@ -8,27 +8,4 @@ export declare function calculateSalesSummary(params: {
     scheduleById?: Record<string, any>;
     isInScheduleByDate?: any;
     shopDiscount?: string | number;
-}): 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;
-    total_refund_amount: string;
-    customer_paid_amount: string;
-    order_paid_amount: string;
-    amount_gap: string;
-    rounding_amount: string;
-    pay_service_charge_amount: string;
-    is_price_include_tax: number;
-};
+}): SalesSummaryData;