@pisell/pisellos 2.2.13 → 2.2.15

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

@@ -671,7 +671,6 @@ export interface WalletInitBusinessData {
     order_wait_pay_amount?: number;
     /** 订单ID */
     payment_order_id?: string;
-    is_price_include_tax: number;
 }
 /**
  * 查询用户识别码列表请求参数

package/dist/modules/Payment/walletpass.js

@@ -64,14 +64,12 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
         amountInfo = businessData.amountInfo,
         products = businessData.products,
         order_wait_pay_amount = businessData.order_wait_pay_amount,
-        payment_order_id = businessData.payment_order_id,
-        is_price_include_tax = businessData.is_price_include_tax;
+        payment_order_id = businessData.payment_order_id;
 
       // 转换金额为数字类型
       var totalAmount = Number(amountInfo.totalAmount);
       var subTotal = Number(amountInfo.subTotal);
       var walletParams = {
-        is_price_include_tax: is_price_include_tax,
         sale_channel: 'pos',
         customer_id: customer_id || 0,
         // 提供默认值，确保类型为 number

package/dist/modules/ProductList/index.js

@@ -140,16 +140,17 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               productsData = _context3.sent;
               sortedList = (productsData.data.list || []).slice().sort(function (a, b) {
                 return Number(b.sort) - Number(a.sort);
-              }); // if (sortedList.length) {
-              //   sortedList.forEach((n: any) => {
-              //     if (n.is_eject !== 1 && n['schedule.ids'] && n['schedule.ids'].length) {
-              //       n.is_eject = 1
-              //     }
-              //   })
-              // }
+              });
+              if (sortedList.length) {
+                sortedList.forEach(function (n) {
+                  if (n.is_eject !== 1 && n['schedule.ids'] && n['schedule.ids'].length) {
+                    n.is_eject = 1;
+                  }
+                });
+              }
               this.addProduct(sortedList);
               return _context3.abrupt("return", sortedList);
-            case 10:
+            case 11:
             case "end":
               return _context3.stop();
           }

package/dist/modules/Rules/index.js

@@ -24,12 +24,10 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { BaseModule } from "../BaseModule";
-import { uniqueById, getDiscountAmount, filterDiscountListByBookingTime, getDiscountListAmountTotal, getDiscountListAmount } from "../../solution/ShopDiscount/utils";
+import { uniqueById, getDiscountAmount, getDiscountListAmountTotal, getDiscountListAmount, filterDiscountListByBookingTime } from "../../solution/ShopDiscount/utils";
 import { getProductOriginTotalPrice, getProductTotalPrice } from "../Cart/utils";
 import Decimal from 'decimal.js';
-import { isBoolean } from 'lodash-es';
 import dayjs from 'dayjs';
-
 // 临时变量
 var flatItem;
 export var RulesModule = /*#__PURE__*/function (_BaseModule) {
@@ -449,7 +447,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           var isBundleAvailable = _this3.checkPackageSubItemUsageRules(discount, flatItem);
 
           // 判断优惠券是否适用于该商品
-          if (isAvailableProduct && isLimitedProduct && timeLimit && isBundleAvailable) {
+          if (isAvailableProduct && isLimitedProduct && isBundleAvailable && timeLimit) {
             var _discountApplicabilit, _discount$metadata;
             // 记录此优惠券适用的商品
             (_discountApplicabilit = discountApplicability.get(discount.id)) === null || _discountApplicabilit === void 0 || _discountApplicabilit.push(product.id);
@@ -490,7 +488,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       // 然后再处理应用哪些优惠券，此时只考虑filteredDiscountList中的优惠券
       // 🔥 使用扁平化后的列表进行处理
       sortedFlattenedList.forEach(function (flatItem, index) {
-        var _product5, _product$discount_lis2, _product6;
+        var _product5, _product$discount_lis2, _product6, _product$discount_lis10;
         // 获取商品数据
         var product, originProduct;
         if (flatItem.type === 'main') {
@@ -539,7 +537,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           })) && (discount.tag || discount.type) === 'good_pass') return false;
 
           // 折扣卡商品价格为0时不可用
-          if ((Number(product.price) <= 0 || !product.price) && !((_product$discount_lis4 = product.discount_list) !== null && _product$discount_lis4 !== void 0 && _product$discount_lis4.find(function (n) {
+          if ((Number(product.price) === 0 || !product.price) && !((_product$discount_lis4 = product.discount_list) !== null && _product$discount_lis4 !== void 0 && _product$discount_lis4.find(function (n) {
             var _n$discount2;
             return ((_n$discount2 = n.discount) === null || _n$discount2 === void 0 ? void 0 : _n$discount2.resource_id) === discount.id;
           })) && (discount.tag || discount.type) !== 'good_pass') return false;
@@ -666,9 +664,18 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             }
           }
         }
+        if (options !== null && options !== void 0 && options.selectedList && (_product$discount_lis10 = product.discount_list) !== null && _product$discount_lis10 !== void 0 && _product$discount_lis10.some(function (item) {
+          var _options$selectedList4;
+          return options === null || options === void 0 || (_options$selectedList4 = options.selectedList) === null || _options$selectedList4 === void 0 ? void 0 : _options$selectedList4.some(function (n) {
+            var _item$discount7;
+            return n.discountId === ((_item$discount7 = item.discount) === null || _item$discount7 === void 0 ? void 0 : _item$discount7.resource_id);
+          });
+        })) {
+          isManualDiscount = false;
+        }
 
         // 如果没有适用的优惠券，或者手动折扣，则不适用优惠券
-        if (applicableDiscounts.length === 0 || isManualDiscount || isBoolean(product.vouchersApplicable) && !product.vouchersApplicable) {
+        if (applicableDiscounts.length === 0 || isManualDiscount) {
           if (flatItem.type === 'main') {
             // 主商品：保持原有逻辑
             if (product.isClient) {
@@ -694,10 +701,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 discount_list: []
               }))]);
             } else {
-              processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {
-                price: product.price,
-                main_product_selling_price: product.price
-              } : {
+              processedProductsMap.set(product._id, [_this3.hooks.setProduct(originProduct, _objectSpread(_objectSpread({}, isManualDiscount ? {} : {
                 _id: product._id.split('___')[0] + '___' + index,
                 total: product.origin_total || product.total,
                 price: product.price,
@@ -710,7 +714,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             // bundle子商品：保存到扁平化Map
             processedFlatItemsMap.set(flatItem._id, [_objectSpread(_objectSpread({}, flatItem), {}, {
               discount_list: [],
-              price: isManualDiscount ? flatItem.bundleItem.price : flatItem.bundleItem.original_price,
+              price: flatItem.bundleItem.original_price,
               processed: true
             })]);
           }
@@ -742,7 +746,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             }));
           }
           for (var i = 0; i < splitCount; i++) {
-            var _product$discount_lis10, _originProduct, _selectedDiscount$met;
+            var _product$discount_lis11, _originProduct, _selectedDiscount$met;
             // 如果用过折扣卡，也就不存在拆分的情况了，这里直接使用上面计算出来的折扣卡
             var _selectedDiscount = selectedDiscountCard || applicableDiscounts[i];
             // 标记优惠券为已使用
@@ -754,7 +758,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             // 优先从 origin_total拿，可能会拿不到（比如用户端预约在没有配置 original_price 的情况下）
             var productOriginTotal = product.origin_total || product.total || 0;
             // 如果当前 product 有 discount_list，则先从 origin_total 拿
-            if ((_product$discount_lis10 = product.discount_list) !== null && _product$discount_lis10 !== void 0 && _product$discount_lis10.length && product.origin_total) {
+            if ((_product$discount_lis11 = product.discount_list) !== null && _product$discount_lis11 !== void 0 && _product$discount_lis11.length && product.origin_total) {
               productOriginTotal = product.origin_total;
             }
             // 如果originProduct?._productInit?.original_price为 0，product.origin_total可能为空，此时取 product.total
@@ -1110,18 +1114,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 var allDiscountAmount = getDiscountListAmountTotal(mainDiscountList);
                 newTotalWithDiscount = (_Decimal$minus$toNumb = new Decimal(mainProductData.price || 0).minus(allDiscountAmount).toNumber()) !== null && _Decimal$minus$toNumb !== void 0 ? _Decimal$minus$toNumb : newTotalWithDiscount;
                 newOriginTotalWithDiscount = (_mainProductData$orig = mainProductData.origin_total) !== null && _mainProductData$orig !== void 0 ? _mainProductData$orig : newOriginTotalWithDiscount;
-              }
-
-              // 累加bundle的价格（只累加一次）
-              if (newBundleWithDiscount.length > 0) {
-                newBundleWithDiscount.forEach(function (item) {
-                  newTotalWithDiscount += Number(item.price) * Number(item.num);
-                });
-                newBundleWithDiscount.forEach(function (item) {
-                  var _item$discount_list2;
-                  var originalPrice = ((_item$discount_list2 = item.discount_list) === null || _item$discount_list2 === void 0 || (_item$discount_list2 = _item$discount_list2[0]) === null || _item$discount_list2 === void 0 || (_item$discount_list2 = _item$discount_list2.discount) === null || _item$discount_list2 === void 0 ? void 0 : _item$discount_list2.original_amount) || item.price;
-                  newOriginTotalWithDiscount += Number(originalPrice) * Number(item.num);
-                });
+                if (newBundleWithDiscount.length > 0) {
+                  newBundleWithDiscount.forEach(function (item) {
+                    var _item$discount_list2;
+                    newTotalWithDiscount += Number(item.price) * Number(item.num);
+                    var originalPrice = ((_item$discount_list2 = item.discount_list) === null || _item$discount_list2 === void 0 || (_item$discount_list2 = _item$discount_list2[0]) === null || _item$discount_list2 === void 0 || (_item$discount_list2 = _item$discount_list2.discount) === null || _item$discount_list2 === void 0 ? void 0 : _item$discount_list2.original_amount) || item.price;
+                    newOriginTotalWithDiscount += Number(originalPrice) * Number(item.num);
+                  });
+                }
               }
 
               // 累加options的价格（options不参与折扣，在最终设置total时处理）
@@ -1184,14 +1184,12 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                   var _allDiscountAmount = getDiscountListAmount(mainDiscountListOriginal);
                   newTotalOriginal = (_Decimal$minus$toNumb2 = new Decimal(mainProductData.price || 0).minus(_allDiscountAmount).toNumber()) !== null && _Decimal$minus$toNumb2 !== void 0 ? _Decimal$minus$toNumb2 : newTotalOriginal;
                   newOriginTotalOriginal = (_mainProductData$orig2 = mainProductData.origin_total) !== null && _mainProductData$orig2 !== void 0 ? _mainProductData$orig2 : newOriginTotalOriginal;
-                }
-
-                // 累加bundle的价格（只累加一次）
-                if (newBundleOriginal.length > 0) {
-                  newBundleOriginal.forEach(function (item) {
-                    newTotalOriginal += Number(item.price) * Number(item.num);
-                    newOriginTotalOriginal += Number(item.price) * Number(item.num);
-                  });
+                  if (newBundleOriginal.length > 0) {
+                    newBundleOriginal.forEach(function (item) {
+                      newTotalOriginal += Number(item.price) * Number(item.num);
+                      newOriginTotalOriginal += Number(item.price) * Number(item.num);
+                    });
+                  }
                 }
 
                 // 累加options的价格（options不参与折扣，在最终设置total时处理）
@@ -1285,13 +1283,9 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
                   // 累加bundle的价格（只累加一次）
                   if (newBundle.length > 0) {
-                    newBundle.forEach(function (item) {
-                      newTotal += Number(item.price) * Number(item.num);
-                    });
-
-                    // 计算原始总价（不考虑折扣）
                     newBundle.forEach(function (item) {
                       var _item$discount_list3;
+                      newTotal += Number(item.price) * Number(item.num);
                       var originalPrice = ((_item$discount_list3 = item.discount_list) === null || _item$discount_list3 === void 0 || (_item$discount_list3 = _item$discount_list3[0]) === null || _item$discount_list3 === void 0 || (_item$discount_list3 = _item$discount_list3.discount) === null || _item$discount_list3 === void 0 ? void 0 : _item$discount_list3.original_amount) || item.price;
                       newOriginTotal += Number(originalPrice) * Number(item.num);
                     });
@@ -1470,34 +1464,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // 套餐中购买时，判断是否为原价
           var _priceType = (_flatItem$bundleItem7 = flatItem.bundleItem) === null || _flatItem$bundleItem7 === void 0 ? void 0 : _flatItem$bundleItem7.price_type;
           var _priceTypeExt = (_flatItem$bundleItem8 = flatItem.bundleItem) === null || _flatItem$bundleItem8 === void 0 ? void 0 : _flatItem$bundleItem8.price_type_ext;
-
-          // original_price 对应：
-          // 1. price_type: "markup" && price_type_ext: "product_price"
-          // markup_price 对应：
-          // price_type: "markup" && price_type_ext: ""
-          /** 原价 */
-          var _isOriginalPrice = _priceType === 'markup' && _priceTypeExt === 'product_price';
-          /** 加价 */
-          var _isMarkupPrice = _priceType === 'markup' && (_priceTypeExt === '' || !_priceTypeExt);
-
-          // 检查 rules
-          if (rules.length > 0) {
-            // 检查原价
-            if (_isOriginalPrice && rules.includes('original_price')) {
-              return true;
-            }
-
-            // 检查加价
-            if (_isMarkupPrice && rules.includes('markup_price')) {
-              return true;
-            }
-
-            // 如果都不匹配，则不可用
-            return false;
-          }
-
           // 原价包括：price_type: "markup" && price_type_ext: "product_price"
-          return _isOriginalPrice;
+          return _priceType === 'markup' && _priceTypeExt === 'product_price';
         }
         return false;
       }

package/dist/solution/BookingByStep/index.js

@@ -31,7 +31,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { BaseModule } from "../../modules/BaseModule";
 import { createModule } from "./types";
 import { formatProductToCartItem, createCartItemOrigin, getUniqueId, handleVariantProduct, formatDateToCartItem, formatAccountToCartItem } from "../../modules/Cart/utils";
-import { getAvailableProductResources, isSessionProduct } from "./utils/products";
+import { getAvailableProductResources } from "./utils/products";
 import { getResourcesByProduct, getTimeSlicesByResource, getTimeSlicesByResources, getIsUsableByTimeItem, getOthersSelectedResources, getOthersCartSelectedResources, filterScheduleByDateRange, checkSessionProductLeadTime, sortCombinedResources, filterResourcesByFormItem, checkTwoResourcesIntersection, isConflict } from "./utils/resources";
 import dayjs from 'dayjs';
 import isSameOrBefore from 'dayjs/plugin/isSameOrBefore';
@@ -238,29 +238,19 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadProducts",
     value: (function () {
       var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref) {
-        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, schedule_date, res;
+        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, schedule_date;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _ref$category_ids = _ref.category_ids, category_ids = _ref$category_ids === void 0 ? [] : _ref$category_ids, _ref$product_ids = _ref.product_ids, product_ids = _ref$product_ids === void 0 ? [] : _ref$product_ids, _ref$collection = _ref.collection, collection = _ref$collection === void 0 ? [] : _ref$collection, schedule_date = _ref.schedule_date;
-              _context2.next = 3;
-              return this.store.products.loadProducts({
+              return _context2.abrupt("return", this.store.products.loadProducts({
                 category_ids: category_ids,
                 product_ids: product_ids,
                 collection: collection,
                 schedule_date: schedule_date,
                 cacheId: this.cacheId
-              });
-            case 3:
-              res = _context2.sent;
-              // 预拉取当天的资源数据
-              this.getAvailableDate({
-                startDate: schedule_date || dayjs().format('YYYY-MM-DD'),
-                endDate: schedule_date || dayjs().format('YYYY-MM-DD'),
-                products: _toConsumableArray(res)
-              });
-              return _context2.abrupt("return", res);
-            case 6:
+              }));
+            case 2:
             case "end":
               return _context2.stop();
           }
@@ -292,7 +282,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _loadProductByScheduleDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref2) {
         var _schedule$product_ids;
-        var date, _ref2$product_ids, product_ids, _ref2$category_ids, category_ids, scheduleList, newProductIds, schedule, otherProductsIds, allProductIds, res;
+        var date, _ref2$product_ids, product_ids, _ref2$category_ids, category_ids, scheduleList, newProductIds, schedule, otherProductsIds, allProductIds;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -339,9 +329,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 schedule_date: date
               });
             case 10:
-              res = _context3.sent;
-              return _context3.abrupt("return", res);
-            case 12:
+              return _context3.abrupt("return", _context3.sent);
+            case 11:
             case "end":
               return _context3.stop();
           }
@@ -1161,16 +1150,6 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var productData = _objectSpread(_objectSpread({}, origin), {}, {
         product_variant_id: product_variant_id
       });
-      debugger;
-      // 保护，如果进来的是 session 商品，则必须要有 date 和时间片，否则不允许添加
-      if (isSessionProduct(productData)) {
-        if (!date || !date.startTime || !date.endTime) {
-          return {
-            success: false,
-            errorCode: 'date_or_time_required'
-          };
-        }
-      }
 
       // 库存检测
       var currentCartItems = this.store.cart.getItems();

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

@@ -9,9 +9,3 @@ 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/dist/solution/BookingByStep/utils/products.js

@@ -47,14 +47,4 @@ export var getAvailableProductResources = function getAvailableProductResources(
     rules: rules,
     resourcesMap: resourcesMap
   };
-};
-
-/**
- * 判断商品是否是 session 商品
- * @param product 商品数据
- * @returns 是否是 session 商品
- */
-export var isSessionProduct = function isSessionProduct(product) {
-  var _product$scheduleIds, _product$scheduleIds2;
-  return ((_product$scheduleIds = product === null || product === void 0 || (_product$scheduleIds2 = product['schedule.ids']) === null || _product$scheduleIds2 === void 0 ? void 0 : _product$scheduleIds2.length) !== null && _product$scheduleIds !== void 0 ? _product$scheduleIds : 0) > 0;
 };

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

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

