@pisell/pisellos 1.0.78 → 1.0.80

package/dist/modules/Cart/utils/cartProduct.js

@@ -178,18 +178,18 @@ export var getProductTotalPrice = function getProductTotalPrice(params) {
   // 如果商品有折扣，则计算折扣
   if (discounts !== null && discounts !== void 0 && discounts.length) {
     discounts.forEach(function (currentValue) {
+      var _currentValue$discoun;
       // 不是商品券则代表折扣卡，计算打折后的价格
       // 一个商品折扣卡只能存在于一张
-      if (currentValue.type !== 'good_pass') {
-        var _currentValue$discoun;
-        price = getDiscountAmount({
-          tag: currentValue.type,
-          par_value: currentValue.discount.percent,
-          metadata: {
-            discount_card_type: currentValue === null || currentValue === void 0 || (_currentValue$discoun = currentValue.discount) === null || _currentValue$discoun === void 0 ? void 0 : _currentValue$discoun.discount_card_type
-          }
-        }, price, price);
-      }
+      // if (currentValue.type !== 'good_pass') {
+      price = getDiscountAmount({
+        tag: currentValue.type,
+        par_value: currentValue.discount.percent,
+        metadata: {
+          discount_card_type: currentValue === null || currentValue === void 0 || (_currentValue$discoun = currentValue.discount) === null || _currentValue$discoun === void 0 ? void 0 : _currentValue$discoun.discount_card_type
+        }
+      }, price, price);
+      // }
     });
   }
   if (bundle !== null && bundle !== void 0 && bundle.length) {
@@ -204,7 +204,7 @@ export var getProductTotalPrice = function getProductTotalPrice(params) {
       return accumulator + Number(currentValue.price) * Number(currentValue.num);
     }, price);
   }
-  return price;
+  return Math.max(0, price);
 };
 
 /**

package/dist/modules/Discount/index.js

@@ -268,7 +268,7 @@ export var DiscountModule = /*#__PURE__*/function (_BaseModule) {
       }
       if (discount.appliedProductDetails) {
         return discount.appliedProductDetails.reduce(function (total, product) {
-          var price = new Decimal((product === null || product === void 0 ? void 0 : product.amount) || 0).mul((product === null || product === void 0 ? void 0 : product.num) || 1);
+          var price = new Decimal((product === null || product === void 0 ? void 0 : product.amount) || 0);
           return new Decimal(total).plus(price).toNumber();
         }, 0);
       }

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

package/dist/modules/Rules/index.js

@@ -411,8 +411,11 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             return discount.id && ['good_pass', 'discount_card', 'product_discount_card'].includes(discount.tag || discount.type);
           })) : !(flatItem !== null && flatItem !== void 0 && flatItem.booking_id && flatItem !== null && flatItem !== void 0 && (_flatItem$bundleItem = flatItem.bundleItem) !== null && _flatItem$bundleItem !== void 0 && (_flatItem$bundleItem = _flatItem$bundleItem.metadata) !== null && _flatItem$bundleItem !== void 0 && _flatItem$bundleItem.custom_product_bundle_map_id);
 
+          // 套餐是否可用判断
+          var isBundleAvailable = _this3.checkPackageSubItemUsageRules(discount, flatItem);
+
           // 判断优惠券是否适用于该商品
