@pisell/pisellos 2.1.46 → 2.1.47

package/lib/modules/Rules/types.d.ts

@@ -51,8 +51,10 @@ export interface RulesParamsHooks {
         origin_total?: number;
         price?: string | number;
         variant?: any[];
-        original_price?: number;
+        original_price?: number | string;
         quantity?: number;
+        bundle?: any[];
+        main_product_selling_price?: string | number;
     }) => Record<string, any>;
 }
 export {};

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

@@ -48,6 +48,7 @@ export declare class CheckoutImpl extends BaseModule implements Module, Checkout
      * 初始化结账流程
      */
     initializeCheckoutAsync(params: CheckoutInitParams): Promise<void>;
+    getHolderIdFromBooking(obj: any): number | undefined;
     getProductListByOrder(): {
         product_id: number;
         product_variant_id: string;

package/lib/solution/Checkout/index.js

@@ -196,6 +196,16 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       throw error;
     }
   }
+  getHolderIdFromBooking(obj) {
+    var _a;
+    if (!obj)
+      return void 0;
+    let ret = obj.holder_id || ((_a = obj.holder) == null ? void 0 : _a.form_record);
+    if (Array.isArray(ret)) {
+      return ret.length > 0 ? Number(ret[0]) : void 0;
+    }
+    return Number(ret) || void 0;
+  }
   getProductListByOrder() {
     var _a, _b, _c, _d, _e;
     if (!this.store.currentOrder) {
@@ -206,22 +216,54 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         return pre + (item.amount || 0);
       }, 0);
     };
