@pisell/pisellos 0.0.25 → 0.0.27

package/dist/modules/AccountList/index.js

@@ -246,7 +246,7 @@ export var AccountListModule = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error("Account with id ".concat(id, " not found"));
             case 6:
-              this.store.accounts[index].destory();
+              this.store.accounts[index].destroy();
               this.store.accounts = [].concat(_toConsumableArray((this.store.accounts || []).slice(0, index)), _toConsumableArray((this.store.accounts || []).slice(index + 1)));
               this.store.accountList = this.store.accountList.filter(function (account) {
                 return account.id !== id;

package/dist/modules/BaseModule.d.ts

@@ -7,7 +7,7 @@ export declare class BaseModule {
     isSolution: boolean;
     protected core: PisellCore;
     constructor(name?: string, version?: string);
-    destory(): void;
+    destroy(): void;
     checkSaveCache({ cacheId, fatherModule, store, cacheKey }: {
         cacheId: string | undefined;
         fatherModule: string | undefined;

package/dist/modules/BaseModule.js

@@ -18,8 +18,8 @@ export var BaseModule = /*#__PURE__*/function () {
     this.version = version || this.defaultVersion;
   }
   _createClass(BaseModule, [{
-    key: "destory",
-    value: function destory() {
+    key: "destroy",
+    value: function destroy() {
       this.core.effects.offByModuleDestroy(this.name);
       this.core.unregisterModule(this);
     }

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

@@ -1,5 +1,6 @@
 import { Module, PisellCore } from "../../types";
 import { BaseModule } from "../../modules/BaseModule";
+import { Response } from "../../plugins";
 import { BookingByStepState } from "./types";
 import { CartItem, IUpdateItemParams, ProductData } from "../../modules";
 import { Account } from "../../modules/Account/types";
@@ -59,6 +60,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     getProducts(): Promise<ProductData[]>;
     setLoginAccount(accountId: string, accountInfo: Account): Promise<void>;
     generateCartData(): Promise<void>;
+    getFreeProduct(id: string | number): Promise<Response<any>>;
     submitOrder(): Promise<void>;
     pay(): Promise<void>;
     getPayInfo(): Promise<void>;
@@ -78,7 +80,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      * 从购物车中按类别删除信息
      */
     deleteCartItemInfo(types: "resource" | "time"): void;
-    destory(): void;
+    destroy(): void;
     getResourcesList(): any[];
     getResourcesListByCartItem(id: string | number): {
         id: number | undefined;

package/dist/solution/BookingByStep/index.js

@@ -531,17 +531,42 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         return _generateCartData.apply(this, arguments);
       }
       return generateCartData;
-    }() // 购物车提交订单
+    }() // 免费领取商品相关逻辑，上线了来不及加了，先放在这，后面要做到 payment 里面的
   }, {
-    key: "submitOrder",
+    key: "getFreeProduct",
     value: function () {
-      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
-        var cartItems;
+      var _getFreeProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(id) {
+        var res;
         return _regeneratorRuntime().wrap(function _callee13$(_context13) {
           while (1) switch (_context13.prev = _context13.next) {
             case 0:
-              cartItems = this.store.cart.getItems(); // 先整个临时的逻辑，把购物车里所有商品的资源给他格式化一下
-              cartItems.forEach(function (item) {
+              _context13.next = 2;
+              return this.request.post("/pay/order/free-pay/".concat(id));
+            case 2:
+              res = _context13.sent;
+              return _context13.abrupt("return", res);
+            case 4:
+            case "end":
+              return _context13.stop();
+          }
+        }, _callee13, this);
+      }));
+      function getFreeProduct(_x9) {
+        return _getFreeProduct.apply(this, arguments);
+      }
+      return getFreeProduct;
+    }() // 购物车提交订单
+  }, {
+    key: "submitOrder",
+    value: function () {
+      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
+        var cartItems, newCartItems;
+        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
+            case 0:
+              cartItems = this.store.cart.getItems();
+              newCartItems = cloneDeep(cartItems); // 先整个临时的逻辑，把购物车里所有商品的资源给他格式化一下
+              newCartItems.forEach(function (item) {
                 item._origin.resources = item._origin.resources.map(function (n) {
                   var newResourcesItem = cloneDeep(n);
                   delete newResourcesItem.id;
@@ -550,16 +575,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   return _objectSpread({}, newResourcesItem);
                 });
               });
-              return _context13.abrupt("return", this.store.order.commitOrder({
+              return _context14.abrupt("return", this.store.order.commitOrder({
                 query: {
-                  cartItems: cartItems
+                  cartItems: newCartItems
                 }
               }));
-            case 3:
+            case 4:
             case "end":
-              return _context13.stop();
+              return _context14.stop();
           }
-        }, _callee13, this);
+        }, _callee14, this);
       }));
       function submitOrder() {
         return _submitOrder.apply(this, arguments);
@@ -569,14 +594,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "pay",
     value: function () {
-      var _pay = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
-        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+      var _pay = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
+        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
+          while (1) switch (_context15.prev = _context15.next) {
             case 0:
             case "end":
-              return _context14.stop();
+              return _context15.stop();
           }
-        }, _callee14);
+        }, _callee15);
       }));
       function pay() {
         return _pay.apply(this, arguments);
@@ -586,14 +611,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getPayInfo",
     value: function () {
-      var _getPayInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
-        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+      var _getPayInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
+        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
             case "end":
-              return _context15.stop();
+              return _context16.stop();
           }
-        }, _callee15);
+        }, _callee16);
       }));
       function getPayInfo() {
         return _getPayInfo.apply(this, arguments);
@@ -603,15 +628,15 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setOtherParams",
     value: function () {
-      var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(params) {
+      var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(params) {
         var _ref4,
           _ref4$cover,
           cover,
-          _args16 = arguments;
-        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+          _args17 = arguments;
+        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
-              _ref4 = _args16.length > 1 && _args16[1] !== undefined ? _args16[1] : {}, _ref4$cover = _ref4.cover, cover = _ref4$cover === void 0 ? false : _ref4$cover;
+              _ref4 = _args17.length > 1 && _args17[1] !== undefined ? _args17[1] : {}, _ref4$cover = _ref4.cover, cover = _ref4$cover === void 0 ? false : _ref4$cover;
               if (cover) {
                 this.otherParams = params;
               } else {
@@ -619,11 +644,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               }
             case 2:
             case "end":
-              return _context16.stop();
+              return _context17.stop();
           }
-        }, _callee16, this);
+        }, _callee17, this);
       }));
