@pisell/pisellos 0.0.98 → 0.0.99

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

@@ -7,9 +7,16 @@ export declare class ProductList extends BaseModule implements Module {
     protected defaultName: string;
     protected defaultVersion: string;
     private store;
+    private request;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: any): Promise<void>;
     storeChange(path?: string, value?: any): Promise<void>;
+    loadProductsPrice({ ids, customer_id, schedule_date, channel, }: {
+        ids?: number[];
+        customer_id?: number;
+        schedule_date?: string;
+        channel?: string;
+    }): Promise<any>;
     getProducts(): Promise<ProductData[]>;
     getProduct(id: number): Promise<Product | undefined>;
     addProduct(products: ProductData[]): Promise<void>;

package/dist/modules/ProductList/index.js

@@ -30,6 +30,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "defaultName", 'productList');
     _defineProperty(_assertThisInitialized(_this), "defaultVersion", '1.0.0');
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
+    _defineProperty(_assertThisInitialized(_this), "request", void 0);
     return _this;
   }
   _createClass(ProductList, [{
@@ -51,7 +52,8 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 this.store.productMap = new Map();
                 this.store.selectProducts = [];
               }
-            case 3:
+              this.request = core.getPlugin('request');
+            case 4:
             case "end":
               return _context.stop();
           }
@@ -95,22 +97,54 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
       return storeChange;
     }()
   }, {
-    key: "getProducts",
+    key: "loadProductsPrice",
     value: function () {
-      var _getProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+      var _loadProductsPrice = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref) {
+        var _ref$ids, ids, customer_id, schedule_date, channel, productsData;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              _context3.next = 2;
-              return this.core.effects.emit(ProductListHooks.onGetProducts, this.store.list);
-            case 2:
-              return _context3.abrupt("return", cloneDeep(this.store.list));
+              _ref$ids = _ref.ids, ids = _ref$ids === void 0 ? [] : _ref$ids, customer_id = _ref.customer_id, schedule_date = _ref.schedule_date, channel = _ref.channel;
+              _context3.next = 3;
+              return this.request.post("/product/query/price", {
+                ids: ids,
+                customer_id: customer_id,
+                schedule_date: schedule_date,
+                channel: channel
+              }, {
+                useCache: true
+              });
             case 3:
+              productsData = _context3.sent;
+              return _context3.abrupt("return", productsData.data);
+            case 5:
             case "end":
               return _context3.stop();
           }
         }, _callee3, this);
       }));
+      function loadProductsPrice(_x5) {
+        return _loadProductsPrice.apply(this, arguments);
+      }
+      return loadProductsPrice;
+    }()
+  }, {
+    key: "getProducts",
+    value: function () {
+      var _getProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              _context4.next = 2;
+              return this.core.effects.emit(ProductListHooks.onGetProducts, this.store.list);
+            case 2:
+              return _context4.abrupt("return", cloneDeep(this.store.list));
+            case 3:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4, this);
+      }));
       function getProducts() {
         return _getProducts.apply(this, arguments);
       }
@@ -119,29 +153,29 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getProduct",
     value: function () {
-      var _getProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(id) {
+      var _getProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(id) {
         var product;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              _context4.next = 2;
+              _context5.next = 2;
               return this.core.effects.emit(ProductListHooks.onGetProduct, this.store.list);
             case 2:
               product = this.store.productMap.get("".concat(id));
               if (!product) {
-                _context4.next = 5;
+                _context5.next = 5;
                 break;
               }
-              return _context4.abrupt("return", product);
+              return _context5.abrupt("return", product);
             case 5:
-              return _context4.abrupt("return", undefined);
+              return _context5.abrupt("return", undefined);
             case 6:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4, this);
+        }, _callee5, this);
       }));
-      function getProduct(_x5) {
+      function getProduct(_x6) {
         return _getProduct.apply(this, arguments);
       }
       return getProduct;
@@ -149,10 +183,10 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "addProduct",
     value: function () {
-      var _addProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(products) {
+      var _addProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(products) {
         var _this3 = this;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
               // 加到 list 以后上面的storeChange 会自动初始化商品详情的 module 实例
               // list 需要根据 id 去重
@@ -172,11 +206,11 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               this.storeChange();
             case 3:
             case "end":
-              return _context5.stop();
+              return _context6.stop();
           }
-        }, _callee5, this);
+        }, _callee6, this);
       }));
