@pisell/pisellos 3.0.15 → 3.0.18

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

@@ -16,6 +16,7 @@ export declare class AccountListModule extends BaseModule implements Module {
      * 创建账号并添加到列表中
      * @param account 账号信息
      * @param needEmit 是否需要触发事件
+     * @param type 添加类型
      */
     private createAccountAndAdd;
     addAccount(account: Account): Promise<AccountModule>;
@@ -30,10 +31,12 @@ export declare class AccountListModule extends BaseModule implements Module {
     storeChange(): void;
     /**
      * 批量添加holder类型账号
-     * @param holders 账号信息列表
-     * @param customerId 账户id
      */
-    addHolderAccounts(holders: IHolder[], customerId: number): Promise<AccountModule[]>;
+    addHolderAccounts(params: {
+        holders: IHolder[];
+        customerId: number;
+        type?: 'unshift' | 'push';
+    }): Promise<AccountModule[]>;
     /**
      * 获取holder类型账户列表
      * @param params

package/dist/modules/AccountList/index.js

@@ -97,42 +97,56 @@ export var AccountListModule = /*#__PURE__*/function (_BaseModule) {
      * 创建账号并添加到列表中
      * @param account 账号信息
      * @param needEmit 是否需要触发事件
+     * @param type 添加类型
      */
   }, {
     key: "createAccountAndAdd",
     value: (function () {
       var _createAccountAndAdd = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(account) {
         var needEmit,
+          type,
           tempAccountModule,
+          newAccountList,
           accountModule,
           _args2 = arguments;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               needEmit = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : true;
+              type = _args2.length > 2 ? _args2[2] : undefined;
               tempAccountModule = this.store.accounts.find(function (a) {
                 return a.getId() === account.id;
               }); // 如果账号已经存在，则直接返回
               if (!tempAccountModule) {
-                _context2.next = 4;
+                _context2.next = 5;
                 break;
               }
               return _context2.abrupt("return", tempAccountModule);
-            case 4:
-              this.store.accountList.push(account);
+            case 5:
+              newAccountList = _toConsumableArray(this.store.accountList || []);
+              if (type === 'unshift') {
+                newAccountList.unshift(account);
+              } else {
+                newAccountList.push(account);
+              }
+              this.store.accountList = newAccountList;
               accountModule = new AccountModule("account_".concat(account.id));
               this.core.registerModule(accountModule);
               accountModule.setAccountInfo(account);
-              this.store.accounts = [].concat(_toConsumableArray(this.store.accounts || []), [accountModule]);
+              if (type === 'unshift') {
+                this.store.accounts = [accountModule].concat(_toConsumableArray(this.store.accounts || []));
+              } else {
+                this.store.accounts = [].concat(_toConsumableArray(this.store.accounts || []), [accountModule]);
+              }
               if (!needEmit) {
-                _context2.next = 12;
+                _context2.next = 15;
                 break;
               }
-              _context2.next = 12;
+              _context2.next = 15;
               return this.core.effects.emit(AccountListHooks.OnAccountListUpdate, this.store);
-            case 12:
+            case 15:
               return _context2.abrupt("return", accountModule);
-            case 13:
+            case 16:
             case "end":
               return _context2.stop();
           }
@@ -425,59 +439,62 @@ export var AccountListModule = /*#__PURE__*/function (_BaseModule) {
 
     /**
      * 批量添加holder类型账号
-     * @param holders 账号信息列表
-     * @param customerId 账户id
      */
   }, {
     key: "addHolderAccounts",
     value: (function () {
-      var _addHolderAccounts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(holders, customerId) {
-        var accountModules, _iterator, _step, holder, account, accountModule;
+      var _addHolderAccounts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(params) {
+        var holders, customerId, _params$type, type, accountModules, _iterator, _step, holder, account, accountModule;
         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
+              holders = params.holders, customerId = params.customerId, _params$type = params.type, type = _params$type === void 0 ? 'push' : _params$type;
               accountModules = [];
               _iterator = _createForOfIteratorHelper(holders);
-              _context8.prev = 2;
+              _context8.prev = 3;
               _iterator.s();
-            case 4:
+            case 5:
               if ((_step = _iterator.n()).done) {
-                _context8.next = 13;
+                _context8.next = 14;
                 break;
               }
               holder = _step.value;
               account = createHolderAccount(holder, customerId);
-              _context8.next = 9;
-              return this.createAccountAndAdd(account, false);
-            case 9:
+              _context8.next = 10;
+              return this.createAccountAndAdd(account, false, type);
+            case 10:
               accountModule = _context8.sent;
-              accountModules.push(accountModule);
-            case 11:
-              _context8.next = 4;
+              if (type === 'unshift') {
+                accountModules.unshift(accountModule);
+              } else {
+                accountModules.push(accountModule);
+              }
+            case 12:
+              _context8.next = 5;
               break;
-            case 13:
-              _context8.next = 18;
+            case 14:
+              _context8.next = 19;
               break;
-            case 15:
-              _context8.prev = 15;
-              _context8.t0 = _context8["catch"](2);
+            case 16:
+              _context8.prev = 16;
+              _context8.t0 = _context8["catch"](3);
               _iterator.e(_context8.t0);
-            case 18:
-              _context8.prev = 18;
+            case 19:
+              _context8.prev = 19;
               _iterator.f();
-              return _context8.finish(18);
-            case 21:
-              _context8.next = 23;
+              return _context8.finish(19);
+            case 22:
+              _context8.next = 24;
               return this.core.effects.emit(AccountListHooks.OnAccountListUpdate, this.store);
-            case 23:
-              return _context8.abrupt("return", accountModules);
             case 24:
+              return _context8.abrupt("return", accountModules);
+            case 25:
             case "end":
               return _context8.stop();
           }
-        }, _callee8, this, [[2, 15, 18, 21]]);
+        }, _callee8, this, [[3, 16, 19, 22]]);
       }));
-      function addHolderAccounts(_x10, _x11) {
+      function addHolderAccounts(_x10) {
         return _addHolderAccounts.apply(this, arguments);
       }
       return addHolderAccounts;
@@ -508,26 +525,31 @@ export var AccountListModule = /*#__PURE__*/function (_BaseModule) {
               });
             case 5:
               res = _context9.sent;
+              this.store.accountList = [];
+              this.store.accounts = [];
               if (!(res !== null && res !== void 0 && (_res$data = res.data) !== null && _res$data !== void 0 && (_res$data = _res$data.list) !== null && _res$data !== void 0 && _res$data.length)) {
-                _context9.next = 9;
+                _context9.next = 11;
                 break;
               }
-              _context9.next = 9;
-              return this.addHolderAccounts(res.data.list, customer_id);
-            case 9:
-              _context9.next = 14;
-              break;
+              _context9.next = 11;
+              return this.addHolderAccounts({
+                holders: res.data.list,
+                customerId: customer_id
+              });
             case 11:
-              _context9.prev = 11;
+              _context9.next = 16;
+              break;
+            case 13:
+              _context9.prev = 13;
               _context9.t0 = _context9["catch"](2);
               console.error(_context9.t0);
-            case 14:
+            case 16:
             case "end":
               return _context9.stop();
           }
-        }, _callee9, this, [[2, 11]]);
+        }, _callee9, this, [[2, 13]]);
       }));