-          if (isAvailableProduct && isLimitedProduct) {
+          if (isAvailableProduct && isLimitedProduct && isBundleAvailable) {
             var _discountApplicabilit, _discount$metadata;
             // 记录此优惠券适用的商品
             (_discountApplicabilit = discountApplicability.get(discount.id)) === null || _discountApplicabilit === void 0 || _discountApplicabilit.push(product.id);
@@ -421,7 +424,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             var applicableProducts = discountApplicableProducts.get(discount.id) || [];
             var discountType = discount.tag || discount.type;
             var productData = {
-              amount: product.price,
+              amount: product.price * (product.num || 1),
               type: discountType,
               tag: discountType,
               discount: {
@@ -649,7 +652,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             // 计算使用折扣卡/商品券以后，单个商品的总 total
             var targetProductTotal = getDiscountAmount(_selectedDiscount, product.price, product.price);
             var discountDetail = {
-              amount: new Decimal(product.price).minus(new Decimal(targetProductTotal)).toNumber(),
+              amount: new Decimal(product.price).minus(new Decimal(targetProductTotal)).toNumber() * (product.num || 1),
               type: _selectedDiscount.tag === 'product_discount_card' ? 'discount_card' : _selectedDiscount.tag,
               discount: {
                 discount_card_type: _selectedDiscount === null || _selectedDiscount === void 0 || (_selectedDiscount$met = _selectedDiscount.metadata) === null || _selectedDiscount$met === void 0 ? void 0 : _selectedDiscount$met.discount_card_type,
@@ -772,7 +775,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             // 🔥 使用当前的 _id 作为唯一标识
             var _uniqueId = flatItem._id;
             var _discountDetail2 = {
-              amount: new Decimal(_productOriginTotal).minus(_targetProductTotal).toNumber(),
+              amount: new Decimal(_productOriginTotal).minus(_targetProductTotal).toNumber() * (product.num || 1),
               type: _selectedDiscount3.tag === 'product_discount_card' ? 'discount_card' : _selectedDiscount3.tag,
               discount: {
                 discount_card_type: _selectedDiscount3 === null || _selectedDiscount3 === void 0 || (_selectedDiscount3$me = _selectedDiscount3.metadata) === null || _selectedDiscount3$me === void 0 ? void 0 : _selectedDiscount3$me.discount_card_type,
@@ -797,7 +800,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             appliedDiscountProducts.set(_selectedDiscount3.id, _appliedProducts2);
             processedItems.push(_objectSpread(_objectSpread({}, flatItem), {}, {
               total: _targetProductTotal,
-              price: new Decimal(_productOriginTotal || 0).minus(_discountDetail2.amount).toNumber(),
+              price: new Decimal(_productOriginTotal || 0).minus(_discountDetail2.discount.fixed_amount).toNumber(),
               discount_list: [_discountDetail2],
               processed: true
             }));

package/dist/plugins/request.d.ts

@@ -49,6 +49,7 @@ export interface RequestOptions {
     responseType?: 'json' | 'text' | 'arraybuffer' | 'blob';
     withCredentials?: boolean;
     useCache?: boolean;
+    customToast?: () => void;
 }
 /**
  * 响应接口

package/dist/solution/RegisterAndLogin/config.d.ts

@@ -0,0 +1,87 @@
+/**
+ * 注册登录解决方案配置
+ * 根据不同渠道配置不同的接口地址和参数
+ */
+/**
+ * API 配置接口
+ */
+export interface ApiConfig {
+    url: string;
+    method: 'GET' | 'POST' | 'PUT' | 'DELETE';
+    transformParams?: (params: any) => any;
+    transformResponse?: (response: any) => any;
+    options?: Record<string, any>;
+}
+/**
+ * 渠道配置接口
+ */
+export interface ChannelConfig {
+    sendEmailVerificationCode: ApiConfig;
+    sendEmailLoginCode: ApiConfig;
+    sendSmsRegisterCode: ApiConfig;
+    sendEmailRegisterLink: ApiConfig;
+    verifyEmailRegistrationLink: ApiConfig;
+    emailPasswordLogin: ApiConfig;
+    emailCodeRegister: ApiConfig;
+    phoneCodeRegister: ApiConfig;
+    resendEmailRegisterLink: ApiConfig;
+    checkEmailLinkCode: ApiConfig;
+    sendSmsLoginCode: ApiConfig;
+    phoneCodeLogin: ApiConfig;
+    guestLogin: ApiConfig;
+    checkEmailExists: ApiConfig;
+    checkEmailCode: ApiConfig;
+    checkMobileCode: ApiConfig;
+    phonePasswordLogin: ApiConfig;
+    sendPasswordResetEmail: ApiConfig;
+    sendPasswordResetSms: ApiConfig;
+    sendResetPasswordLink: ApiConfig;
+    checkResetPasswordCode: ApiConfig;
+    resetPasswordByCode: ApiConfig;
+    resetPasswordByEmail: ApiConfig;
+    resetPasswordByPhone: ApiConfig;
+    verifyCode: ApiConfig;
+    register: ApiConfig;
+    login: ApiConfig;
+    oauthLogin: ApiConfig;
+    validateToken: ApiConfig;
+    logout: ApiConfig;
+    getCountries: ApiConfig;
+    facebookLogin: ApiConfig;
+    appleLogin: ApiConfig;
+}
+/**
+ * 渠道配置映射
+ */
+export declare const channelConfigMap: Record<string, ChannelConfig>;
+/**
+ * 获取渠道配置
+ */
+export declare function getChannelConfig(channel: string): ChannelConfig;
+/**
+ * API 调用器类
+ * 负责根据配置执行 API 调用
+ */
+export declare class ApiCaller {
+    private request;
+    private config;
+    constructor(request: {
+        get: <T = any>(url: string, data?: any, options?: any) => Promise<T>;
+        post: <T = any>(url: string, data?: any, options?: any) => Promise<T>;
+        put: <T = any>(url: string, data?: any, options?: any) => Promise<T>;
+        delete: <T = any>(url: string, options?: any) => Promise<T>;
+    }, config: ChannelConfig);
+    /**
+     * 执行 API 调用
+     */
+    call<T = any>(apiName: keyof ChannelConfig, params?: any, additionalOptions?: any): Promise<T>;
+}
+/**
+ * 创建 API 调用器
+ */
+export declare function createApiCaller(request: {
+    get: <T = any>(url: string, data?: any, options?: any) => Promise<T>;
+    post: <T = any>(url: string, data?: any, options?: any) => Promise<T>;
+    put: <T = any>(url: string, data?: any, options?: any) => Promise<T>;
+    delete: <T = any>(url: string, options?: any) => Promise<T>;
+}, channel: string): ApiCaller;