@pisell/pisellos 0.0.42 → 0.0.44

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

@@ -16,6 +16,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         bookings: any[];
         shop_note: string;
         schedule_date: string;
+        is_deposit: number;
     };
     commitOrder(order: CommitOrderParams): Promise<void>;
 }

package/dist/modules/Order/index.js

@@ -60,14 +60,20 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         order_sales_channel: "online_store",
         bookings: [],
         shop_note: "",
-        schedule_date: ""
+        schedule_date: "",
+        is_deposit: 0
       };
+      var is_deposit = 0; // 是否存在定金，0 不存在，1 存在
       if (params.cartItems.length > 0) {
         params.cartItems.forEach(function (item) {
           order.bookings.push(item._origin);
+          if (item !== null && item !== void 0 && item.deposit) {
+            is_deposit = 1;
+          }
         });
         var firstCartItem = params.cartItems[0];
         order.schedule_date = firstCartItem.start_date + " " + firstCartItem.start_time + ":00";
+        order.is_deposit = is_deposit;
       }
       return order;
     }
@@ -82,9 +88,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               url = order.url, query = order.query;
               fetchUrl = url || "/order/appointment";
               params = this.createOrder(query);
-              console.log(params);
               return _context2.abrupt("return", this.request.post(fetchUrl, params));
-            case 5:
+            case 4:
             case "end":
               return _context2.stop();
           }

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

@@ -70,6 +70,10 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
             policies?: import("../../modules/Summary/types").IProtocol[] | undefined;
         } | undefined;
     }>;
+    /**
+     * 获取协议
+     */
+    getProtocol(protocolId: string): Promise<any>;
     getProducts(): Promise<ProductData[]>;
     setLoginAccount(accountId: string, accountInfo: Account): Promise<void>;
     generateCartData(): Promise<void>;

package/dist/solution/BookingByStep/index.js

@@ -527,22 +527,45 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         return _getSummary.apply(this, arguments);
       }
       return getSummary;
-    }() // 获取可选择的商品、服务列表
+    }()
+    /**
+     * 获取协议
+     */
     )
   }, {
-    key: "getProducts",
-    value: function () {
-      var _getProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
+    key: "getProtocol",
+    value: (function () {
+      var _getProtocol = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(protocolId) {
         return _regeneratorRuntime().wrap(function _callee12$(_context12) {
           while (1) switch (_context12.prev = _context12.next) {
             case 0:
-              return _context12.abrupt("return", this.store.products.getProducts());
+              return _context12.abrupt("return", this.store.summary.getProtocol(protocolId));
             case 1:
             case "end":
               return _context12.stop();
           }
         }, _callee12, this);
       }));
+      function getProtocol(_x8) {
+        return _getProtocol.apply(this, arguments);
+      }
+      return getProtocol;
+    }() // 获取可选择的商品、服务列表
+    )
+  }, {
+    key: "getProducts",
+    value: function () {
+      var _getProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
+        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
+            case 0:
+              return _context13.abrupt("return", this.store.products.getProducts());
+            case 1:
+            case "end":
+              return _context13.stop();
+          }
+        }, _callee13, this);
+      }));
       function getProducts() {
         return _getProducts.apply(this, arguments);
       }
@@ -551,15 +574,15 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setLoginAccount",
     value: function () {
-      var _setLoginAccount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(accountId, accountInfo) {
+      var _setLoginAccount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(accountId, accountInfo) {
         var _this4 = this;
         var account, stateAccountId, cartItems;
-        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
+        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
             case 0:
               account = this.store.accountList.getAccount(accountId);
               if (!account) {
-                _context13.next = 9;
+                _context14.next = 9;
                 break;
               }
               stateAccountId = account.getId();
@@ -575,17 +598,17 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 }
               });
               this.store.accountList.updateAccountListById(stateAccountId, accountInfo);
-              _context13.next = 10;
+              _context14.next = 10;
               break;
             case 9:
               throw new Error("\u6CA1\u6709\u627E\u5230".concat(accountId, "\u8D26\u6237"));
             case 10:
             case "end":
