@pisell/pisellos 0.0.568 → 0.0.570

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

@@ -1,4 +1,5 @@
 import { Discount } from '../Discount/types';
+import { SetDiscountSelectedParams } from '../../solution/ShopDiscount/types';
 export declare enum UnavailableReason {
     TimeLimit = "time_limit",
     ProductNotApplicable = "product_not_applicable",
@@ -22,6 +23,15 @@ export interface DiscountResult {
     productList: any[];
     discountList: any[];
 }
+export declare type RulesFormSubject = boolean | ((product: any) => boolean);
+export interface RulesCalcDiscountOptions {
+    isSelected?: boolean;
+    discountId?: number;
+    selectedList?: SetDiscountSelectedParams[];
+    scan?: boolean;
+    /** Change time 重报价目标行：允许已选编辑态折扣卡重新应用到这些 booking 商品。 */
+    reapplyBookingDiscountProductUids?: string[];
+}
 export interface RulesModuleAPI {
     setRulesList: (rulesList: Rules[]) => Promise<void>;
     clear: () => Promise<void>;
@@ -31,11 +41,11 @@ export interface RulesModuleAPI {
         holders: {
             form_record_id: number;
         }[];
-        isFormSubject: boolean;
+        isFormSubject: RulesFormSubject;
         orderTotalAmount: number;
-    }) => DiscountResult;
+    }, options?: RulesCalcDiscountOptions) => DiscountResult;
 }