package/dist/solution/Checkout/index.js

@@ -396,66 +396,23 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
           return pre + (item.amount || 0);
         }, 0);
       };
-      var formatProduct = function formatProduct(items) {
-        return items.map(function (item) {
-          var _item$is_charge_tax;
-          return {
-            product_id: item.product_id,
-            product_variant_id: item.product_variant_id,
-            quantity: item.num,
-            // 商品是否含税：1；0
-            is_charge_tax: (_item$is_charge_tax = item.is_charge_tax) !== null && _item$is_charge_tax !== void 0 ? _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(function (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
-                }
-              };
-            })
-          };
-        }) || [];
-      };
-      var productList = formatProduct(((_this$store$currentOr = this.store.currentOrder.order_info) === null || _this$store$currentOr === void 0 || (_this$store$currentOr = _this$store$currentOr.original_order_data) === null || _this$store$currentOr === void 0 || (_this$store$currentOr = _this$store$currentOr.bookings) === null || _this$store$currentOr === void 0 ? void 0 : _this$store$currentOr.map(function (item) {
-        return _objectSpread(_objectSpread({}, item.product), {}, {
+      var productList = ((_this$store$currentOr = this.store.currentOrder.order_info) === null || _this$store$currentOr === void 0 || (_this$store$currentOr = _this$store$currentOr.original_order_data.bookings) === null || _this$store$currentOr === void 0 ? void 0 : _this$store$currentOr.map(function (item) {
+        return {
+          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: _this3.getHolderIdFromBooking(item)
-        });
-      })) || []);
-      var relationProducts = formatProduct(((_this$store$currentOr2 = this.store.currentOrder.order_info) === null || _this$store$currentOr2 === void 0 || (_this$store$currentOr2 = _this$store$currentOr2.original_order_data) === null || _this$store$currentOr2 === void 0 ? void 0 : _this$store$currentOr2.relation_products) || []);
+        };
+      })) || [];
+      var relationProducts = ((_this$store$currentOr2 = this.store.currentOrder.order_info) === null || _this$store$currentOr2 === void 0 || (_this$store$currentOr2 = _this$store$currentOr2.original_order_data) === null || _this$store$currentOr2 === void 0 || (_this$store$currentOr2 = _this$store$currentOr2.relation_products) === null || _this$store$currentOr2 === void 0 ? void 0 : _this$store$currentOr2.map(function (item) {
+        return {
+          product_id: item.product_id,
+          product_variant_id: item.product_variant_id,
+          quantity: item.num,
+          selling_price: item.source_product_price
+        };
+      })) || [];
       return [].concat(_toConsumableArray(productList), _toConsumableArray(relationProducts));
     }
   }, {
@@ -490,8 +447,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   depositAmount: (_this$store$currentOr5 = this.store.currentOrder) === null || _this$store$currentOr5 === void 0 ? void 0 : _this$store$currentOr5.deposit_amount,
                   isDeposit: (_this$store$currentOr6 = this.store.currentOrder) === null || _this$store$currentOr6 === void 0 ? void 0 : _this$store$currentOr6.is_deposit
                 },