-      function setOtherParams(_x9) {
+      function setOtherParams(_x10) {
         return _setOtherParams.apply(this, arguments);
       }
       return setOtherParams;
@@ -631,16 +656,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOtherParams",
     value: function () {
-      var _getOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
-        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+      var _getOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18() {
+        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
-              return _context17.abrupt("return", this.otherParams);
+              return _context18.abrupt("return", this.otherParams);
             case 1:
             case "end":
-              return _context17.stop();
+              return _context18.stop();
           }
-        }, _callee17, this);
+        }, _callee18, this);
       }));
       function getOtherParams() {
         return _getOtherParams.apply(this, arguments);
@@ -719,15 +744,15 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       this.store.cart.deleteCartItemInfo(types);
     }
   }, {
-    key: "destory",
-    value: function destory() {
+    key: "destroy",
+    value: function destroy() {
       var _this$store$cart, _this$store$step, _this$store$products, _this$store$guests, _this$store$date, _this$store$accountLi;
-      (_this$store$cart = this.store.cart) === null || _this$store$cart === void 0 || _this$store$cart.destory();
-      (_this$store$step = this.store.step) === null || _this$store$step === void 0 || _this$store$step.destory();
-      (_this$store$products = this.store.products) === null || _this$store$products === void 0 || _this$store$products.destory();
-      (_this$store$guests = this.store.guests) === null || _this$store$guests === void 0 || _this$store$guests.destory();
-      (_this$store$date = this.store.date) === null || _this$store$date === void 0 || _this$store$date.destory();
-      (_this$store$accountLi = this.store.accountList) === null || _this$store$accountLi === void 0 || _this$store$accountLi.destory();
+      (_this$store$cart = this.store.cart) === null || _this$store$cart === void 0 || _this$store$cart.destroy();
+      (_this$store$step = this.store.step) === null || _this$store$step === void 0 || _this$store$step.destroy();
+      (_this$store$products = this.store.products) === null || _this$store$products === void 0 || _this$store$products.destroy();
+      (_this$store$guests = this.store.guests) === null || _this$store$guests === void 0 || _this$store$guests.destroy();
+      (_this$store$date = this.store.date) === null || _this$store$date === void 0 || _this$store$date.destroy();
+      (_this$store$accountLi = this.store.accountList) === null || _this$store$accountLi === void 0 || _this$store$accountLi.destroy();
       this.core.effects.offByModuleDestroy(this.name);
       this.core.unregisterModule(this);
     }
@@ -1024,7 +1049,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             }
           } else {
             var _productResources$fin;
-            debugger;
             // 如果没有传递 timeSlots，代表是第一种资源，则直接拿商品的 duration，到资源列表里找一个公共可用的
             var productResources = getResourcesByProduct(resourcesMap, item, allCartItems);
             // 自动选择 productResources 中对应 resources_code 的资源
@@ -1045,7 +1069,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           }
         });
       });
-      debugger;
       return {
         errorList: errorList
       };
@@ -1088,7 +1111,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           duration = accountDuration;
         }
       });
-      debugger;
       var timeSlots = getTimeSlicesByResources({
         resourceIds: resourceIds,
         resourcesMap: resourcesMap,

package/dist/solution/ShopDiscount/index.js

@@ -165,7 +165,6 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
           targetCacheData = data[this.options.otherParams.cacheId];
         }
       }
