@pisell/pisellos 2.2.244 → 2.2.246

package/dist/modules/SalesSummary/index.js

@@ -27,7 +27,8 @@ export * from "./types";
 var salesSummaryDataKeys = {
   isPriceIncludeTax: 'is_price_include_tax',
   taxRate: 'tax_rate',
-  taxTitle: 'tax_title'
+  taxTitle: 'tax_title',
+  taxCountryCode: 'tax_country_code'
 };
 export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(SalesSummaryModule, _BaseModule);
@@ -41,13 +42,14 @@ export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "appPlugin", void 0);
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
     _defineProperty(_assertThisInitialized(_this), "request", void 0);
+    _defineProperty(_assertThisInitialized(_this), "surchargeListModuleName", 'surchargeList');
     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, _options$otherParams;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -57,21 +59,22 @@ export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
               this.request = this.core.getPlugin('request');
               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();
+              this.surchargeListModuleName = ((_options$otherParams = options.otherParams) === null || _options$otherParams === void 0 ? void 0 : _options$otherParams.surchargeListModuleName) || 'surchargeList';
               if (this.appPlugin) {
-                _context.next = 8;
+                _context.next = 9;
                 break;
               }
               throw new Error('SalesSummaryModule 需要 app 插件支持');
-            case 8:
+            case 9:
               if (this.request) {
-                _context.next = 10;
+                _context.next = 11;
                 break;
               }
               throw new Error('SalesSummaryModule 需要 request 插件支持');
-            case 10:
-              _context.next = 12;
+            case 11:
+              _context.next = 13;
               return this.getSurchargeList();
-            case 12:
+            case 13:
             case "end":
               return _context.stop();
           }
@@ -82,37 +85,84 @@ export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
       }
       return initialize;
     }()
+    /**
+     * 更新父级解决方案透传的运行态参数，并在 surcharge 模块名变化时刷新附加费列表。
+     *
+     * @example
+     * await salesSummaryModule.updateOtherParams({ 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 nextSurchargeListModuleName;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              _context2.prev = 0;
-              _context2.next = 3;
+              nextSurchargeListModuleName = (params === null || params === void 0 ? void 0 : params.surchargeListModuleName) || 'surchargeList';
+              if (!(nextSurchargeListModuleName === this.surchargeListModuleName)) {
+                _context2.next = 3;
+                break;
+              }
+              return _context2.abrupt("return");
+            case 3:
+              this.surchargeListModuleName = nextSurchargeListModuleName;
+              _context2.next = 6;
+              return this.getSurchargeList();
+            case 6:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, this);
+      }));
+      function updateOtherParams(_x3) {
+        return _updateOtherParams.apply(this, arguments);
+      }
+      return updateOtherParams;
+    }())
+  }, {
+    key: "getSurchargeList",
+    value: function () {
+      var _getSurchargeList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+        var surchargeListModule, surchargeList;
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              _context3.prev = 0;
+              surchargeListModule = this.core.getModule(this.surchargeListModuleName);
+              if (!(surchargeListModule !== null && surchargeListModule !== void 0 && surchargeListModule.getSurchargeList)) {
+                _context3.next = 7;
+                break;
+              }
+              _context3.next = 5;
+              return surchargeListModule.getSurchargeList();
+            case 5:
+              this.store.surchargeList = _context3.sent;
+              return _context3.abrupt("return");
+            case 7:
+              _context3.next = 9;
               return this.request.get('/order/custom-surcharge/available/v2', {
+                // TODO 真实的渠道
                 channel: 'online-store',
                 is_assemble_product_data: 1,
                 is_assemble_schedule_data: 1,
                 with: ['relationSchedule']
               });
-            case 3:
-              surchargeList = _context2.sent;
+            case 9:
+              surchargeList = _context3.sent;
               this.store.surchargeList = (surchargeList === null || surchargeList === void 0 ? void 0 : surchargeList.data) || [];
-              _context2.next = 11;
+              _context3.next = 17;
               break;
-            case 7:
-              _context2.prev = 7;
-              _context2.t0 = _context2["catch"](0);
-              console.warn('[SalesSummaryModule] 加载附加费配置失败', _context2.t0);
+            case 13:
+              _context3.prev = 13;
+              _context3.t0 = _context3["catch"](0);
+              console.warn('[SalesSummaryModule] 加载附加费配置失败', _context3.t0);
               this.store.surchargeList = [];
-            case 11:
+            case 17:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2, this, [[0, 7]]);
+        }, _callee3, this, [[0, 13]]);
       }));
       function getSurchargeList() {
         return _getSurchargeList.apply(this, arguments);
@@ -135,24 +185,25 @@ export var SalesSummaryModule = /*#__PURE__*/function (_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)
       };
     }
   }, {
     key: "getSummary",
     value: function () {
-      var _getSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
-        var _ref;
+      var _getSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
+        var _this$store$surcharge, _ref;
         var _params$products, products, isPriceIncludeTax, taxRate, shopDiscount, taxConfig, summarySchedule, needScheduleIds, scheduleList, scheduleById, _iterator, _step, item, summary, summaryWithTaxMeta;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        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, shopDiscount = params.shopDiscount;
               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();
+              })) === null || _this$store$surcharge === void 0 ? void 0 : _this$store$surcharge.flat();
               scheduleList = summarySchedule === null || summarySchedule === void 0 ? void 0 : summarySchedule.getScheduleListByIds(needScheduleIds);
               scheduleById = {};
               if (Array.isArray(scheduleList)) {
@@ -182,14 +233,14 @@ export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
                 tax_rate: taxRate !== null && taxRate !== void 0 ? taxRate : taxConfig.taxRate
               });
               this.store.summary = summaryWithTaxMeta;
-              return _context3.abrupt("return", summaryWithTaxMeta);
+              return _context4.abrupt("return", summaryWithTaxMeta);
             case 11:
             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>;

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[];
@@ -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;