-                products: this.getProductListByOrder(),
-                is_price_include_tax: this.otherParams.is_price_include_tax
+                products: this.getProductListByOrder()
               }, params); // 判断订单是否已经同步，如果是则追加payment_order_id参数
               if (this.store.isOrderSynced) {
                 walletBusinessData.payment_order_id = (_this$store$currentOr7 = this.store.currentOrder) === null || _this$store$currentOr7 === void 0 ? void 0 : _this$store$currentOr7.order_id;
@@ -1487,7 +1443,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "addPaymentItemAsync",
     value: (function () {
       var _addPaymentItemAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(paymentItem) {
-        var orderPaymentType, processedPaymentItem, metadata, paymentItemWithType, remainingAmount, _paymentItem$type, _paymentItem$code, isEftposPayment, _isCashPayment, isCustomePayment, syncResult;
+        var orderPaymentType, processedPaymentItem, metadata, paymentItemWithType, remainingAmount, _paymentItem$type, _paymentItem$code, isEftposPayment, isCash, isCustomePayment, syncResult;
         return _regeneratorRuntime().wrap(function _callee16$(_context16) {
           while (1) switch (_context16.prev = _context16.next) {
             case 0:
@@ -1537,7 +1493,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               this.logInfo('订单金额还有待付的，同步 EFTPOS 支付');
               // 检查是否是 EFTPOS 支付，如果是则立即同步订单
               isEftposPayment = ((_paymentItem$type = paymentItem.type) === null || _paymentItem$type === void 0 ? void 0 : _paymentItem$type.toLowerCase()) === 'eftpos' || ((_paymentItem$code = paymentItem.code) === null || _paymentItem$code === void 0 ? void 0 : _paymentItem$code.toUpperCase().includes('EFTPOS'));
-              _isCashPayment = paymentItem.code === 'CASHMANUAL';
+              isCash = isCashPayment(paymentItem);
               isCustomePayment = paymentItem.type === 'custom';
               this.logInfo('EFTPOS 支付检查:', {
                 paymentCode: paymentItem.code,
@@ -1545,7 +1501,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 isEftposPayment: isEftposPayment,
                 currentOrderSynced: this.store.isOrderSynced
               });
-              if (!(isEftposPayment || _isCashPayment || isCustomePayment)) {
+              if (!(isEftposPayment || isCash || isCustomePayment)) {
                 _context16.next = 39;
                 break;
               }
@@ -2658,7 +2614,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
           while (1) switch (_context28.prev = _context28.next) {
             case 0:
               // 检查是否是现金支付
-              cashPayment = isCashPayment(paymentItem.code, paymentItem.type);
+              cashPayment = isCashPayment(paymentItem);
               if (cashPayment) {
                 _context28.next = 3;
                 break;

package/dist/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/dist/solution/Checkout/utils/index.js

@@ -499,13 +499,15 @@ export function shouldSyncOrderForPayment(paymentCode, paymentType) {
  * @param paymentType 支付方式类型
  * @returns 是否为现金支付
  */
-export function isCashPayment(paymentCode, paymentType) {
-  var codeUpper = (paymentCode === null || paymentCode === void 0 ? void 0 : paymentCode.toUpperCase()) || '';
-  var typeUpper = (paymentType === null || paymentType === void 0 ? void 0 : paymentType.toUpperCase()) || '';
+export function isCashPayment(paymentItem) {
+  var _paymentItem$code, _paymentItem$type, _paymentItem$name;
+  var codeUpper = ((_paymentItem$code = paymentItem.code) === null || _paymentItem$code === void 0 ? void 0 : _paymentItem$code.toUpperCase()) || '';
+  var typeUpper = ((_paymentItem$type = paymentItem.type) === null || _paymentItem$type === void 0 ? void 0 : _paymentItem$type.toUpperCase()) || '';
+  var isNameCash = (_paymentItem$name = paymentItem.name) === null || _paymentItem$name === void 0 ? void 0 : _paymentItem$name.toLowerCase().includes('cash');
 
   // 现金支付识别规则
   var cashIdentifiers = ['CASH', 'CASHMANUAL', 'MANUAL'];
   return cashIdentifiers.some(function (identifier) {
     return codeUpper.includes(identifier) || typeUpper.includes(identifier);
-  });
+  }) || isNameCash;
 }

package/lib/modules/Customer/index.js

@@ -102,7 +102,7 @@ var CustomerModule = class extends import_BaseModule.BaseModule {
       skip,
       num,
       sort_by: import_constants.SORT_BY,
-      with: ["latestWalletDetail.wallet", "contactsInfo"],
+      with: ["latestWalletDetail.wallet"],
       search_wallet_flag: 1,
       search_wallet_pass_flag: 1,
       ...search && { search },

package/lib/modules/Order/index.js

@@ -193,31 +193,33 @@ var OrderModule = class extends import_BaseModule.BaseModule {
    * @returns 后端返回的订单数据（包含订单ID等）
    */
   async createOrderByCheckout(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r;
+    const onlineStorePaymentCodeList = ["WXPAY", "WECHAT", "ALIPAY", "APPLE_PAY", "CREDIT_CARD_3DS", "CREDIT_CARD_TOKEN", "GOOGLE_PAY", "GOOGLE_PAY_3DS", "CREDIT_CARD"];
+    params.payments = (_a = params.payments) == null ? void 0 : _a.filter((p) => !onlineStorePaymentCodeList.includes(p.code));
     this.logInfo("createOrderByCheckout called", {
       type: params.type,
       platform: params.platform,
       is_deposit: params.is_deposit,
       customer_id: params.customer_id,
-      bookingsCount: ((_a = params.bookings) == null ? void 0 : _a.length) || 0,
-      relationProductsCount: ((_b = params.relation_products) == null ? void 0 : _b.length) || 0,
-      paymentsCount: ((_c = params.payments) == null ? void 0 : _c.length) || 0,
+      bookingsCount: ((_b = params.bookings) == null ? void 0 : _b.length) || 0,
+      relationProductsCount: ((_c = params.relation_products) == null ? void 0 : _c.length) || 0,
+      paymentsCount: ((_d = params.payments) == null ? void 0 : _d.length) || 0,
       depositAmount: params.deposit_amount,
       productTaxFee: params.product_tax_fee,
       note: params.note,
       scheduleDate: params.schedule_date,
       hasOrderId: !!params.order_id,
       orderIdIncluded: params.order_id,
-      paymentMethods: ((_d = params.payments) == null ? void 0 : _d.map((p) => p.code)) || []
+      paymentMethods: ((_e = params.payments) == null ? void 0 : _e.map((p) => p.code)) || []
     });
     console.log("[Order] createOrderByCheckout 开始创建订单:", {
       type: params.type,
       platform: params.platform,
       is_deposit: params.is_deposit,
       customer_id: params.customer_id,
-      bookingsCount: ((_e = params.bookings) == null ? void 0 : _e.length) || 0,
-      relationProductsCount: ((_f = params.relation_products) == null ? void 0 : _f.length) || 0,
-      paymentsCount: ((_g = params.payments) == null ? void 0 : _g.length) || 0
+      bookingsCount: ((_f = params.bookings) == null ? void 0 : _f.length) || 0,
+      relationProductsCount: ((_g = params.relation_products) == null ? void 0 : _g.length) || 0,
+      paymentsCount: ((_h = params.payments) == null ? void 0 : _h.length) || 0
     });
     try {
       const orderData = {
@@ -234,7 +236,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         ...params
         // 使用传入的参数覆盖默认值
       };
-      if ((_h = orderData.payments) == null ? void 0 : _h.length) {
+      if ((_i = orderData.payments) == null ? void 0 : _i.length) {
         orderData.small_ticket_data_flag = 1;
       }
       if (!params.order_id && !orderData.schedule_date) {
@@ -246,10 +248,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         platform: orderData.platform,
         isDeposit: orderData.is_deposit,
         customerId: orderData.customer_id,
-        bookingsCount: ((_i = orderData.bookings) == null ? void 0 : _i.length) || 0,
-        relationProductsCount: ((_j = orderData.relation_products) == null ? void 0 : _j.length) || 0,
-        paymentsCount: ((_k = orderData.payments) == null ? void 0 : _k.length) || 0,
-        paymentsMethods: ((_l = orderData.payments) == null ? void 0 : _l.map((p) => p.code)) || []
+        bookingsCount: ((_j = orderData.bookings) == null ? void 0 : _j.length) || 0,
+        relationProductsCount: ((_k = orderData.relation_products) == null ? void 0 : _k.length) || 0,
+        paymentsCount: ((_l = orderData.payments) == null ? void 0 : _l.length) || 0,
+        paymentsMethods: ((_m = orderData.payments) == null ? void 0 : _m.map((p) => p.code)) || []
       });
       this.logInfo("Calling backend checkout API", {
         url: "/order/checkout",
@@ -258,10 +260,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         isDeposit: orderData.is_deposit,
         customerId: orderData.customer_id,
         depositAmount: orderData.deposit_amount,
-        bookingsCount: ((_m = orderData.bookings) == null ? void 0 : _m.length) || 0,
-        relationProductsCount: ((_n = orderData.relation_products) == null ? void 0 : _n.length) || 0,
-        paymentsCount: ((_o = orderData.payments) == null ? void 0 : _o.length) || 0,
-        paymentMethods: ((_p = orderData.payments) == null ? void 0 : _p.map((p) => ({
+        bookingsCount: ((_n = orderData.bookings) == null ? void 0 : _n.length) || 0,
+        relationProductsCount: ((_o = orderData.relation_products) == null ? void 0 : _o.length) || 0,
+        paymentsCount: ((_p = orderData.payments) == null ? void 0 : _p.length) || 0,
+        paymentMethods: ((_q = orderData.payments) == null ? void 0 : _q.map((p) => ({
           code: p.code,
           amount: p.amount,
           type: p.type,
@@ -280,7 +282,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       });
       console.log("[Order] 订单创建成功，后端响应:", {
         success: !!response,
-        hasOrderId: !!(((_q = response == null ? void 0 : response.data) == null ? void 0 : _q.order_id) || (response == null ? void 0 : response.order_id))
+        hasOrderId: !!(((_r = response == null ? void 0 : response.data) == null ? void 0 : _r.order_id) || (response == null ? void 0 : response.order_id))
       });
       return response;
     } catch (error) {