-
       // 注册优惠模块
       var discount = new DiscountModule("".concat(this.name, "_discount"));
       this.core.registerModule(discount, {

package/lib/modules/AccountList/index.js

@@ -126,7 +126,7 @@ var AccountListModule = class extends import_BaseModule.BaseModule {
       if (index === -1) {
         throw new Error(`Account with id ${id} not found`);
       }
-      this.store.accounts[index].destory();
+      this.store.accounts[index].destroy();
       this.store.accounts = [
         ...(this.store.accounts || []).slice(0, index),
         ...(this.store.accounts || []).slice(index + 1)

package/lib/modules/BaseModule.d.ts

@@ -7,7 +7,7 @@ export declare class BaseModule {
     isSolution: boolean;
     protected core: PisellCore;
     constructor(name?: string, version?: string);
-    destory(): void;
+    destroy(): void;
     checkSaveCache({ cacheId, fatherModule, store, cacheKey }: {
         cacheId: string | undefined;
         fatherModule: string | undefined;

package/lib/modules/BaseModule.js

@@ -30,7 +30,7 @@ var BaseModule = class {
     this.name = name || this.defaultName;
     this.version = version || this.defaultVersion;
   }
-  destory() {
+  destroy() {
     this.core.effects.offByModuleDestroy(this.name);
     this.core.unregisterModule(this);
   }

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

@@ -1,5 +1,6 @@
 import { Module, PisellCore } from "../../types";
 import { BaseModule } from "../../modules/BaseModule";
+import { Response } from "../../plugins";
 import { BookingByStepState } from "./types";
 import { CartItem, IUpdateItemParams, ProductData } from "../../modules";
 import { Account } from "../../modules/Account/types";
@@ -59,6 +60,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     getProducts(): Promise<ProductData[]>;
     setLoginAccount(accountId: string, accountInfo: Account): Promise<void>;
     generateCartData(): Promise<void>;
+    getFreeProduct(id: string | number): Promise<Response<any>>;
     submitOrder(): Promise<void>;
     pay(): Promise<void>;
     getPayInfo(): Promise<void>;
@@ -78,7 +80,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      * 从购物车中按类别删除信息
      */
     deleteCartItemInfo(types: "resource" | "time"): void;
-    destory(): void;
+    destroy(): void;
     getResourcesList(): any[];
     getResourcesListByCartItem(id: string | number): {
         id: number | undefined;

package/lib/solution/BookingByStep/index.js

@@ -256,10 +256,16 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   // 生成购物车的正规数据
   async generateCartData() {
   }
+  // 免费领取商品相关逻辑，上线了来不及加了，先放在这，后面要做到 payment 里面的
+  async getFreeProduct(id) {
+    const res = await this.request.post(`/pay/order/free-pay/${id}`);
+    return res;
+  }
   // 购物车提交订单
   async submitOrder() {
     const cartItems = this.store.cart.getItems();
-    cartItems.forEach((item) => {
+    const newCartItems = (0, import_lodash_es.cloneDeep)(cartItems);
+    newCartItems.forEach((item) => {
       item._origin.resources = item._origin.resources.map((n) => {
         const newResourcesItem = (0, import_lodash_es.cloneDeep)(n);
         delete newResourcesItem.id;
@@ -268,7 +274,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         return { ...newResourcesItem };
       });
     });
-    return this.store.order.commitOrder({ query: { cartItems } });
+    return this.store.order.commitOrder({ query: { cartItems: newCartItems } });
   }
   // 拉起支付模块
   async pay() {
@@ -336,14 +342,14 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   deleteCartItemInfo(types) {
     this.store.cart.deleteCartItemInfo(types);
   }
-  destory() {
+  destroy() {
     var _a, _b, _c, _d, _e, _f;
-    (_a = this.store.cart) == null ? void 0 : _a.destory();
-    (_b = this.store.step) == null ? void 0 : _b.destory();
-    (_c = this.store.products) == null ? void 0 : _c.destory();
-    (_d = this.store.guests) == null ? void 0 : _d.destory();
-    (_e = this.store.date) == null ? void 0 : _e.destory();
-    (_f = this.store.accountList) == null ? void 0 : _f.destory();
+    (_a = this.store.cart) == null ? void 0 : _a.destroy();
+    (_b = this.store.step) == null ? void 0 : _b.destroy();
+    (_c = this.store.products) == null ? void 0 : _c.destroy();
+    (_d = this.store.guests) == null ? void 0 : _d.destroy();
+    (_e = this.store.date) == null ? void 0 : _e.destroy();
+    (_f = this.store.accountList) == null ? void 0 : _f.destroy();
     this.core.effects.offByModuleDestroy(this.name);
     this.core.unregisterModule(this);
   }
@@ -573,7 +579,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             errorList.push(item._id);
           }
         } else {
-          debugger;
           const productResources = (0, import_resources.getResourcesByProduct)(resourcesMap, item, allCartItems);
           const targetRenderList = (_a = productResources.find((n) => n.code === resources_code)) == null ? void 0 : _a.renderList;
           if (targetRenderList && targetRenderList.length > 0) {
@@ -592,7 +597,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         }
       });
     });
-    debugger;
     return { errorList };
   }
   // 从购物车中获取已经分配好第一步资源的所有时间片
@@ -625,7 +629,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         duration = accountDuration;
       }
     });
-    debugger;
     const timeSlots = (0, import_resources.getTimeSlicesByResources)({
       resourceIds,
       resourcesMap,

package/package.json

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