@pisell/pisellos 2.2.13 → 2.2.14

package/lib/solution/Checkout/index.js

@@ -216,70 +216,23 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
         return pre + (item.amount || 0);
       }, 0);
     };
-    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) || []);
+    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
+      })
+    )) || [];
     return [...productList, ...relationProducts];
   }
   async initWalletData(params) {
@@ -304,8 +257,6 @@ 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) {
@@ -1030,7 +981,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       if (Number(remainingAmount) > 0) {
         this.logInfo("订单金额还有待付的，同步 EFTPOS 支付");
         const isEftposPayment = ((_a = paymentItem.type) == null ? void 0 : _a.toLowerCase()) === "eftpos" || ((_b = paymentItem.code) == null ? void 0 : _b.toUpperCase().includes("EFTPOS"));
-        const isCashPayment2 = paymentItem.code === "CASHMANUAL";
+        const isCash = (0, import_utils.isCashPayment)(paymentItem);
         const isCustomePayment = paymentItem.type === "custom";
         this.logInfo("EFTPOS 支付检查:", {
           paymentCode: paymentItem.code,
@@ -1038,7 +989,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
           isEftposPayment,
           currentOrderSynced: this.store.isOrderSynced
         });
-        if (isEftposPayment || isCashPayment2 || isCustomePayment) {
+        if (isEftposPayment || isCash || isCustomePayment) {
           this.logInfo("检测到 EFTPOS 支付，立即同步订单到后端...");
           try {
             const syncResult = await this.syncOrderToBackendWithReturn(true);
@@ -1767,7 +1718,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
    * @returns 处理后的支付项（包含找零信息）
    */
   async processCashPaymentItem(paymentItem) {
-    const cashPayment = (0, import_utils.isCashPayment)(paymentItem.code, paymentItem.type);
+    const cashPayment = (0, import_utils.isCashPayment)(paymentItem);
     if (!cashPayment) {
       return paymentItem;
     }

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

@@ -1,5 +1,6 @@
 import { CheckoutInitParams, CheckoutError, CheckoutErrorType, LocalOrderData, CartSummaryItem, ExtractedAmountInfo } from '../types';
 import { CartItem } from '../../../modules/Cart/types';
+import { PaymentItemInput } from '../../../modules/Payment/types';
 /**
  * 验证结账数据
  */
@@ -118,4 +119,4 @@ export declare function shouldSyncOrderForPayment(paymentCode: string, paymentTy
  * @param paymentType 支付方式类型
  * @returns 是否为现金支付
  */
-export declare function isCashPayment(paymentCode?: string, paymentType?: string): boolean;
+export declare function isCashPayment(paymentItem: PaymentItemInput): boolean;

package/lib/solution/Checkout/utils/index.js

@@ -326,13 +326,15 @@ function shouldSyncOrderForPayment(paymentCode, paymentType) {
   }
   return true;
 }
-function isCashPayment(paymentCode, paymentType) {
-  const codeUpper = (paymentCode == null ? void 0 : paymentCode.toUpperCase()) || "";
-  const typeUpper = (paymentType == null ? void 0 : paymentType.toUpperCase()) || "";
+function isCashPayment(paymentItem) {
+  var _a, _b, _c;
+  const codeUpper = ((_a = paymentItem.code) == null ? void 0 : _a.toUpperCase()) || "";
+  const typeUpper = ((_b = paymentItem.type) == null ? void 0 : _b.toUpperCase()) || "";
+  const isNameCash = (_c = paymentItem.name) == null ? void 0 : _c.toLowerCase().includes("cash");
   const cashIdentifiers = ["CASH", "CASHMANUAL", "MANUAL"];
   return cashIdentifiers.some(
     (identifier) => codeUpper.includes(identifier) || typeUpper.includes(identifier)
-  );
+  ) || isNameCash;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/package.json

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