-              return _context13.stop();
+              return _context14.stop();
           }
-        }, _callee13, this);
+        }, _callee14, this);
       }));
-      function setLoginAccount(_x8, _x9) {
+      function setLoginAccount(_x9, _x10) {
         return _setLoginAccount.apply(this, arguments);
       }
       return setLoginAccount;
@@ -593,14 +616,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "generateCartData",
     value: function () {
-      var _generateCartData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
-        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+      var _generateCartData = _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 generateCartData() {
         return _generateCartData.apply(this, arguments);
@@ -610,23 +633,23 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getFreeProduct",
     value: function () {
-      var _getFreeProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(id) {
+      var _getFreeProduct = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(id) {
         var res;
-        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
-              _context15.next = 2;
+              _context16.next = 2;
               return this.request.post("/pay/order/free-pay/".concat(id));
             case 2:
-              res = _context15.sent;
-              return _context15.abrupt("return", res);
+              res = _context16.sent;
+              return _context16.abrupt("return", res);
             case 4:
             case "end":
-              return _context15.stop();
+              return _context16.stop();
           }
-        }, _callee15, this);
+        }, _callee16, this);
       }));
-      function getFreeProduct(_x10) {
+      function getFreeProduct(_x11) {
         return _getFreeProduct.apply(this, arguments);
       }
       return getFreeProduct;
@@ -634,10 +657,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "submitOrder",
     value: function () {
-      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
+      var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
         var cartItems, newCartItems;
-        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
               cartItems = this.store.cart.getItems();
               newCartItems = cloneDeep(cartItems); // 先整个临时的逻辑，把购物车里所有商品的资源给他格式化一下
@@ -650,16 +673,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   return _objectSpread({}, newResourcesItem);
                 });
               });
-              return _context16.abrupt("return", this.store.order.commitOrder({
+              return _context17.abrupt("return", this.store.order.commitOrder({
                 query: {
                   cartItems: newCartItems
                 }
               }));
             case 4:
             case "end":
-              return _context16.stop();
+              return _context17.stop();
           }
-        }, _callee16, this);
+        }, _callee17, this);
       }));
       function submitOrder() {
         return _submitOrder.apply(this, arguments);
@@ -669,14 +692,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "pay",
     value: function () {
-      var _pay = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
-        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+      var _pay = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18() {
+        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
             case "end":
-              return _context17.stop();
+              return _context18.stop();
           }
-        }, _callee17);
+        }, _callee18);
       }));
       function pay() {
         return _pay.apply(this, arguments);
@@ -686,14 +709,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getPayInfo",
     value: function () {
-      var _getPayInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18() {
-        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
-          while (1) switch (_context18.prev = _context18.next) {
+      var _getPayInfo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19() {
+        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
+          while (1) switch (_context19.prev = _context19.next) {
             case 0:
             case "end":
-              return _context18.stop();
+              return _context19.stop();
           }
-        }, _callee18);
+        }, _callee19);
       }));
       function getPayInfo() {
         return _getPayInfo.apply(this, arguments);
@@ -703,15 +726,15 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setOtherParams",
     value: function () {
-      var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(params) {
+      var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(params) {
         var _ref5,
           _ref5$cover,
           cover,
-          _args19 = arguments;
-        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
-          while (1) switch (_context19.prev = _context19.next) {
+          _args20 = arguments;
+        return _regeneratorRuntime().wrap(function _callee20$(_context20) {
+          while (1) switch (_context20.prev = _context20.next) {
             case 0:
-              _ref5 = _args19.length > 1 && _args19[1] !== undefined ? _args19[1] : {}, _ref5$cover = _ref5.cover, cover = _ref5$cover === void 0 ? false : _ref5$cover;
+              _ref5 = _args20.length > 1 && _args20[1] !== undefined ? _args20[1] : {}, _ref5$cover = _ref5.cover, cover = _ref5$cover === void 0 ? false : _ref5$cover;
               if (cover) {
                 this.otherParams = params;
               } else {
@@ -719,11 +742,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               }
             case 2:
             case "end":
-              return _context19.stop();
+              return _context20.stop();
           }
-        }, _callee19, this);
+        }, _callee20, this);
       }));
