@pisell/pisellos 3.0.16 → 3.0.19

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

@@ -542,14 +542,19 @@ export var getProductDeposit = function getProductDeposit(params) {
 
   // 判定商品是否有定金规则
   if ((product === null || product === void 0 || (_product$custom_depos2 = product.custom_deposit_data) === null || _product$custom_depos2 === void 0 ? void 0 : _product$custom_depos2.has_deposit) == 1) {
-    var protocols = [];
     var total = new Decimal(0);
     var _ref2 = (product === null || product === void 0 ? void 0 : product.custom_deposit_data) || {},
       deposit_fixed = _ref2.deposit_fixed,
       deposit_percentage = _ref2.deposit_percentage,
-      deposit_policy_data = _ref2.deposit_policy_data;
-    // 协议数据
-    protocols.push.apply(protocols, _toConsumableArray(deposit_policy_data || []));
+      deposit_policy_data = _ref2.deposit_policy_data,
+      self_deposit_policy_ids = _ref2.self_deposit_policy_ids;
+    // 所有协议数据
+    var allProtocols = deposit_policy_data || [];
+    // 是否存在定金，主商品has_deposit为1，但是自身没有定金设置，需要判定子商品是否存在定金，如果不存在最终判定也是不存在定金
+    var productHasDeposit = false;
+    // 关联的定金协议id
+    var protocolIds = [];
+
     // 判断主商品是否有定金规则
     if (typeof deposit_fixed === 'string' && typeof deposit_percentage === 'string') {
       var _handleProductDeposit = handleProductDeposit({
@@ -561,28 +566,40 @@ export var getProductDeposit = function getProductDeposit(params) {
         result = _handleProductDeposit.result;
       if (result) {
         total = depositTotal;
+        protocolIds.push.apply(protocolIds, _toConsumableArray(self_deposit_policy_ids || []));
+        productHasDeposit = true;
       }
     } else {
       if (bundle !== null && bundle !== void 0 && bundle.length) {
-        total = bundle.reduce(function (accumulator, currentBundleProduct) {
+        total = bundle.reduce(function (accumulator, currBundleProduct) {
+          var depositData = currBundleProduct === null || currBundleProduct === void 0 ? void 0 : currBundleProduct.custom_deposit_data;
           var _handleProductDeposit2 = handleProductDeposit({
-              depositData: currentBundleProduct === null || currentBundleProduct === void 0 ? void 0 : currentBundleProduct.custom_deposit_data,
-              total: currentBundleProduct.price,
-              num: currentBundleProduct.num
+              depositData: depositData,
+              total: currBundleProduct === null || currBundleProduct === void 0 ? void 0 : currBundleProduct.price,
+              num: (currBundleProduct === null || currBundleProduct === void 0 ? void 0 : currBundleProduct.num) || 1
             }),
             depositTotal = _handleProductDeposit2.depositTotal,
             result = _handleProductDeposit2.result;
           if (result) {
+            protocolIds.push.apply(protocolIds, _toConsumableArray((depositData === null || depositData === void 0 ? void 0 : depositData.self_deposit_policy_ids) || []));
+            productHasDeposit = true;
             return accumulator.plus(depositTotal);
           }
           return accumulator;
         }, new Decimal(0));
       }
     }
-    return {
-      total: total.toNumber(),
-      protocols: protocols
-    };
+    if (productHasDeposit) {
+      var ids = new Set(protocolIds);
+      var protocols = allProtocols.filter(function (item) {
+        return ids.has(item.id);
+      });
+      return {
+        total: total.toNumber(),
+        protocols: protocols
+      };
+    }
+    return null;
   }
   return null;
 };

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

@@ -44,6 +44,7 @@ export interface Discount {
     balance: string;
     format_title: Formattitle;
     product: Product;
+    type: "product" | 'good_pass';
     resource_id?: number;
     savedAmount?: number;
     isEditMode?: boolean;

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

@@ -168,6 +168,8 @@ export interface ProductData {
         deposit_fixed?: string;
         /** 定金百分比 */
         deposit_percentage?: string;
+        /** 关联的定金协议id */
+        self_deposit_policy_ids?: number[];
         /** 定金协议数据 */
         deposit_policy_data?: Array<{
             /** 定金协议id */
@@ -457,4 +459,6 @@ export interface ProductResourceItem {
     updated_at: string;
     /** 可用资源列表 */
     renderList?: any[];
+    /** 资源类型 */
+    type: 'single' | 'multiple' | 'capacity';
 }

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

@@ -25,7 +25,8 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         productList: any[];
     }, options?: {
         isSelected?: boolean;
-        discountId: number;
+        discountId?: number;
+        scan?: boolean;
     }): DiscountResult;
     destroy(): Promise<void>;
     clear(): Promise<void>;

package/dist/modules/Rules/index.js

@@ -111,6 +111,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var result = this.calcDiscount({
         discountList: mergedDiscountList,
         productList: _toConsumableArray(productList)
+      }, {
+        scan: true
       });
 
       // 检查是否有产品使用了新折扣
@@ -214,7 +216,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 编辑的商品 使用了优惠券不可用
           var isAvailableProduct = !(product !== null && product !== void 0 && product.booking_id && product !== null && product !== void 0 && (_product$discount_lis = product.discount_list) !== null && _product$discount_lis !== void 0 && _product$discount_lis.length && product !== null && product !== void 0 && (_product$discount_lis2 = product.discount_list) !== null && _product$discount_lis2 !== void 0 && _product$discount_lis2.every(function (discount) {
-            return discount.id;
+            return discount.id && discount.type === 'good_pass';
           }));
 
           // 判断优惠券是否适用于该商品
@@ -244,7 +246,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         var _product$discount_lis3, _product$discount_lis4, _product$discount_lis5;
         var product = _this3.hooks.getProduct(originProduct);
         if (product !== null && product !== void 0 && product.booking_id && (_product$discount_lis3 = product.discount_list) !== null && _product$discount_lis3 !== void 0 && _product$discount_lis3.length && product !== null && product !== void 0 && (_product$discount_lis4 = product.discount_list) !== null && _product$discount_lis4 !== void 0 && _product$discount_lis4.every(function (discount) {
-          return discount.id;
+          return discount.id && discount.type === 'good_pass';
         })) {
           processedProductsMap.set(product._id, originProduct);
           return;
@@ -308,7 +310,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           }
           return;
         }
-        if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === 'undefined') {
+        if (applicableDiscounts.length && product.booking_id && typeof selectedDiscount.isManualSelect === 'undefined' && !(options !== null && options !== void 0 && options.scan)) {
           return;
         }
 
@@ -366,7 +368,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         var product = _this3.hooks.getProduct(originProduct);
         var getDefaultProduct = function getDefaultProduct() {
           if (product.isClient) {
-            _this3.hooks.setProduct(originProduct, {
+            return _this3.hooks.setProduct(originProduct, {
               discount_list: [],
               price: product.price,
               origin_total: getProductOriginTotalPrice({
@@ -385,7 +387,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               })
             });
           } else {
-            _this3.hooks.setProduct(originProduct, {
+            return _this3.hooks.setProduct(originProduct, {
               discount_list: [],
               total: product.total,
               origin_total: product.origin_total,

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;