@pisell/pisellos 2.1.113 → 2.1.114

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

@@ -15,6 +15,20 @@ import { isNormalProduct } from "../../Product/utils";
 import { getDiscountAmount } from "../../../solution/ShopDiscount/utils";
 import { calcDiscountListDifference } from "../../Summary/utils";
 
+/** 与 Rules / ShopDiscount 一致的折扣入参，用于主价与 option 单价 */
+var toDiscountPayload = function toDiscountPayload(discountItem) {
+  var _discountItem$discoun, _discountItem$discoun2;
+  return {
+    amount: discountItem.amount,
+    tag: discountItem.type,
+    par_value: (_discountItem$discoun = discountItem.discount) === null || _discountItem$discoun === void 0 ? void 0 : _discountItem$discoun.percent,
+    config: discountItem.config,
+    metadata: {
+      discount_card_type: discountItem === null || discountItem === void 0 || (_discountItem$discoun2 = discountItem.discount) === null || _discountItem$discoun2 === void 0 ? void 0 : _discountItem$discoun2.discount_card_type
+    }
+  };
+};
+
 /**
  * @title 处理组合商品
  * @description 组合商品需要直接修改 product 里的价格和 is_charge_tax
@@ -58,6 +72,7 @@ export var formatProductToCartItem = function formatProductToCartItem(params) {
     quantity = _params$quantity === void 0 ? 1 : _params$quantity,
     discounts = params.discounts;
   var num = quantity; // 当前按照单个商品加入购物车
+
   if (product) {
     cartItem.id = product === null || product === void 0 ? void 0 : product.id;
     cartItem.name = product === null || product === void 0 ? void 0 : product.title;
@@ -83,6 +98,15 @@ export var formatProductToCartItem = function formatProductToCartItem(params) {
       num: num,
       discounts: discounts
     });
+    // 不包含折扣卡商品券的总价
+    var origin_total = getProductTotalPrice({
+      product: cartItem._productInit || cartItem._productOrigin,
+      bundle: bundle,
+      options: options,
+      num: num,
+      discounts: []
+    });
+    cartItem.summaryOriginTotal = (origin_total || 0) * (num || 1);
     cartItem.image = product === null || product === void 0 ? void 0 : product.cover;
     cartItem.like_status = 'common';
     cartItem.duration = product === null || product === void 0 ? void 0 : product.duration;
@@ -185,6 +209,7 @@ export var formatProductToCartItemOrigin = function formatProductToCartItemOrigi
  * @returns 商品总价
  */
 export var getProductTotalPrice = function getProductTotalPrice(params) {
+  var _options$map;
   var product = params.product,
     bundle = params.bundle,
     options = params.options,
@@ -192,22 +217,29 @@ export var getProductTotalPrice = function getProductTotalPrice(params) {
   // const num = params.num || 1;
   var price = Number(product.price);
 
+  // option 行：unit 折后价在循环中与主商品使用同一套 getDiscountAmount（含 deductOptionPrice）
+  var optionRows = (_options$map = options === null || options === void 0 ? void 0 : options.map(function (currentValue) {
+    var _ref, _currentValue$price, _ref2, _currentValue$num;
+    return {
+      unit: Number((_ref = (_currentValue$price = currentValue.price) !== null && _currentValue$price !== void 0 ? _currentValue$price : currentValue.add_price) !== null && _ref !== void 0 ? _ref : 0),
+      num: Number((_ref2 = (_currentValue$num = currentValue.num) !== null && _currentValue$num !== void 0 ? _currentValue$num : currentValue.quantity) !== null && _ref2 !== void 0 ? _ref2 : 1)
+    };
+  })) !== null && _options$map !== void 0 ? _options$map : [];
+
   // 如果商品有折扣，则计算折扣
   if (discounts !== null && discounts !== void 0 && discounts.length) {
     discounts.forEach(function (currentValue) {
-      var _currentValue$discoun;
-      // 不是商品券则代表折扣卡，计算打折后的价格
-      // 一个商品折扣卡只能存在于一张
-      // if (currentValue.type !== 'good_pass') {
-      price = getDiscountAmount({
-        amount: currentValue.amount,
-        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
+      var _currentValue$config;
+      var payload = toDiscountPayload(currentValue);
+      price = getDiscountAmount(payload, price, price);
+      if (currentValue !== null && currentValue !== void 0 && (_currentValue$config = currentValue.config) !== null && _currentValue$config !== void 0 && _currentValue$config.deductOptionPrice && optionRows.length) {
+        for (var i = 0; i < optionRows.length; i++) {
+          var row = optionRows[i];
+          optionRows[i] = _objectSpread(_objectSpread({}, row), {}, {
+            unit: getDiscountAmount(payload, row.unit, row.unit)
+          });
         }
-      }, price, price);
-      // }
+      }
     });
   }
   if (bundle !== null && bundle !== void 0 && bundle.length) {
@@ -216,10 +248,10 @@ export var getProductTotalPrice = function getProductTotalPrice(params) {
     }, price);
   }
 
-  // 单规格
-  if (options !== null && options !== void 0 && options.length) {
-    price = options.reduce(function (accumulator, currentValue) {
-      return accumulator + Number(currentValue.price) * Number(currentValue.num);
+  // 单规格 / 加购 option
+  if (optionRows.length) {
+    price = optionRows.reduce(function (accumulator, row) {
+      return accumulator + row.unit * row.num;
     }, price);
   }
   return Math.max(0, price);
@@ -378,11 +410,11 @@ 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 total = new Decimal(0);
-    var _ref = (product === null || product === void 0 ? void 0 : product.custom_deposit_data) || {},
-      deposit_fixed = _ref.deposit_fixed,
-      deposit_percentage = _ref.deposit_percentage,
-      deposit_policy_data = _ref.deposit_policy_data,
-      self_deposit_policy_ids = _ref.self_deposit_policy_ids;
+    var _ref3 = (product === null || product === void 0 ? void 0 : product.custom_deposit_data) || {},
+      deposit_fixed = _ref3.deposit_fixed,
+      deposit_percentage = _ref3.deposit_percentage,
+      deposit_policy_data = _ref3.deposit_policy_data,
+      self_deposit_policy_ids = _ref3.self_deposit_policy_ids;
     // 所有协议数据
     var allProtocols = deposit_policy_data || [];
     // 是否存在定金，主商品has_deposit为1，但是自身没有定金设置，需要判定子商品是否存在定金，如果不存在最终判定也是不存在定金
@@ -476,9 +508,9 @@ export var handleProductDeposit = function handleProductDeposit(params) {
       depositTotal: new Decimal(0)
     };
   }
-  var _ref2 = depositData || {},
-    deposit_fixed = _ref2.deposit_fixed,
-    deposit_percentage = _ref2.deposit_percentage;
+  var _ref4 = depositData || {},
+    deposit_fixed = _ref4.deposit_fixed,
+    deposit_percentage = _ref4.deposit_percentage;
   if (typeof deposit_fixed === 'string' && typeof deposit_percentage === 'string') {
     var depositFixed = Decimal(deposit_fixed || 0);
     var depositPercent = Decimal(deposit_percentage || 0);

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

@@ -25,6 +25,8 @@ interface Limitedrelationproductdata {
     product_ids: number[];
     product_collection_id: number[];
     package_sub_item_usage_rules?: PackageSubItemUsageRules;
+    filter: 0 | 1;
+    exclude_product_ids: number[];
 }
 interface ApplicableProductDetails {
     amount: string;
@@ -81,6 +83,7 @@ export interface Discount {
     balance: string;
     format_title: Formattitle;
     metadata?: {
+        num?: number;
         discount_card_type?: 'fixed_amount' | 'percent';
         custom_product_bundle_map_id?: string;
         validity_type?: "custom_schedule_validity" | "fixed_validity";
@@ -105,6 +108,21 @@ export interface Discount {
     isSelected?: boolean;
     isAvailable?: boolean;
     isUsed?: boolean;
+    config?: {
+        isAvailable?: boolean;
+        /** 最大抵扣金额 */
+        maxDeductionAmount?: number;
+        /** 每单最多使用张数 */
+        maxUsagePerOrder?: number;
+        /** 是否抵扣税费与附加费 */
+        deductTaxAndFee?: boolean;
+        /** 适用粒度（多商品共用） */
+        allowCrossProduct?: boolean;
+        /** 可用商品数量上限 */
+        applicableProductLimit?: number;
+        /** 是否抵扣单规格价格 (Option Price) */
+        deductOptionPrice?: boolean;
+    };
     applicableProductIds?: number[];
     applicableProductDetails: ApplicableProductDetails[];
     appliedProductDetails: ApplicableProductDetails[];

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

@@ -1,5 +1,5 @@
 import { Module, PisellCore, ModuleOptions } from '../../types';
-import { RequestPlugin } from '../../plugins';
+import { RequestPlugin, WindowPlugin } from '../../plugins';
 import { BaseModule } from '../BaseModule';
 import { PaymentModuleAPI, PaymentMethod, PaymentOrder, PaymentItem, PaymentItemInput, PaymentUpdateFields, PushOrderParams, CashPayment, EftposPayment, WalletPassPayment, RoundingRule, RoundingInterval, RoundingResult } from './types';
 export * from './types';
@@ -21,6 +21,7 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
     request: RequestPlugin;
     private app;
     private store;
+    window: WindowPlugin;
     private dbManager;
     private logger;
     protected otherParams: any;

package/dist/modules/Payment/index.js

@@ -81,6 +81,8 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "app", void 0);
     // App instance
     _defineProperty(_assertThisInitialized(_this), "store", void 0);
+    _defineProperty(_assertThisInitialized(_this), "window", void 0);
+    // WindowPlugin 实例
     _defineProperty(_assertThisInitialized(_this), "dbManager", void 0);
     // IndexDBManager 实例
     _defineProperty(_assertThisInitialized(_this), "logger", void 0);
@@ -110,26 +112,27 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               // 获取依赖的插件
               this.request = core.getPlugin('request');
               appPlugin = core.getPlugin('app');
+              this.window = core.getPlugin('window');
               if (this.request) {
-                _context.next = 7;
+                _context.next = 8;
                 break;
               }
               throw new Error('支付模块需要 request 插件支持');
-            case 7:
+            case 8:
               if (appPlugin) {
-                _context.next = 9;
+                _context.next = 10;
                 break;
               }
               throw new Error('支付模块需要 app 插件支持');
-            case 9:
+            case 10:
               this.app = appPlugin.getApp();
               this.dbManager = this.app.dbManager;
               this.logger = this.app.logger;
 
               // 确保支付模块所需的对象存储已创建
-              _context.next = 14;
+              _context.next = 15;
               return this.ensurePaymentTables();
-            case 14:
+            case 15:
               this.registerNetworkHandlers();
 
               // // 预连接数据库
@@ -137,7 +140,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
 
               console.log('[PaymentModule] 初始化完成');
               this.logInfo('PaymentModule initialized successfully');
-            case 17:
+            case 18:
             case "end":
               return _context.stop();
           }

package/dist/modules/Payment/utils.js

@@ -1,5 +1,8 @@
 // 获取walletPass可用最大金额
 export var getAvailableMaxAmount = function getAvailableMaxAmount(data) {
+  if (typeof data._available_max_amount === 'number') {
+    return data._available_max_amount;
+  }
   return data.tag !== 'point_card' ? data.available_max_amount : data === null || data === void 0 ? void 0 : data.recommended_usage_amount;
 };
 

package/dist/modules/Payment/walletpass.d.ts

@@ -9,6 +9,7 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
     private userIdentificationCodes;
     private searchResults;
     private walletParams;
+    private walletInitData;
     constructor(paymentModule: PaymentModule);
     /**
      * 发送事件的辅助方法
@@ -37,7 +38,14 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
     initializeWalletDataFromBusinessAsync(businessData: WalletInitBusinessData): Promise<{
         walletRecommendList: WalletRecommendItem[];
         userIdentificationCodes: UserIdentificationCodeItem[];
+        transformList: any[];
+        noApplicableVoucher: any[];
+        products: any[];
     }>;
+    /**
+     * 获取订单基础详情
+     */
+    getOrderBasicDetailAsync(orderId: string): Promise<any>;
     /**
      * 初始化钱包数据
      * 先获取推荐列表，再获取用户识别码列表（顺序执行）
@@ -45,6 +53,9 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
     initializeWalletDataAsync(baseParams: WalletDeductionRecommendParams): Promise<{
         walletRecommendList: WalletRecommendItem[];
         userIdentificationCodes: UserIdentificationCodeItem[];
+        transformList: any[];
+        noApplicableVoucher: any[];
+        products: any[];
     }>;
     getWalletPassRecommendListAsync(params: WalletDeductionRecommendParams): Promise<WalletRecommendItem[]>;
     formatWalletPassList2PreparePayments(list: WalletRecommendItem[]): {
@@ -92,6 +103,18 @@ export declare class WalletPassPaymentImpl implements WalletPassPayment {
      * 清除搜索结果缓存
      */
     clearSearchResults(): void;
+    /**
+     * 获取存储的钱包初始化数据
+     */
+    getStoredWalletInitData(): {
+        transformList: any[];
+        noApplicableVoucher: any[];
+        products: any[];
+    } | null;
+    /**
+     * 清除存储的钱包初始化数据
+     */
+    clearStoredWalletInitData(): void;
     /**
      * 清除所有缓存数据
      */