-type ProductDetail = {
+declare type ProductDetail = {
     isClient?: boolean;
     isManualDiscount?: boolean;
     booking_id: any;
@@ -51,8 +61,9 @@ type ProductDetail = {
     num?: number;
     quantity: number;
     vouchersApplicable?: boolean;
-    holder_id?: number | string;
+    holder_id?: number;
     startDate?: any;
+    main_product_selling_price?: number | string;
 };
 export interface RulesParamsHooks {
     getProduct: (product: Record<string, any>) => ProductDetail;

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

@@ -5,19 +5,35 @@ export * from './types';
 export declare class SalesSummaryModule extends BaseModule implements Module, SalesSummaryModuleAPI {
     protected defaultName: string;
     protected defaultVersion: string;
-    private shopStore;
+    private appPlugin;
     private store;
     private request;
+    private surchargeListModuleName;
+    private otherParams;
+    private surchargeListChannel;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
-    getSurchargeList(): Promise<void>;
+    /**
+     * 更新父级解决方案透传的运行态参数，并在 surcharge 模块名或渠道变化时刷新附加费列表。
+     *
+     * @example
+     * await salesSummaryModule.updateOtherParams({ channel: 'pos', surchargeListModuleName: 'custom_surchargeList' });
+     */
+    updateOtherParams(params: Record<string, any>): Promise<void>;
+    private resolveChannel;
+    getSurchargeList(channel?: string): Promise<void>;
+    private getAppData;
+    private getTaxConfig;
     getSummary(params: {
         products: any[];
         isPriceIncludeTax?: number;
         taxRate?: number;
+        shopDiscount?: string | number;
+        channel?: string;
     }): Promise<{
-        tax_title: any;
-        tax_rate: any;
+        tax_title: string;
+        tax_rate: number | undefined;
+        tax_country_code: string;
         product_quantity: number;
         product_original_amount: string;
         product_amount: string;
@@ -33,31 +49,12 @@ export declare class SalesSummaryModule extends BaseModule implements Module, Sa
         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 | undefined;
-    } | {
-        tax_title: any;
-        tax_rate: any;
-        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;
-        amount_gap: string;
-        rounding_amount: string;
-        pay_service_charge_amount: string;
-        is_price_include_tax: number;
     }>;
 }

package/dist/modules/SalesSummary/index.js

@@ -24,6 +24,13 @@ import { BaseModule } from "../BaseModule";
 import { ScheduleModule } from "../Schedule";
 import { calculateSalesSummary, createEmptySalesSummary } from "./utils";
 export * from "./types";
+var salesSummaryDataKeys = {
+  isPriceIncludeTax: 'is_price_include_tax',
+  taxRate: 'tax_rate',
+  taxTitle: 'tax_title',
+  taxCountryCode: 'tax_country_code'
+};
+var DEFAULT_SURCHARGE_CHANNEL = 'online-store';
 export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(SalesSummaryModule, _BaseModule);
   var _super = _createSuper(SalesSummaryModule);
@@ -33,31 +40,34 @@ export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
     _this = _super.call(this, name, version);
     _defineProperty(_assertThisInitialized(_this), "defaultName", 'salesSummary');
     _defineProperty(_assertThisInitialized(_this), "defaultVersion", '1.0.0');
-    _defineProperty(_assertThisInitialized(_this), "shopStore", void 0);
+    _defineProperty(_assertThisInitialized(_this), "appPlugin", void 0);
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
     _defineProperty(_assertThisInitialized(_this), "request", void 0);
+    _defineProperty(_assertThisInitialized(_this), "surchargeListModuleName", 'surchargeList');
+    _defineProperty(_assertThisInitialized(_this), "otherParams", {});
+    _defineProperty(_assertThisInitialized(_this), "surchargeListChannel", DEFAULT_SURCHARGE_CHANNEL);
     return _this;
   }
   _createClass(SalesSummaryModule, [{
     key: "initialize",
     value: function () {
       var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(core, options) {
-        var _options$initialState, _options$initialState2;
+        var _options$initialState, _options$initialState2, _this$otherParams;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               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 = options.initialState) === null || _options$initialState === void 0 ? void 0 : _options$initialState.surchargeList) || [];
               this.store.summary = ((_options$initialState2 = options.initialState) === null || _options$initialState2 === void 0 ? void 0 : _options$initialState2.summary) || createEmptySalesSummary();
-              if (this.shopStore) {
-                _context.next = 8;
-                break;
-              }
-              throw new Error('SalesSummaryModule 需要 shopStore 插件支持');
-            case 8:
+              this.surchargeListModuleName = ((_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.surchargeListModuleName) || 'surchargeList';
+
+              // if (!this.appPlugin) {
+              //   throw new Error('SalesSummaryModule 需要 app 插件支持');
+              // }
               if (this.request) {
                 _context.next = 10;
                 break;
@@ -77,59 +87,153 @@ export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
       }
       return initialize;
     }()
+    /**
+     * 更新父级解决方案透传的运行态参数，并在 surcharge 模块名或渠道变化时刷新附加费列表。
+     *
+     * @example
+     * await salesSummaryModule.updateOtherParams({ channel: 'pos', surchargeListModuleName: 'custom_surchargeList' });
+     */
   }, {
-    key: "getSurchargeList",
-    value: function () {
-      var _getSurchargeList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-        var surchargeList;
+    key: "updateOtherParams",
+    value: (function () {
+      var _updateOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
+        var previousChannel, nextSurchargeListModuleName, nextChannel, shouldReload;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              _context2.prev = 0;
-              _context2.next = 3;
+              previousChannel = this.resolveChannel();
+              nextSurchargeListModuleName = (params === null || params === void 0 ? void 0 : params.surchargeListModuleName) || 'surchargeList';
+              nextChannel = this.resolveChannel(params);
+              shouldReload = nextSurchargeListModuleName !== this.surchargeListModuleName || nextChannel !== previousChannel;
+              this.otherParams = params || {};
+              this.surchargeListModuleName = nextSurchargeListModuleName;
+              if (!shouldReload) {
+                _context2.next = 9;
+                break;
+              }
+              _context2.next = 9;
+              return this.getSurchargeList(nextChannel);
+            case 9:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, this);
+      }));
+      function updateOtherParams(_x3) {
+        return _updateOtherParams.apply(this, arguments);
+      }
+      return updateOtherParams;
+    }())
+  }, {
+    key: "resolveChannel",
+    value: function resolveChannel() {
+      var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.otherParams;
+      return (params === null || params === void 0 ? void 0 : params.channel) || DEFAULT_SURCHARGE_CHANNEL;
+    }
+  }, {
+    key: "getSurchargeList",
+    value: function () {
+      var _getSurchargeList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+        var channel,
+          surchargeListModule,
+          surchargeList,
+          _args3 = arguments;
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              channel = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : this.resolveChannel();
+              _context3.prev = 1;
+              surchargeListModule = this.core.getModule(this.surchargeListModuleName);
+              if (!(surchargeListModule !== null && surchargeListModule !== void 0 && surchargeListModule.getSurchargeList)) {
+                _context3.next = 9;
+                break;
+              }
+              _context3.next = 6;
+              return surchargeListModule.getSurchargeList({
+                channel: channel
+              });
+            case 6:
+              this.store.surchargeList = _context3.sent;
+              this.surchargeListChannel = channel;
+              return _context3.abrupt("return");
+            case 9:
+              _context3.next = 11;
               return this.request.get('/order/custom-surcharge/available/v2', {
-                channel: 'online-store',
+                channel: channel,
                 is_assemble_product_data: 1,
                 is_assemble_schedule_data: 1,
                 with: ['relationSchedule']
               });
-            case 3:
-              surchargeList = _context2.sent;
+            case 11:
+              surchargeList = _context3.sent;
               this.store.surchargeList = (surchargeList === null || surchargeList === void 0 ? void 0 : surchargeList.data) || [];
-              _context2.next = 11;
+              this.surchargeListChannel = channel;
+              _context3.next = 21;
               break;
-            case 7:
-              _context2.prev = 7;
-              _context2.t0 = _context2["catch"](0);
-              console.warn('[SalesSummaryModule] 加载附加费配置失败', _context2.t0);
+            case 16:
+              _context3.prev = 16;
+              _context3.t0 = _context3["catch"](1);
+              console.warn('[SalesSummaryModule] 加载附加费配置失败', _context3.t0);
               this.store.surchargeList = [];
-            case 11:
+              this.surchargeListChannel = channel;
+            case 21:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2, this, [[0, 7]]);
+        }, _callee3, this, [[1, 16]]);
       }));
       function getSurchargeList() {
         return _getSurchargeList.apply(this, arguments);
       }
       return getSurchargeList;
     }()
