@pisell/pisellos 2.2.15 → 2.2.17

package/lib/solution/BookingByStep/utils/products.d.ts

@@ -9,3 +9,9 @@ export declare const getAvailableProductResources: (products: ProductData[]) =>
     rules: any[];
     resourcesMap: Record<number, ProductResourceItem>;
 };
+/**
+ * 判断商品是否是 session 商品
+ * @param product 商品数据
+ * @returns 是否是 session 商品
+ */
+export declare const isSessionProduct: (product: ProductData) => boolean;

package/lib/solution/BookingByStep/utils/products.js

@@ -19,7 +19,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/solution/BookingByStep/utils/products.ts
 var products_exports = {};
 __export(products_exports, {
-  getAvailableProductResources: () => getAvailableProductResources
+  getAvailableProductResources: () => getAvailableProductResources,
+  isSessionProduct: () => isSessionProduct
 });
 module.exports = __toCommonJS(products_exports);
 var getAvailableProductResources = (products) => {
@@ -57,7 +58,12 @@ var getAvailableProductResources = (products) => {
   });
   return { resourceIds: [...new Set(resourceIds)], rules, resourcesMap };
 };
+var isSessionProduct = (product) => {
+  var _a;
+  return (((_a = product == null ? void 0 : product["schedule.ids"]) == null ? void 0 : _a.length) ?? 0) > 0;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getAvailableProductResources
+  getAvailableProductResources,
+  isSessionProduct
 });

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

@@ -123,7 +123,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/lib/solution/Checkout/index.js

@@ -216,23 +216,70 @@ 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,
-        holder_id: this.getHolderIdFromBooking(item)
-      })
-    )) || [];
-    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,
+          metadata: {
+            // 主商品+非原价(加减价)子商品税费
+            "main_product_attached_bundle_tax_fee": item.metadata.main_product_attached_bundle_tax_fee,
+            // 主商品+非原价(加减价)子商品附加费
+            "main_product_attached_bundle_surcharge_fee": item.metadata.main_product_attached_bundle_surcharge_fee,
+            // 可选，附加费均摊舍入金额
+            "surcharge_rounding_remainder": item.metadata.surcharge_rounding_remainder
+          },
+          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,
+              is_charge_tax: bundle.is_charge_tax,
+              tax_fee: bundle.tax_fee,
+              metadata: {
+                // 子商品单数量附加费
+                "surcharge_fee": bundle.metadata.surcharge_fee,
+                // 可选，附加费均摊舍入金额
+                "surcharge_rounding_remainder": bundle.metadata.surcharge_rounding_remainder
+              }
+            };
+          })
+        })
+      ) || [];
+    };
+    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) {
@@ -257,6 +304,8 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         isDeposit: (_h = this.store.currentOrder) == null ? void 0 : _h.is_deposit
       },
       products: this.getProductListByOrder(),
+      is_price_include_tax: this.otherParams.is_price_include_tax,
+      // core 有
       ...params
     };
     if (this.store.isOrderSynced) {

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

@@ -24,6 +24,10 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     setHolders(holders: {
         form_record_id: number;
     }[]): void;
+    setBookingSubject(bookingSubject: {
+        type?: 'form' | 'customer';
+        [key: string]: any;
+    }): void;
     calcDiscount(productList: Record<string, any>[], options?: SetDiscountSelectedParams): {
         productList: Record<string, any>[];
         discountList: Discount[];

package/lib/solution/ShopDiscount/index.js

@@ -51,10 +51,11 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       productList: [],
       discount: null,
       rules: null,
+      holders: [],
       originalDiscountList: [],
       currentBookingTime: "",
       filteredDiscountList: [],
-      holders: []
+      bookingSubject: void 0
     };
   }
   // =========== 生命周期方法 ===========
@@ -196,8 +197,12 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   setHolders(holders) {
     this.store.holders = holders;
   }
+  setBookingSubject(bookingSubject) {
+    this.store.bookingSubject = bookingSubject;
+  }
   // 计算优惠券
   calcDiscount(productList, options) {
+    var _a;
     this.store.productList = productList;
     const rulesModule = this.core.getModule(`${this.name}_rules`);
     if (!rulesModule) {
@@ -207,7 +212,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       {
         productList,
         discountList: this.getDiscountList(),
-        holders: this.store.holders || []
+        holders: this.store.holders || [],
+        isFormSubject: ((_a = this.store.bookingSubject) == null ? void 0 : _a.type) === "form"
       },
       options
     ) || { productList, discountList: this.getDiscountList() };
@@ -254,7 +260,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   }
   // 扫码输入code
   async scanCode(code, customerId) {
-    var _a, _b;
+    var _a, _b, _c;
     try {
       const resultDiscountList = await ((_a = this.store.discount) == null ? void 0 : _a.batchSearch(code, customerId)) || [];
       const rulesModule = this.store.rules;
@@ -297,7 +303,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         productList: this.store.productList || [],
         oldDiscountList: this.getDiscountList(),
         newDiscountList: withScanList,
-        holders: this.store.holders || []
+        holders: this.store.holders || [],
+        isFormSubject: ((_b = this.store.bookingSubject) == null ? void 0 : _b.type) === "form"
       }) || {
         isAvailable: false,
         productList: this.store.productList || [],
@@ -307,7 +314,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         this.setDiscountList(newDiscountList || []);
         this.store.originalDiscountList = newDiscountList || [];
         this.setProductList(newProductList || []);
-        if (this.isWalkIn() && resultDiscountList.length && ((_b = this.options.otherParams) == null ? void 0 : _b.platform) === "shop") {
+        if (this.isWalkIn() && resultDiscountList.length && ((_c = this.options.otherParams) == null ? void 0 : _c.platform) === "shop") {
           await this.getCustomerWallet(
             resultDiscountList[0].customer_id
           );

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

@@ -23,14 +23,18 @@ export interface ShopDiscountState {
     discount: DiscountModule | null;
     rules: RulesModule | null;
     productList: Record<string, any>[];
-    originalDiscountList: Discount[];
     holders?: {
         form_record_id: number;
         form_id?: number;
         main_field?: string;
     }[];
+    originalDiscountList: Discount[];
     currentBookingTime: string | null;
     filteredDiscountList: Discount[];
+    bookingSubject?: {
+        type?: 'form' | 'customer';
+        [key: string]: any;
+    };
 }
 export interface SetDiscountSelectedParams {
     discountId: number;

package/package.json

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