-    const productList = ((_b = (_a = this.store.currentOrder.order_info) == null ? void 0 : _a.original_order_data.bookings) == null ? void 0 : _b.map(
-      (item) => ({
-        product_id: item.product.product_id,
-        product_variant_id: item.product.product_variant_id,
-        quantity: item.product.num,
-        selling_price: item.product.calculated_selling_price
-      })
-    )) || [];
-    const relationProducts = ((_e = (_d = (_c = this.store.currentOrder.order_info) == null ? void 0 : _c.original_order_data) == null ? void 0 : _d.relation_products) == null ? void 0 : _e.map(
-      (item) => ({
-        product_id: item.product_id,
-        product_variant_id: item.product_variant_id,
-        quantity: item.num,
-        selling_price: item.source_product_price
-      })
-    )) || [];
+    const formatProduct = (items) => {
+      return items.map(
+        (item) => ({
+          product_id: item.product_id,
+          product_variant_id: item.product_variant_id,
+          quantity: item.num,
+          // 商品是否含税：1；0
+          is_charge_tax: item.is_charge_tax ?? 0,
+          // 若商品不含税，计算得到的税费，单位（元）
+          tax_fee: item.tax_fee,
+          // 整个商品折扣后的总金额
+          selling_price: item.calculated_selling_price,
+          // 使用者id
+          holder_id: item.holder_id,
+          // 整个商品折扣前的总金额
+          original_price: item.calculated_original_price,
+          // 主商品折扣前金额，不包含套餐子商品
+          main_product_original_price: item.price,
+          // 主商品折扣后金额，不包含套餐子商品
+          main_product_selling_price: item.main_product_selling_price,
+          product_bundle: item.product_bundle.map((bundle) => {
+            return {
+              bundle_id: bundle.bundle_id,
+              bundle_product_id: bundle.bundle_product_id,
+              bundle_variant_id: bundle.bundle_variant_id,
+              price_type: bundle.price_type,
+              price_type_ext: bundle.price_type_ext,
+              // 套餐子商品总价，不包含折扣金额
+              bundle_sum_price: bundle.bundle_sum_price,
+              // 套餐子商品折扣后金额
+              bundle_selling_price: bundle.bundle_selling_price,
+              num: bundle.num
+            };
+          })
+        })
+      ) || [];
+    };
+    const productList = formatProduct(
+      ((_c = (_b = (_a = this.store.currentOrder.order_info) == null ? void 0 : _a.original_order_data) == null ? void 0 : _b.bookings) == null ? void 0 : _c.map(
+        (item) => {
+          return {
+            ...item.product,
+            holder_id: this.getHolderIdFromBooking(item)
+          };
+        }
+      )) || []
+    );
+    const relationProducts = formatProduct(((_e = (_d = this.store.currentOrder.order_info) == null ? void 0 : _d.original_order_data) == null ? void 0 : _e.relation_products) || []);
     return [...productList, ...relationProducts];
   }
   async initWalletData(params) {

package/lib/solution/ShopDiscount/index.js

@@ -365,7 +365,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
               editModeDiscountList[index] = {
                 ...editModeDiscountList[index],
                 amount: new import_decimal.default(discount.amount || 0).plus(new import_decimal.default(editModeDiscountList[index].amount || 0)).toNumber(),
-                savedAmount: new import_decimal.default(discount.amount || 0).times((product == null ? void 0 : product.num) || 1).plus(new import_decimal.default(editModeDiscountList[index].savedAmount || 0)).toNumber()
+                savedAmount: new import_decimal.default(discount.amount || 0).times((product == null ? void 0 : product.quantity) || (product == null ? void 0 : product.num) || 1).plus(new import_decimal.default(editModeDiscountList[index].savedAmount || 0)).toNumber()
               };
             } else {
               if (discount.type && !discount.tag) {
@@ -376,7 +376,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
                 name: discount.name || discount.discount.title.auto,
                 isEditMode: true,
                 limited_relation_product_data: {},
-                savedAmount: discount.amount * ((product == null ? void 0 : product.num) || 1),
+                savedAmount: discount.amount * ((product == null ? void 0 : product.quantity) || (product == null ? void 0 : product.num) || 1),
                 isAvailable: true,
                 id: ((_a3 = discount.discount) == null ? void 0 : _a3.resource_id) || discount.id,
                 format_title: ((_b = discount.discount) == null ? void 0 : _b.title) || discount.format_title,
@@ -396,15 +396,17 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
     const isProductFree = (id) => {
       var _a2;
       const targetProduct = productList.find((n) => n.id === id);
+      if (!targetProduct)
+        return false;
       const product = (_a2 = this.hooks) == null ? void 0 : _a2.getProduct(targetProduct);
       return Number(product == null ? void 0 : product.total) <= 0 && (Number(product == null ? void 0 : product.origin_total) <= 0 || !(product == null ? void 0 : product.origin_total)) || (0, import_lodash_es.isBoolean)(product == null ? void 0 : product.vouchersApplicable) && !(product == null ? void 0 : product.vouchersApplicable);
     };
-    const allUsedProductIds = newDiscountList.map((n) => {
+    const allUsedProductIds = newDiscountList.filter((item) => !(item == null ? void 0 : item.isEditMode)).map((n) => {
       var _a2;
-      return n.isSelected ? (_a2 = n.appliedProductDetails) == null ? void 0 : _a2.map((n2) => {
+      return n.isSelected ? ((_a2 = n.appliedProductDetails) == null ? void 0 : _a2.map((n2) => {
         var _a3;
         return (_a3 = n2.discount) == null ? void 0 : _a3.product_id;
-      }) : [];
+      })) || n.product_id : [];
     }).flat();
     newDiscountList.forEach((item) => {
       var _a2;

package/lib/solution/ShopDiscount/utils.d.ts

@@ -12,6 +12,13 @@ export declare const isAllNormalProduct: (items: any[]) => boolean;
  * @returns
  */
 export declare const getDiscountAmount: (discount: Discount, total: number, price: number) => number;
+export declare const getDiscountListAmountTotal: (discount: Discount[]) => any;
+/**
+ * 获取折扣金额 计算每个折扣的金额
+ * @param discount
+ * @returns
+ */
+export declare const getDiscountListAmount: (discount: Discount[]) => any;
 export interface ScheduleItem {
     id: number;
     name: string | {

package/lib/solution/ShopDiscount/utils.js

@@ -32,6 +32,8 @@ __export(utils_exports, {
   filterDiscountListByBookingTime: () => filterDiscountListByBookingTime,
   getDateIsInSchedule: () => getDateIsInSchedule,
   getDiscountAmount: () => getDiscountAmount,
+  getDiscountListAmount: () => getDiscountListAmount,
+  getDiscountListAmountTotal: () => getDiscountListAmountTotal,
   isAllNormalProduct: () => isAllNormalProduct,
   isNormalProductByDurationSchedule: () => isNormalProductByDurationSchedule,
   uniqueById: () => uniqueById
@@ -53,13 +55,23 @@ var isAllNormalProduct = (items) => {
 var getDiscountAmount = (discount, total, price) => {
   var _a;
   if (discount.tag === "good_pass") {
-    return new import_decimal.default(total).minus(new import_decimal.default(price || 0)).toNumber();
+    return new import_decimal.default(price).minus(new import_decimal.default(price || 0)).toNumber();
   }
   const isFixedAmount = ((_a = discount == null ? void 0 : discount.metadata) == null ? void 0 : _a.discount_card_type) === "fixed_amount";
   if (isFixedAmount) {
-    return Math.max(new import_decimal.default(total).minus(new import_decimal.default(discount.par_value || 0)).toNumber(), 0);
+    return Math.max(new import_decimal.default(price).minus(new import_decimal.default(discount.par_value || 0)).toNumber(), 0);
   }
-  return new import_decimal.default(100).minus(discount.par_value || 0).div(100).mul(new import_decimal.default(total)).toNumber();
+  return new import_decimal.default(100).minus(discount.par_value || 0).div(100).mul(new import_decimal.default(price)).toNumber();
+};
+var getDiscountListAmountTotal = (discount) => {
+  return discount.reduce((acc, cur) => {
+    return new import_decimal.default(acc).plus(new import_decimal.default(cur.num || 1).mul(new import_decimal.default(cur.amount || 0))).toNumber();
+  }, new import_decimal.default(0));
+};
+var getDiscountListAmount = (discount) => {
+  return discount.reduce((acc, cur) => {
+    return new import_decimal.default(acc).plus(new import_decimal.default(cur.amount || 0)).toNumber();
+  }, new import_decimal.default(0));
 };
 var getDateIsInSchedule = (dateTime, scheduleList) => {
   if (!dateTime || !scheduleList || scheduleList.length === 0) {
@@ -290,6 +302,8 @@ var filterDiscountListByBookingTime = (discountList, bookingTime) => {
   filterDiscountListByBookingTime,
   getDateIsInSchedule,
   getDiscountAmount,
+  getDiscountListAmount,
+  getDiscountListAmountTotal,
   isAllNormalProduct,
   isNormalProductByDurationSchedule,
   uniqueById

package/package.json

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