+  }, {
+    key: "getAppData",
+    value: function getAppData(key) {
+      var _this$appPlugin, _this$appPlugin$getDa, _this$appPlugin2, _this$appPlugin2$getA, _app$models, _app$models$getStore, _app$models$getStore$, _app$models$getStore$2;
+      var getData = (_this$appPlugin = this.appPlugin) === null || _this$appPlugin === void 0 || (_this$appPlugin$getDa = _this$appPlugin.getData) === null || _this$appPlugin$getDa === void 0 ? void 0 : _this$appPlugin$getDa.call(_this$appPlugin);
+      if (typeof getData === 'function') return getData(key);
+      var app = (_this$appPlugin2 = this.appPlugin) === null || _this$appPlugin2 === void 0 || (_this$appPlugin2$getA = _this$appPlugin2.getApp) === null || _this$appPlugin2$getA === void 0 ? void 0 : _this$appPlugin2$getA.call(_this$appPlugin2);
+      if (!app) return undefined;
+      var coreData = app === null || app === void 0 || (_app$models = app.models) === null || _app$models === void 0 || (_app$models$getStore = _app$models.getStore) === null || _app$models$getStore === void 0 || (_app$models$getStore$ = (_app$models$getStore$2 = _app$models$getStore.call(_app$models)).getDataByModel) === null || _app$models$getStore$ === void 0 ? void 0 : _app$models$getStore$.call(_app$models$getStore$2, 'core', 'core');
+      return coreData === null || coreData === void 0 ? void 0 : coreData[key];
+    }
+  }, {
+    key: "getTaxConfig",
+    value: function getTaxConfig() {
+      return {
+        isPriceIncludeTax: this.getAppData(salesSummaryDataKeys.isPriceIncludeTax),
+        taxRate: this.getAppData(salesSummaryDataKeys.taxRate),
+        taxTitle: this.getAppData(salesSummaryDataKeys.taxTitle),
+        taxCountryCode: this.getAppData(salesSummaryDataKeys.taxCountryCode)
+      };
+    }
   }, {
     key: "getSummary",
     value: function () {
-      var _getSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
-        var _this$shopStore$get, _ref;
-        var _params$products, products, isPriceIncludeTax, taxRate, shopInfo, summarySchedule, needScheduleIds, scheduleList, scheduleById, _iterator, _step, item, summary, summaryWithTaxMeta;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+      var _getSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
+        var _this$store$surcharge, _ref;
+        var _params$products, products, isPriceIncludeTax, taxRate, shopDiscount, channel, summaryChannel, taxConfig, summarySchedule, needScheduleIds, scheduleList, scheduleById, _iterator, _step, item, summary, summaryWithTaxMeta;
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              _params$products = params.products, products = _params$products === void 0 ? [] : _params$products, isPriceIncludeTax = params.isPriceIncludeTax, taxRate = params.taxRate;
-              shopInfo = ((_this$shopStore$get = this.shopStore.get('core')) === null || _this$shopStore$get === void 0 || (_this$shopStore$get = _this$shopStore$get.core) === null || _this$shopStore$get === void 0 ? void 0 : _this$shopStore$get.shop) || {};
+              _params$products = params.products, products = _params$products === void 0 ? [] : _params$products, isPriceIncludeTax = params.isPriceIncludeTax, taxRate = params.taxRate, shopDiscount = params.shopDiscount, channel = params.channel;
+              summaryChannel = channel || this.resolveChannel();
+              if (!(summaryChannel !== this.surchargeListChannel)) {
+                _context4.next = 5;
+                break;
+              }
+              _context4.next = 5;
+              return this.getSurchargeList(summaryChannel);
+            case 5:
+              taxConfig = this.getTaxConfig();
               summarySchedule = this.core.getModule("".concat(this.name.split('_')[0], "_schedule"));
-              needScheduleIds = this.store.surchargeList.map(function (item) {
+              needScheduleIds = (((_this$store$surcharge = this.store.surchargeList) === null || _this$store$surcharge === void 0 || (_this$store$surcharge = _this$store$surcharge.map(function (item) {
                 return item.available_schedule_ids;
-              }).flat();
-              scheduleList = summarySchedule === null || summarySchedule === void 0 ? void 0 : summarySchedule.getScheduleListByIds(needScheduleIds);
+              })) === null || _this$store$surcharge === void 0 ? void 0 : _this$store$surcharge.flat()) || []).filter(function (id) {
+                return id !== undefined && id !== null && id !== '';
+              });
+              scheduleList = needScheduleIds.length > 0 ? summarySchedule === null || summarySchedule === void 0 ? void 0 : summarySchedule.getScheduleListByIds(needScheduleIds) : [];
               scheduleById = {};
               if (Array.isArray(scheduleList)) {
                 _iterator = _createForOfIteratorHelper(scheduleList);
@@ -146,25 +250,27 @@ export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
               }
               summary = calculateSalesSummary({
                 products: products,
-                isPriceIncludeTax: (_ref = isPriceIncludeTax !== null && isPriceIncludeTax !== void 0 ? isPriceIncludeTax : shopInfo === null || shopInfo === void 0 ? void 0 : shopInfo.is_price_include_tax) !== null && _ref !== void 0 ? _ref : 1,
-                taxRate: taxRate !== null && taxRate !== void 0 ? taxRate : shopInfo === null || shopInfo === void 0 ? void 0 : shopInfo.tax_rate,
+                isPriceIncludeTax: (_ref = isPriceIncludeTax !== null && isPriceIncludeTax !== void 0 ? isPriceIncludeTax : taxConfig.isPriceIncludeTax) !== null && _ref !== void 0 ? _ref : 1,
+                taxRate: taxRate !== null && taxRate !== void 0 ? taxRate : taxConfig.taxRate,
                 surchargeList: this.store.surchargeList,
                 scheduleById: scheduleById,
-                isInScheduleByDate: ScheduleModule.isInScheduleByDate
+                isInScheduleByDate: ScheduleModule.isInScheduleByDate,
+                shopDiscount: shopDiscount
               });
               summaryWithTaxMeta = _objectSpread(_objectSpread({}, summary), {}, {
-                tax_title: (shopInfo === null || shopInfo === void 0 ? void 0 : shopInfo.tax_title) || '',
-                tax_rate: taxRate !== null && taxRate !== void 0 ? taxRate : shopInfo === null || shopInfo === void 0 ? void 0 : shopInfo.tax_rate
+                tax_title: taxConfig.taxTitle || '',
+                tax_rate: taxRate !== null && taxRate !== void 0 ? taxRate : taxConfig.taxRate,
+                tax_country_code: taxConfig.taxCountryCode || ''
               });
               this.store.summary = summaryWithTaxMeta;
-              return _context3.abrupt("return", summaryWithTaxMeta);
-            case 11:
+              return _context4.abrupt("return", summaryWithTaxMeta);
+            case 15:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee3, this);
+        }, _callee4, this);
       }));
-      function getSummary(_x3) {
+      function getSummary(_x4) {
         return _getSummary.apply(this, arguments);
       }
       return getSummary;

package/dist/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/dist/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;