-      function addProduct(_x6) {
+      function addProduct(_x7) {
         return _addProduct.apply(this, arguments);
       }
       return addProduct;
@@ -184,18 +218,18 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "selectProducts",
     value: function () {
-      var _selectProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(products) {
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+      var _selectProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(products) {
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
               this.store.selectProducts = products;
             case 1:
             case "end":
-              return _context6.stop();
+              return _context7.stop();
           }
-        }, _callee6, this);
+        }, _callee7, this);
       }));
-      function selectProducts(_x7) {
+      function selectProducts(_x8) {
         return _selectProducts.apply(this, arguments);
       }
       return selectProducts;

package/dist/solution/BookingByStep/index.d.ts

@@ -186,10 +186,11 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     private getScheduleDataByIds;
     openProductDetail(productId: number): Promise<void>;
     closeProductDetail(): void;
-    getTimeslotBySchedule({ date, scheduleIds, resources, }: {
+    getTimeslotBySchedule({ date, scheduleIds, resources, product }: {
         date: string;
         scheduleIds?: number[];
         resources?: ProductResourceItem[];
+        product?: ProductData;
     }): {
         start_time: string;
         end_time: string;

package/dist/solution/BookingByStep/index.js

@@ -232,7 +232,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               _context2.next = 7;
               return this.request.post("/product/query", {
                 open_quotation: 1,
-                open_bundle: 1,
+                open_bundle: 0,
                 extension_type: ['product_appointment', 'appointment_ticket', 'session_product', 'session_ticket'],
                 with: ['category', 'collection', 'resourceRelation'],
                 status: 'published',
@@ -313,64 +313,62 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "updateQuotationPriceAndCart",
     value: function () {
       var _updateQuotationPriceAndCart = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(date) {
-        var _this$otherParams3,
-          _this3 = this;
-        var dateRange, scheduleList, scheduleIds, cartItems, _iterator, _step, _loop;
+        var _this3 = this;
+        var cartItems, userPlugin, customer_id, _userPlugin$get2, res, _iterator, _step, _loop;
         return _regeneratorRuntime().wrap(function _callee4$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              dateRange = this.store.date.getDateRange();
-              scheduleList = this.store.schedule.getAvailabilityScheduleDateList() || [];
-              scheduleIds = [];
-              if (dateRange && dateRange.length) {
-                scheduleIds = scheduleList.filter(function (n) {
-                  return n.date === dateRange[0].date;
-                }).flatMap(function (n) {
-                  return n.schedule_id;
-                });
-              } else {
-                scheduleIds = scheduleList.filter(function (n) {
-                  return n.date === date;
-                }).flatMap(function (n) {
-                  return n.schedule_id;
-                });
-              }
-              _context5.next = 6;
-              return this.loadProducts(_objectSpread(_objectSpread({}, (_this$otherParams3 = this.otherParams) === null || _this$otherParams3 === void 0 ? void 0 : _this$otherParams3.productModuleParams), {}, {
-                scheduleIds: scheduleIds,
-                schedule_date: date
-              }));
-            case 6:
               // 更新完商品数据以后，检测当前购物车里是否有商品，如果有，则需要更新购物车里的商品价格
               cartItems = this.store.cart.getItems();
               if (!cartItems.length) {
                 _context5.next = 25;
                 break;
               }
+              userPlugin = this.core.getPlugin('user');
+              customer_id = undefined;
+              try {
+                customer_id = userPlugin === null || userPlugin === void 0 || (_userPlugin$get2 = userPlugin.get()) === null || _userPlugin$get2 === void 0 ? void 0 : _userPlugin$get2.id;
+              } catch (error) {
+                console.error(error);
+              }
+              _context5.next = 7;
+              return this.store.products.loadProductsPrice({
+                ids: cartItems.map(function (n) {
+                  return n.id;
+                }),
+                schedule_date: date,
+                customer_id: customer_id
+              });
+            case 7:
+              res = _context5.sent;
               _iterator = _createForOfIteratorHelper(cartItems);
               _context5.prev = 9;
               _loop = /*#__PURE__*/_regeneratorRuntime().mark(function _loop() {
                 var _bundle;
-                var item, targetProduct, productInfo, bundle;
+                var item, targetProduct, cartProduct, productInfo, bundle;
                 return _regeneratorRuntime().wrap(function _loop$(_context4) {
                   while (1) switch (_context4.prev = _context4.next) {
                     case 0:
                       item = _step.value;
-                      _context4.next = 3;
+                      targetProduct = res.find(function (n) {
+                        return n.id === item.id;
+                      });
+                      _context4.next = 4;
                       return _this3.store.products.getProduct(item.id);
-                    case 3:
-                      targetProduct = _context4.sent;
-                      productInfo = cloneDeep(targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.getData());
+                    case 4:
+                      cartProduct = _context4.sent;
+                      productInfo = cartProduct === null || cartProduct === void 0 ? void 0 : cartProduct.getData();
                       bundle = item._bundleOrigin;
+                      productInfo.price = targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.price;
+                      productInfo.base_price = targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.base_price;
                       bundle = (_bundle = bundle) === null || _bundle === void 0 ? void 0 : _bundle.map(function (n) {
-                        var _productInfo$bundle;
-                        // 尝试到新的 productInfo 里找对应的 bundleitem
-                        // 然后更新 bundle 的价格
-                        var targetBundle = productInfo === null || productInfo === void 0 || (_productInfo$bundle = productInfo.bundle) === null || _productInfo$bundle === void 0 ? void 0 : _productInfo$bundle.find(function (m) {
-                          return m.group_id === n.id;
+                        var _targetProduct$bundle;
+                        // 更新 bundle 的价格
+                        var targetBundle = targetProduct === null || targetProduct === void 0 || (_targetProduct$bundle = targetProduct.bundle_group) === null || _targetProduct$bundle === void 0 ? void 0 : _targetProduct$bundle.find(function (m) {
+                          return m.id === n.group_id;
                         });
                         if (targetBundle) {
-                          var targetBundleItem = targetBundle.items.find(function (m) {
+                          var targetBundleItem = targetBundle.bundle_item.find(function (m) {
                             return m.id === n.id;
                           });
                           if (targetBundleItem) {
@@ -387,7 +385,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                         product: productInfo,
                         bundle: bundle
                       });
-                    case 8:
+                    case 11:
                     case "end":
                       return _context4.stop();
                   }
@@ -2277,9 +2275,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var _this$store$currentPr2;
       var date = _ref12.date,
         scheduleIds = _ref12.scheduleIds,
-        resources = _ref12.resources;
+        resources = _ref12.resources,
+        product = _ref12.product;
       var targetProduct = this.store.currentProduct;
-      var targetProductData = targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.getData();
+      // 如果外面传递了product 优先用外面的
+      var targetProductData = product || (targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.getData());
       var targetSchedules = [];
       // 如果外面传递了 scheduleIds,优先取入参
       if (scheduleIds !== null && scheduleIds !== void 0 && scheduleIds.length) {

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

@@ -7,9 +7,16 @@ export declare class ProductList extends BaseModule implements Module {
     protected defaultName: string;
     protected defaultVersion: string;
     private store;
+    private request;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options: any): Promise<void>;
     storeChange(path?: string, value?: any): Promise<void>;
+    loadProductsPrice({ ids, customer_id, schedule_date, channel, }: {
+        ids?: number[];
+        customer_id?: number;
+        schedule_date?: string;
+        channel?: string;
+    }): Promise<any>;
     getProducts(): Promise<ProductData[]>;
     getProduct(id: number): Promise<Product | undefined>;
     addProduct(products: ProductData[]): Promise<void>;

package/lib/modules/ProductList/index.js

@@ -47,6 +47,7 @@ var ProductList = class extends import_BaseModule.BaseModule {
       this.store.productMap = /* @__PURE__ */ new Map();
       this.store.selectProducts = [];
     }
+    this.request = core.getPlugin("request");
   }
   async storeChange(path, value) {
     var _a;
@@ -63,6 +64,24 @@ var ProductList = class extends import_BaseModule.BaseModule {
       }
     });
   }
+  async loadProductsPrice({
+    ids = [],
+    customer_id,
+    schedule_date,
+    channel
+  }) {
+    const productsData = await this.request.post(
+      `/product/query/price`,
+      {
+        ids,
+        customer_id,
+        schedule_date,
+        channel
+      },
+      { useCache: true }
+    );
+    return productsData.data;
+  }
   async getProducts() {
     await this.core.effects.emit(
       import_types.ProductListHooks.onGetProducts,

package/lib/solution/BookingByStep/index.d.ts

@@ -186,10 +186,11 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     private getScheduleDataByIds;
     openProductDetail(productId: number): Promise<void>;
     closeProductDetail(): void;
-    getTimeslotBySchedule({ date, scheduleIds, resources, }: {
+    getTimeslotBySchedule({ date, scheduleIds, resources, product }: {
         date: string;
         scheduleIds?: number[];
         resources?: ProductResourceItem[];
+        product?: ProductData;
     }): {
         start_time: string;
         end_time: string;

package/lib/solution/BookingByStep/index.js

@@ -181,7 +181,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       `/product/query`,
       {
         open_quotation: 1,
-        open_bundle: 1,
+        open_bundle: 0,
         extension_type: [
           "product_appointment",
           "appointment_ticket",
@@ -225,30 +225,32 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   async updateQuotationPriceAndCart(date) {
     var _a;
-    const dateRange = this.store.date.getDateRange();
-    const scheduleList = this.store.schedule.getAvailabilityScheduleDateList() || [];
-    let scheduleIds = [];
-    if (dateRange && dateRange.length) {
-      scheduleIds = scheduleList.filter((n) => n.date === dateRange[0].date).flatMap((n) => n.schedule_id);
-    } else {
-      scheduleIds = scheduleList.filter((n) => n.date === date).flatMap((n) => n.schedule_id);
-    }
-    await this.loadProducts({
-      ...(_a = this.otherParams) == null ? void 0 : _a.productModuleParams,
-      scheduleIds,
-      schedule_date: date
-    });
     const cartItems = this.store.cart.getItems();
     if (cartItems.length) {
+      let userPlugin = this.core.getPlugin("user");
+      let customer_id = void 0;
+      try {
+        customer_id = (_a = userPlugin == null ? void 0 : userPlugin.get()) == null ? void 0 : _a.id;
+      } catch (error) {
+        console.error(error);
+      }
+      const res = await this.store.products.loadProductsPrice({
+        ids: cartItems.map((n) => n.id),
+        schedule_date: date,
+        customer_id
+      });
       for (const item of cartItems) {
-        const targetProduct = await this.store.products.getProduct(item.id);
-        const productInfo = (0, import_lodash_es.cloneDeep)(targetProduct == null ? void 0 : targetProduct.getData());
+        const targetProduct = res.find((n) => n.id === item.id);
+        const cartProduct = await this.store.products.getProduct(item.id);
+        const productInfo = cartProduct == null ? void 0 : cartProduct.getData();
         let bundle = item._bundleOrigin;
+        productInfo.price = targetProduct == null ? void 0 : targetProduct.price;
+        productInfo.base_price = targetProduct == null ? void 0 : targetProduct.base_price;
         bundle = bundle == null ? void 0 : bundle.map((n) => {
           var _a2;
-          const targetBundle = (_a2 = productInfo == null ? void 0 : productInfo.bundle) == null ? void 0 : _a2.find((m) => m.group_id === n.id);
+          const targetBundle = (_a2 = targetProduct == null ? void 0 : targetProduct.bundle_group) == null ? void 0 : _a2.find((m) => m.id === n.group_id);
           if (targetBundle) {
-            const targetBundleItem = targetBundle.items.find((m) => m.id === n.id);
+            const targetBundleItem = targetBundle.bundle_item.find((m) => m.id === n.id);
             if (targetBundleItem) {
               return {
                 ...n,
@@ -1532,11 +1534,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   getTimeslotBySchedule({
     date,
     scheduleIds,
-    resources
+    resources,
+    product
   }) {
     var _a, _b, _c;
     const targetProduct = this.store.currentProduct;
-    const targetProductData = targetProduct == null ? void 0 : targetProduct.getData();
+    const targetProductData = product || (targetProduct == null ? void 0 : targetProduct.getData());
     let targetSchedules = [];
     if (scheduleIds == null ? void 0 : scheduleIds.length) {
       targetSchedules = this.store.schedule.getScheduleListByIds(scheduleIds);

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.0.98",
+  "version": "0.0.99",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",