-      function setOtherParams(_x11) {
+      function setOtherParams(_x12) {
         return _setOtherParams.apply(this, arguments);
       }
       return setOtherParams;
@@ -731,16 +754,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOtherParams",
     value: function () {
-      var _getOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20() {
-        return _regeneratorRuntime().wrap(function _callee20$(_context20) {
-          while (1) switch (_context20.prev = _context20.next) {
+      var _getOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21() {
+        return _regeneratorRuntime().wrap(function _callee21$(_context21) {
+          while (1) switch (_context21.prev = _context21.next) {
             case 0:
-              return _context20.abrupt("return", this.otherParams);
+              return _context21.abrupt("return", this.otherParams);
             case 1:
             case "end":
-              return _context20.stop();
+              return _context21.stop();
           }
-        }, _callee20, this);
+        }, _callee21, this);
       }));
       function getOtherParams() {
         return _getOtherParams.apply(this, arguments);
@@ -1327,25 +1350,25 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "openProductDetail",
     value: function () {
-      var _openProductDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(productId) {
+      var _openProductDetail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(productId) {
         var targetProduct;
-        return _regeneratorRuntime().wrap(function _callee21$(_context21) {
-          while (1) switch (_context21.prev = _context21.next) {
+        return _regeneratorRuntime().wrap(function _callee22$(_context22) {
+          while (1) switch (_context22.prev = _context22.next) {
             case 0:
-              _context21.next = 2;
+              _context22.next = 2;
               return this.store.products.getProduct(productId);
             case 2:
-              targetProduct = _context21.sent;
+              targetProduct = _context22.sent;
               if (targetProduct) {
                 this.store.currentProduct = targetProduct;
               }
             case 4:
             case "end":
-              return _context21.stop();
+              return _context22.stop();
           }
-        }, _callee21, this);
+        }, _callee22, this);
       }));
-      function openProductDetail(_x12) {
+      function openProductDetail(_x13) {
         return _openProductDetail.apply(this, arguments);
       }
       return openProductDetail;

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

@@ -16,6 +16,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         bookings: any[];
         shop_note: string;
         schedule_date: string;
+        is_deposit: number;
     };
     commitOrder(order: CommitOrderParams): Promise<void>;
 }

package/lib/modules/Order/index.js

@@ -42,14 +42,20 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       order_sales_channel: "online_store",
       bookings: [],
       shop_note: "",
-      schedule_date: ""
+      schedule_date: "",
+      is_deposit: 0
     };
+    let is_deposit = 0;
     if (params.cartItems.length > 0) {
       params.cartItems.forEach((item) => {
         order.bookings.push(item._origin);
+        if (item == null ? void 0 : item.deposit) {
+          is_deposit = 1;
+        }
       });
       const firstCartItem = params.cartItems[0];
       order.schedule_date = firstCartItem.start_date + " " + firstCartItem.start_time + ":00";
+      order.is_deposit = is_deposit;
     }
     return order;
   }
@@ -57,7 +63,6 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const { url, query } = order;
     const fetchUrl = url || "/order/appointment";
     const params = this.createOrder(query);
-    console.log(params);
     return this.request.post(fetchUrl, params);
   }
 };

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

@@ -70,6 +70,10 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
             policies?: import("../../modules/Summary/types").IProtocol[] | undefined;
         } | undefined;
     }>;
+    /**
+     * 获取协议
+     */
+    getProtocol(protocolId: string): Promise<any>;
     getProducts(): Promise<ProductData[]>;
     setLoginAccount(accountId: string, accountInfo: Account): Promise<void>;
     generateCartData(): Promise<void>;

package/lib/solution/BookingByStep/index.js

@@ -252,6 +252,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const summary = await this.store.summary.getSummary(cartItems);
     return summary;
   }
+  /**
+   * 获取协议
+   */
+  async getProtocol(protocolId) {
+    return this.store.summary.getProtocol(protocolId);
+  }
   // 获取可选择的商品、服务列表
   async getProducts() {
     return this.store.products.getProducts();

package/package.json

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