@pisell/pisellos 0.0.397 → 0.0.399

package/dist/modules/Discount/index.js

@@ -188,7 +188,7 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
                 tags: ['good_pass', 'product_discount_card'],
                 available: 1,
                 relation_product: 1,
-                with: ['extensionData', 'holder.detail'],
+                with: ['extensionData', 'customScheduleSnapshot', 'holder.detail'],
                 order_behavior_count: 1,
                 order_behavior_count_customer_id: customerId || 1
               });

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

@@ -13,6 +13,7 @@ export declare class SummaryModule extends BaseModule implements Module, ISummar
     private fatherModule;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: ModuleOptions): Promise<void>;
+    getSurchargeList(): Promise<void>;
     getSummary(cartItems: CartItem[]): Promise<ISummaryState['summary']>;
     /**
      * 获取协议

package/dist/modules/Summary/index.js

@@ -62,6 +62,9 @@ export var SummaryModule = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error('SummaryModule 需要 shopStore 插件支持');
             case 9:
+              // 加载当前店铺附加费
+              this.getSurchargeList();
+            case 10:
             case "end":
               return _context.stop();
           }
@@ -73,24 +76,54 @@ export var SummaryModule = /*#__PURE__*/function (_BaseModule) {
       return initialize;
     }()
   }, {
-    key: "getSummary",
+    key: "getSurchargeList",
     value: function () {
-      var _getSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(cartItems) {
-        var _this$shopStore$get;
-        var shopInfo, summary;
+      var _getSurchargeList = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+        var surchargeList;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              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) || {};
-              summary = calculatePriceDetails(shopInfo, cartItems);
-              this.store.summary = summary;
-              return _context2.abrupt("return", this.store.summary);
+              _context2.next = 2;
+              return this.request.get('/order/custom-surcharge/available', {
+                channel: 'online-store',
+                is_assemble_product_data: 1,
+                is_assemble_schedule_data: 1,
+                with: ['relationSchedule']
+              });
+            case 2:
+              surchargeList = _context2.sent;
+              this.store.surchargeList = (surchargeList === null || surchargeList === void 0 ? void 0 : surchargeList.data) || [];
             case 4:
             case "end":
               return _context2.stop();
           }
         }, _callee2, this);
       }));
+      function getSurchargeList() {
+        return _getSurchargeList.apply(this, arguments);
+      }
+      return getSurchargeList;
+    }()
+  }, {
+    key: "getSummary",
+    value: function () {
+      var _getSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(cartItems) {
+        var _this$shopStore$get;
+        var shopInfo, scheduleModule, summary;
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              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) || {};
+              scheduleModule = this.core.getModule('appointmentBooking_schedule');
+              summary = calculatePriceDetails(shopInfo, cartItems, scheduleModule, this.store.surchargeList);
+              this.store.summary = summary;
+              return _context3.abrupt("return", this.store.summary);
+            case 5:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3, this);
+      }));
       function getSummary(_x3) {
         return _getSummary.apply(this, arguments);
       }
@@ -104,16 +137,16 @@ export var SummaryModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getProtocol",
     value: (function () {
-      var _getProtocol = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(protocolId) {
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+      var _getProtocol = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(protocolId) {
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              return _context3.abrupt("return", this.request.get("/shop-policy/".concat(protocolId)));
+              return _context4.abrupt("return", this.request.get("/shop-policy/".concat(protocolId)));
             case 1:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee3, this);
+        }, _callee4, this);
       }));
       function getProtocol(_x4) {
         return _getProtocol.apply(this, arguments);

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

@@ -1,5 +1,6 @@
 import { CartItem } from '../Cart/types';
 export interface ISummaryState {
+    surchargeList: any[];
     summary: {
         /** 商品总价 */
         subtotal: string | number;
@@ -13,6 +14,8 @@ export interface ISummaryState {
         totalTaxFee?: string | number;
         /** 商品价格是否包含费率 */
         isPriceIncludeTax?: 0 | 1;
+        /** 附加费金额 */
+        surchargeAmount?: string | number;
         /** 定金 */
         deposit?: {
             /** 定金总价 */

package/dist/modules/Summary/utils.d.ts

@@ -1,7 +1,8 @@
 import Decimal from 'decimal.js';
 import { CartItem } from '../Cart/types';
 import { ISummaryState } from './types';
-export declare const calculatePriceDetails: (shopInfo: any, items: CartItem[]) => ISummaryState['summary'];
+import { ScheduleModule } from '../Schedule';
+export declare const calculatePriceDetails: (shopInfo: any, items: CartItem[], scheduleModule: ScheduleModule, surchargeList: any[]) => ISummaryState['summary'];
 /**
  * 获取子商品折扣信息
  * @param item
@@ -38,3 +39,23 @@ export declare const calculateDeposit: (items: CartItem[]) => {
     protocols: any[];
     hasDeposit: never;
 } | undefined;
+export declare const getSurchargeAmount: ({ bookingDetail, bookingId }: {
+    bookingDetail?: any;
+    bookingId?: number | undefined;
+}, surcharge: any[], options: any) => any;
+/**
+ * 订单附加费各项信息
+ * @param state
+ * @param options 包含 ScheduleModule 和其他附加费计算所需参数
+ */
+export declare const getSurcharge: ({ service, addons, bookingDetail, bookingId }: {
+    service: any;
+    addons: any;
+    bookingDetail?: any;
+    bookingId?: number | undefined;
+}, options: {
+    isEdit: boolean;
+    ScheduleModule: any;
+    surcharge_list?: any[];
+    scheduleById?: Record<string, any>;
+} & Record<string, any>) => any;