-      function fetchHolderAccounts(_x12) {
+      function fetchHolderAccounts(_x11) {
         return _fetchHolderAccounts.apply(this, arguments);
       }
       return fetchHolderAccounts;

package/dist/modules/Cart/utils.js

@@ -550,6 +550,9 @@ export var getProductDeposit = function getProductDeposit(params) {
       deposit_policy_data = _ref2.deposit_policy_data;
     // 协议数据
     protocols.push.apply(protocols, _toConsumableArray(deposit_policy_data || []));
+    // 是否存在定金，主商品has_deposit为1，但是自身没有定金设置，需要判定子商品是否存在定金，如果不存在最终判定也是不存在定金
+    var productHasDeposit = false;
+
     // 判断主商品是否有定金规则
     if (typeof deposit_fixed === 'string' && typeof deposit_percentage === 'string') {
       var _handleProductDeposit = handleProductDeposit({
@@ -561,6 +564,7 @@ export var getProductDeposit = function getProductDeposit(params) {
         result = _handleProductDeposit.result;
       if (result) {
         total = depositTotal;
+        productHasDeposit = true;
       }
     } else {
       if (bundle !== null && bundle !== void 0 && bundle.length) {
@@ -573,16 +577,20 @@ export var getProductDeposit = function getProductDeposit(params) {
             depositTotal = _handleProductDeposit2.depositTotal,
             result = _handleProductDeposit2.result;
           if (result) {
+            productHasDeposit = true;
             return accumulator.plus(depositTotal);
           }
           return accumulator;
         }, new Decimal(0));
       }
     }
-    return {
-      total: total.toNumber(),
-      protocols: protocols
-    };
+    if (productHasDeposit) {
+      return {
+        total: total.toNumber(),
+        protocols: protocols
+      };
+    }
+    return null;
   }
   return null;
 };

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

@@ -457,4 +457,6 @@ export interface ProductResourceItem {
     updated_at: string;
     /** 可用资源列表 */
     renderList?: any[];
+    /** 资源类型 */
+    type: 'single' | 'multiple' | 'capacity';
 }

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

@@ -147,6 +147,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     checkCartItems(type: ECartItemCheckType): string[];
     destroy(): void;
     getResourcesList(): any[];
+    checkResourceListForDate(): boolean;
     getResourcesListByCartItem(id: string | number): {
         id: number | undefined;
         _id: string;