@pisell/pisellos 2.2.10 → 2.2.12

package/dist/modules/Customer/index.js

@@ -154,7 +154,7 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
                 skip: skip,
                 num: num,
                 sort_by: SORT_BY,
-                with: ['latestWalletDetail.wallet', 'contactsInfo'],
+                with: ['latestWalletDetail.wallet'],
                 search_wallet_flag: 1,
                 search_wallet_pass_flag: 1
               }, search && {

package/dist/modules/Payment/index.js

@@ -21,7 +21,7 @@ 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 { PaymentStatus, PaymentMethodType, RoundingRule } from "./types";
+import { PaymentStatus, PaymentHooks, PaymentMethodType, RoundingRule } from "./types";
 import { getUniqueId } from "../Cart/utils";
 import { CashPaymentImpl } from "./cash";
 import { EftposPaymentImpl } from "./eftpos";
@@ -1200,7 +1200,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               this.logInfo('更新订单支付项完成', {
                 orderUuid: orderUuid
               });
-              this.core.effects.emit("".concat(this.name, ":onPaymentAdded"), {
+              this.core.effects.emit(PaymentHooks.OnPaymentAdded, {
                 orderUuid: orderUuid,
                 payment: newPaymentItem
               });

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/Product/index.d.ts

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

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/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;
@@ -751,7 +707,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "updateLocalOrderAsync",
     value: (function () {
       var _updateLocalOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(params) {
-        var _params$orderData6, _params$orderData7, _params$cartSummary2, _params$totalInfo5, _params$totalInfo6, _params$totalInfo7, _params$totalInfo8;
+        var _params$orderData6, _params$orderData7, _params$cartSummary2, _params$totalInfo5, _params$totalInfo6, _params$totalInfo7, _params$totalInfo8, _this$store$currentOr9, _this$store$currentOr10;
         var validation, amountInfo, customerInfo, allOrders, existingOrder, _updated$payment2, _existingOrder$paymen, _updated$payment, currentTime, formattedExistPayments, _isNeedDeposit, _updated, syncedPayments, _syncedAmount, _totalAmount, _remainingExpectAmount, _depositDiffAmount, totalAmount, activePayments, paidAmount, remaining, _isNeedDeposit2, updated, syncedAmount, remainingExpectAmount, depositDiffAmount, isNeedDeposit, created, _syncedPayments, _syncedAmount2;
         return _regeneratorRuntime().wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
@@ -1003,7 +959,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               this.store.currentOrder = created;
 
               // 🔧 新增: 如果有云端支付项，需要计算正确的待付金额
-              if (params.existPayment && params.existPayment.length > 0) {
+              if (params.existPayment && params.existPayment.length > 0 || (_this$store$currentOr9 = this.store.currentOrder) !== null && _this$store$currentOr9 !== void 0 && _this$store$currentOr9.order_id && !isVirtualOrderId((_this$store$currentOr10 = this.store.currentOrder) === null || _this$store$currentOr10 === void 0 ? void 0 : _this$store$currentOr10.order_id)) {
                 // 标记订单已同步（因为订单和支付项都来自云端）
                 this.store.isOrderSynced = true;
 
@@ -1117,8 +1073,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getOrderOriginalData",
     value: function getOrderOriginalData() {
-      var _this$store$currentOr9;
-      return (_this$store$currentOr9 = this.store.currentOrder) === null || _this$store$currentOr9 === void 0 ? void 0 : _this$store$currentOr9.order_info;
+      var _this$store$currentOr11;
+      return (_this$store$currentOr11 = this.store.currentOrder) === null || _this$store$currentOr11 === void 0 ? void 0 : _this$store$currentOr11.order_info;
     }
 
     /**
@@ -1967,7 +1923,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "setDepositAmountAsync",
     value: (function () {
       var _setDepositAmountAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20(depositAmount) {
-        var _this$store$currentOr10, _this$store$currentOr11;
+        var _this$store$currentOr12, _this$store$currentOr13;
         var depositValue, formattedDepositAmount, oldDepositAmount, updateParams;
         return _regeneratorRuntime().wrap(function _callee20$(_context20) {
           while (1) switch (_context20.prev = _context20.next) {
@@ -1975,8 +1931,8 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               this.logInfo('setDepositAmountAsync called', {
                 depositAmount: depositAmount,
                 hasCurrentOrder: !!this.store.currentOrder,
-                currentOrderId: (_this$store$currentOr10 = this.store.currentOrder) === null || _this$store$currentOr10 === void 0 ? void 0 : _this$store$currentOr10.order_id,
-                currentTotalAmount: (_this$store$currentOr11 = this.store.currentOrder) === null || _this$store$currentOr11 === void 0 ? void 0 : _this$store$currentOr11.total_amount
+                currentOrderId: (_this$store$currentOr12 = this.store.currentOrder) === null || _this$store$currentOr12 === void 0 ? void 0 : _this$store$currentOr12.order_id,
+                currentTotalAmount: (_this$store$currentOr13 = this.store.currentOrder) === null || _this$store$currentOr13 === void 0 ? void 0 : _this$store$currentOr13.total_amount
               });
               _context20.prev = 1;
               // 验证定金金额格式
@@ -2096,17 +2052,17 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "manualSyncOrderAsync",
     value: (function () {
       var _manualSyncOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21() {
-        var _this$store$currentOr12, _this$store$currentOr13, _this$store$currentOr14;
-        var _this$store$currentOr15, orderUuid, oldOrderId, syncResult, finalOrderId, finalIsVirtual, newRes, _this$store$currentOr16, errorMessage;
+        var _this$store$currentOr14, _this$store$currentOr15, _this$store$currentOr16;
+        var _this$store$currentOr17, orderUuid, oldOrderId, syncResult, finalOrderId, finalIsVirtual, newRes, _this$store$currentOr18, errorMessage;
         return _regeneratorRuntime().wrap(function _callee21$(_context21) {
           while (1) switch (_context21.prev = _context21.next) {
             case 0:
               console.log('manualSyncOrderAsync called');
               this.logInfo('manualSyncOrderAsync called', {
                 hasCurrentOrder: !!this.store.currentOrder,
-                currentOrderId: (_this$store$currentOr12 = this.store.currentOrder) === null || _this$store$currentOr12 === void 0 ? void 0 : _this$store$currentOr12.order_id,
-                orderUuid: (_this$store$currentOr13 = this.store.currentOrder) === null || _this$store$currentOr13 === void 0 ? void 0 : _this$store$currentOr13.uuid,
-                totalAmount: (_this$store$currentOr14 = this.store.currentOrder) === null || _this$store$currentOr14 === void 0 ? void 0 : _this$store$currentOr14.total_amount,
+                currentOrderId: (_this$store$currentOr14 = this.store.currentOrder) === null || _this$store$currentOr14 === void 0 ? void 0 : _this$store$currentOr14.order_id,
+                orderUuid: (_this$store$currentOr15 = this.store.currentOrder) === null || _this$store$currentOr15 === void 0 ? void 0 : _this$store$currentOr15.uuid,
+                totalAmount: (_this$store$currentOr16 = this.store.currentOrder) === null || _this$store$currentOr16 === void 0 ? void 0 : _this$store$currentOr16.total_amount,
                 isOrderSynced: this.store.isOrderSynced,
                 isVirtualOrderId: this.store.currentOrder ? isVirtualOrderId(this.store.currentOrder.order_id) : false
               });
@@ -2166,7 +2122,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 this.logError('[Checkout] 严重警告：返回的订单ID与存储的订单ID不一致！');
               }
               newRes = _objectSpread(_objectSpread({}, syncResult), {}, {
-                is_deposit: ((_this$store$currentOr15 = this.store.currentOrder) === null || _this$store$currentOr15 === void 0 ? void 0 : _this$store$currentOr15.is_deposit) || 0
+                is_deposit: ((_this$store$currentOr17 = this.store.currentOrder) === null || _this$store$currentOr17 === void 0 ? void 0 : _this$store$currentOr17.is_deposit) || 0
               });
               _context21.next = 30;
               return this.updateStateAmountToRemaining(false);
@@ -2180,7 +2136,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               return _context21.abrupt("return", {
                 success: false,
                 message: "\u8BA2\u5355\u540C\u6B65\u5931\u8D25: ".concat(errorMessage),
-                orderUuid: (_this$store$currentOr16 = this.store.currentOrder) === null || _this$store$currentOr16 === void 0 ? void 0 : _this$store$currentOr16.uuid
+                orderUuid: (_this$store$currentOr18 = this.store.currentOrder) === null || _this$store$currentOr18 === void 0 ? void 0 : _this$store$currentOr18.uuid
               });
             case 38:
             case "end":
@@ -2257,15 +2213,15 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "cancelCurrentOrderAsync",
     value: (function () {
       var _cancelCurrentOrderAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(cancelReason) {
-        var _this$store$currentOr17, _this$store$currentOr18, currentOrderUuid, currentOrderId, isOrderSynced, errorMessage;
+        var _this$store$currentOr19, _this$store$currentOr20, currentOrderUuid, currentOrderId, isOrderSynced, errorMessage;
         return _regeneratorRuntime().wrap(function _callee22$(_context22) {
           while (1) switch (_context22.prev = _context22.next) {
             case 0:
               _context22.prev = 0;
               this.logInfo('开始取消当前本地订单:', {
                 hasCurrentOrder: !!this.store.currentOrder,
-                orderUuid: (_this$store$currentOr17 = this.store.currentOrder) === null || _this$store$currentOr17 === void 0 ? void 0 : _this$store$currentOr17.uuid,
-                orderId: (_this$store$currentOr18 = this.store.currentOrder) === null || _this$store$currentOr18 === void 0 ? void 0 : _this$store$currentOr18.order_id,
+                orderUuid: (_this$store$currentOr19 = this.store.currentOrder) === null || _this$store$currentOr19 === void 0 ? void 0 : _this$store$currentOr19.uuid,
+                orderId: (_this$store$currentOr20 = this.store.currentOrder) === null || _this$store$currentOr20 === void 0 ? void 0 : _this$store$currentOr20.order_id,
                 isOrderSynced: this.store.isOrderSynced,
                 cancelReason: cancelReason
               });
@@ -2376,7 +2332,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "saveForLaterPaymentAsync",
     value: (function () {
       var _saveForLaterPaymentAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23() {
-        var orderUuid, currentOrderId, allPaymentItems, syncResult, _this$store$currentOr19, errorMessage;
+        var orderUuid, currentOrderId, allPaymentItems, syncResult, _this$store$currentOr21, errorMessage;
         return _regeneratorRuntime().wrap(function _callee23$(_context23) {
           while (1) switch (_context23.prev = _context23.next) {
             case 0:
@@ -2430,7 +2386,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               return _context23.abrupt("return", {
                 success: false,
                 message: "\u8BA2\u5355\u4FDD\u5B58\u5931\u8D25: ".concat(errorMessage),
-                orderUuid: (_this$store$currentOr19 = this.store.currentOrder) === null || _this$store$currentOr19 === void 0 ? void 0 : _this$store$currentOr19.uuid
+                orderUuid: (_this$store$currentOr21 = this.store.currentOrder) === null || _this$store$currentOr21 === void 0 ? void 0 : _this$store$currentOr21.uuid
               });
             case 21:
             case "end":
@@ -2453,7 +2409,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "updateOrderNoteAsync",
     value: (function () {
       var _updateOrderNoteAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(note) {
-        var _this$store$currentOr20, _this$store$currentOr21, oldNote, orderInPayment;
+        var _this$store$currentOr22, _this$store$currentOr23, oldNote, orderInPayment;
         return _regeneratorRuntime().wrap(function _callee24$(_context24) {
           while (1) switch (_context24.prev = _context24.next) {
             case 0:
@@ -2465,7 +2421,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               throw createCheckoutError(CheckoutErrorType.ValidationFailed, '没有本地订单数据，无法更新备注');
             case 3:
               console.log('[Checkout] 更新订单备注:', {
-                orderUuid: (_this$store$currentOr20 = this.store.currentOrder) === null || _this$store$currentOr20 === void 0 ? void 0 : _this$store$currentOr20.uuid,
+                orderUuid: (_this$store$currentOr22 = this.store.currentOrder) === null || _this$store$currentOr22 === void 0 ? void 0 : _this$store$currentOr22.uuid,
                 oldNote: this.store.localOrderData.shop_note,
                 newNote: note
               });
@@ -2498,7 +2454,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
             case 17:
               _context24.next = 19;
               return this.core.effects.emit("".concat(this.name, ":onOrderNoteChanged"), {
-                orderUuid: (_this$store$currentOr21 = this.store.currentOrder) === null || _this$store$currentOr21 === void 0 ? void 0 : _this$store$currentOr21.uuid,
+                orderUuid: (_this$store$currentOr23 = this.store.currentOrder) === null || _this$store$currentOr23 === void 0 ? void 0 : _this$store$currentOr23.uuid,
                 oldNote: oldNote,
                 newNote: note,
                 timestamp: Date.now()
@@ -2570,7 +2526,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "handlePaymentSuccess",
     value: (function () {
       var _handlePaymentSuccess = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(data) {
-        var _this$store$currentOr22;
+        var _this$store$currentOr24;
         return _regeneratorRuntime().wrap(function _callee26$(_context26) {
           while (1) switch (_context26.prev = _context26.next) {
             case 0:
@@ -2581,7 +2537,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               return this.core.effects.emit("".concat(this.name, ":onPaymentSuccess"), {
                 orderUuid: data.orderUuid,
                 paymentMethodCode: '',
-                amount: ((_this$store$currentOr22 = this.store.currentOrder) === null || _this$store$currentOr22 === void 0 ? void 0 : _this$store$currentOr22.total_amount) || '0',
+                amount: ((_this$store$currentOr24 = this.store.currentOrder) === null || _this$store$currentOr24 === void 0 ? void 0 : _this$store$currentOr24.total_amount) || '0',
                 timestamp: data.timestamp
               });
             case 4:
@@ -2606,7 +2562,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     key: "handlePaymentError",
     value: (function () {
       var _handlePaymentError = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(data) {
-        var _this$store$currentOr23;
+        var _this$store$currentOr25;
         var error;
         return _regeneratorRuntime().wrap(function _callee27$(_context27) {
           while (1) switch (_context27.prev = _context27.next) {
@@ -2619,7 +2575,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
               return this.core.effects.emit("".concat(this.name, ":onPaymentFailed"), {
                 orderUuid: data.orderUuid,
                 paymentMethodCode: '',
-                amount: ((_this$store$currentOr23 = this.store.currentOrder) === null || _this$store$currentOr23 === void 0 ? void 0 : _this$store$currentOr23.total_amount) || '0',
+                amount: ((_this$store$currentOr25 = this.store.currentOrder) === null || _this$store$currentOr25 === void 0 ? void 0 : _this$store$currentOr25.total_amount) || '0',
                 timestamp: data.timestamp
               });
             case 5:
@@ -3742,10 +3698,10 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
     value: (function () {
       var _syncOrderToBackendWithReturn = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee39() {
         var _this6 = this,
-          _this$store$currentOr24,
-          _this$store$currentOr25,
-          _this$store$currentCu2,
           _this$store$currentOr26,
+          _this$store$currentOr27,
+          _this$store$currentCu2,
+          _this$store$currentOr28,
           _this$store$localOrde,
           _this$store$localOrde2,
           _checkoutResponse3,
@@ -3827,7 +3783,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                   })
                 });
               }); // 确定最终的定金金额：优先使用手动设置的值，否则从支付项中计算
-              manualDepositAmount = ((_this$store$currentOr24 = this.store.currentOrder) === null || _this$store$currentOr24 === void 0 ? void 0 : _this$store$currentOr24.deposit_amount) || '0.00'; // 优先级逻辑：手动设置的定金金额 > 从支付项计算的金额
+              manualDepositAmount = ((_this$store$currentOr26 = this.store.currentOrder) === null || _this$store$currentOr26 === void 0 ? void 0 : _this$store$currentOr26.deposit_amount) || '0.00'; // 优先级逻辑：手动设置的定金金额 > 从支付项计算的金额
               manualDepositValue = new Decimal(manualDepositAmount);
               if (manualDepositValue.gt(0)) {
                 // 如果手动设置了定金金额且大于0，使用手动设置的值
@@ -3887,7 +3843,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 }),
                 manualDepositAmount: manualDepositAmount,
                 finalDepositAmount: finalDepositAmount,
-                isDeposit: ((_this$store$currentOr25 = this.store.currentOrder) === null || _this$store$currentOr25 === void 0 ? void 0 : _this$store$currentOr25.is_deposit) || 0
+                isDeposit: ((_this$store$currentOr27 = this.store.currentOrder) === null || _this$store$currentOr27 === void 0 ? void 0 : _this$store$currentOr27.is_deposit) || 0
               });
 
               // 构造订单参数，直接使用 localOrderData 中已处理好的数据
@@ -3909,7 +3865,7 @@ export var CheckoutImpl = /*#__PURE__*/function (_BaseModule) {
                 currency_code: this.otherParams.currency_code,
                 currency_symbol: this.otherParams.currency_symbol,
                 currency_format: this.otherParams.currency_format,
-                is_deposit: ((_this$store$currentOr26 = this.store.currentOrder) !== null && _this$store$currentOr26 !== void 0 && _this$store$currentOr26.is_deposit || Number(finalDepositAmount) > 0 ? 1 : 0) || 0,
+                is_deposit: ((_this$store$currentOr28 = this.store.currentOrder) !== null && _this$store$currentOr28 !== void 0 && _this$store$currentOr28.is_deposit || Number(finalDepositAmount) > 0 ? 1 : 0) || 0,
                 deposit_amount: finalDepositAmount,
                 // 使用最终确定的定金金额（手动设置优先）
                 product_tax_fee: this.store.localOrderData.tax_fee,

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/Payment/index.js

@@ -623,7 +623,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       this.logInfo("更新订单支付项完成", {
         orderUuid
       });
-      this.core.effects.emit(`${this.name}:onPaymentAdded`, {
+      this.core.effects.emit(import_types.PaymentHooks.OnPaymentAdded, {
         orderUuid,
         payment: newPaymentItem
       });

package/lib/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/lib/modules/Payment/walletpass.js

@@ -51,19 +51,10 @@ var WalletPassPaymentImpl = class {
    */
   generateWalletParams(businessData) {
     var _a, _b;
-    const {
-      customer_id,
-      holder,
-      amountInfo,
-      products,
-      order_wait_pay_amount,
-      payment_order_id,
-      is_price_include_tax
-    } = businessData;
+    const { customer_id, holder, amountInfo, products, order_wait_pay_amount, payment_order_id } = businessData;
     const totalAmount = Number(amountInfo.totalAmount);
     const subTotal = Number(amountInfo.subTotal);
     const walletParams = {
-      is_price_include_tax,
       sale_channel: "pos",
       customer_id: customer_id || 0,
       // 提供默认值，确保类型为 number

package/lib/modules/Product/index.d.ts

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

package/lib/modules/ProductList/index.js

@@ -103,6 +103,13 @@ var ProductList = class extends import_BaseModule.BaseModule {
       { osServer: true }
     );
     const sortedList = (productsData.data.list || []).slice().sort((a, b) => Number(b.sort) - Number(a.sort));
+    if (sortedList.length) {
+      sortedList.forEach((n) => {
+        if (n.is_eject !== 1 && n["schedule.ids"] && n["schedule.ids"].length) {
+          n.is_eject = 1;
+        }
+      });
+    }
     this.addProduct(sortedList);
     return sortedList;
   }

package/lib/modules/Rules/index.js

@@ -36,7 +36,6 @@ var import_BaseModule = require("../BaseModule");
 var import_utils = require("../../solution/ShopDiscount/utils");
 var import_utils2 = require("../Cart/utils");
 var import_decimal = __toESM(require("decimal.js"));
-var import_lodash_es = require("lodash-es");
 var import_dayjs = __toESM(require("dayjs"));
 var RulesModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
@@ -297,7 +296,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         const isLimitedProduct = (limitedData.type === "product_all" || limitedData.product_ids && limitedData.product_ids.includes(product.id)) && isHolderMatch;
         const isAvailableProduct = flatItem.type === "main" ? !((product == null ? void 0 : product.booking_id) && ((_c = product == null ? void 0 : product.discount_list) == null ? void 0 : _c.length) && ((_d = product == null ? void 0 : product.discount_list) == null ? void 0 : _d.every((discount2) => discount2.id && ["good_pass", "discount_card", "product_discount_card"].includes(discount2.tag || discount2.type)))) : !((flatItem == null ? void 0 : flatItem.booking_id) && ((_f = (_e = flatItem == null ? void 0 : flatItem.bundleItem) == null ? void 0 : _e.metadata) == null ? void 0 : _f.custom_product_bundle_map_id));
         const isBundleAvailable = this.checkPackageSubItemUsageRules(discount, flatItem);
-        if (isAvailableProduct && isLimitedProduct && timeLimit && isBundleAvailable) {
+        if (isAvailableProduct && isLimitedProduct && isBundleAvailable && timeLimit) {
           (_g = discountApplicability.get(discount.id)) == null ? void 0 : _g.push(product.id);
           const applicableProducts = discountApplicableProducts.get(discount.id) || [];
           const discountType = discount.tag || discount.type;
@@ -327,7 +326,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     });
     const processedFlatItemsMap = /* @__PURE__ */ new Map();
     sortedFlattenedList.forEach((flatItem, index) => {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
       let product, originProduct;
       if (flatItem.type === "main") {
         product = flatItem.product;
@@ -365,7 +364,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           return ((_a3 = n.discount) == null ? void 0 : _a3.resource_id) === discount.id;
         })) && (discount.tag || discount.type) === "good_pass")
           return false;
-        if ((Number(product.price) <= 0 || !product.price) && !((_b2 = product.discount_list) == null ? void 0 : _b2.find((n) => {
+        if ((Number(product.price) === 0 || !product.price) && !((_b2 = product.discount_list) == null ? void 0 : _b2.find((n) => {
           var _a3;
           return ((_a3 = n.discount) == null ? void 0 : _a3.resource_id) === discount.id;
         })) && (discount.tag || discount.type) !== "good_pass")
@@ -465,7 +464,16 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           }
         }
       }
-      if (applicableDiscounts.length === 0 || isManualDiscount || (0, import_lodash_es.isBoolean)(product.vouchersApplicable) && !product.vouchersApplicable) {
+      if ((options == null ? void 0 : options.selectedList) && ((_t = product.discount_list) == null ? void 0 : _t.some((item) => {
+        var _a2;
+        return (_a2 = options == null ? void 0 : options.selectedList) == null ? void 0 : _a2.some((n) => {
+          var _a3;
+          return n.discountId === ((_a3 = item.discount) == null ? void 0 : _a3.resource_id);
+        });
+      }))) {
+        isManualDiscount = false;
+      }
+      if (applicableDiscounts.length === 0 || isManualDiscount) {
         if (flatItem.type === "main") {
           if (product.isClient) {
             processedProductsMap.set(
@@ -497,10 +505,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             processedProductsMap.set(
               product._id,
               [this.hooks.setProduct(originProduct, {
-                ...isManualDiscount ? {
-                  price: product.price,
-                  main_product_selling_price: product.price
-                } : {
+                ...isManualDiscount ? {} : {
                   _id: product._id.split("___")[0] + "___" + index,
                   total: product.origin_total || product.total,
                   price: product.price,
@@ -514,7 +519,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           processedFlatItemsMap.set(flatItem._id, [{
             ...flatItem,
             discount_list: [],
-            price: isManualDiscount ? flatItem.bundleItem.price : flatItem.bundleItem.original_price,
+            price: flatItem.bundleItem.original_price,
             processed: true
           }]);
         }
@@ -541,10 +546,10 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           usedDiscounts.set(selectedDiscount2.id, true);
           const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
           let productOriginTotal = product.origin_total || product.total || 0;
-          if (((_t = product.discount_list) == null ? void 0 : _t.length) && product.origin_total) {
+          if (((_u = product.discount_list) == null ? void 0 : _u.length) && product.origin_total) {
             productOriginTotal = product.origin_total;
           }
-          if (Number(((_u = originProduct == null ? void 0 : originProduct._productInit) == null ? void 0 : _u.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
+          if (Number(((_v = originProduct == null ? void 0 : originProduct._productInit) == null ? void 0 : _v.original_price) || 0) > 0 && product.origin_total && product.total && product.origin_total !== product.total) {
             productOriginTotal = product.total;
           }
           const targetProductTotal = (0, import_utils.getDiscountAmount)(selectedDiscount2, product.price, product.price);
@@ -555,7 +560,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             amount,
             type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : discountType,
             discount: {
-              discount_card_type: (_v = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _v.discount_card_type,
+              discount_card_type: (_w = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _w.discount_card_type,
               fixed_amount: amount,
               resource_id: selectedDiscount2.id,
               title: selectedDiscount2.format_title,
@@ -677,7 +682,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
             amount: new import_decimal.default(productOriginTotal).minus(targetProductTotal).toNumber() * (product.num || 1),
             type: selectedDiscount2.tag === "product_discount_card" ? "discount_card" : selectedDiscount2.tag,
             discount: {
-              discount_card_type: (_w = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _w.discount_card_type,
+              discount_card_type: (_x = selectedDiscount2 == null ? void 0 : selectedDiscount2.metadata) == null ? void 0 : _x.discount_card_type,
               fixed_amount: new import_decimal.default(productOriginTotal).minus(targetProductTotal).toNumber(),
               resource_id: selectedDiscount2.id,
               title: selectedDiscount2.format_title,
@@ -690,7 +695,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               custom_product_bundle_map_id: uniqueId,
               num: product.num || 1
             },
-            _num: (product.num || 1) * (((_x = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _x.num) || 1)
+            _num: (product.num || 1) * (((_y = flatItem == null ? void 0 : flatItem.parentProduct) == null ? void 0 : _y.num) || 1)
           };
           const appliedProducts = appliedDiscountProducts.get(selectedDiscount2.id) || [];
           appliedProducts.push(discountDetail);
@@ -854,16 +859,14 @@ var RulesModule = class extends import_BaseModule.BaseModule {
               const allDiscountAmount = (0, import_utils.getDiscountListAmountTotal)(mainDiscountList);
               newTotalWithDiscount = new import_decimal.default(mainProductData.price || 0).minus(allDiscountAmount).toNumber() ?? newTotalWithDiscount;
               newOriginTotalWithDiscount = mainProductData.origin_total ?? newOriginTotalWithDiscount;
-            }
-            if (newBundleWithDiscount.length > 0) {
-              newBundleWithDiscount.forEach((item) => {
-                newTotalWithDiscount += Number(item.price) * Number(item.num);
-              });
-              newBundleWithDiscount.forEach((item) => {
-                var _a, _b, _c;
-                const originalPrice = ((_c = (_b = (_a = item.discount_list) == null ? void 0 : _a[0]) == null ? void 0 : _b.discount) == null ? void 0 : _c.original_amount) || item.price;
-                newOriginTotalWithDiscount += Number(originalPrice) * Number(item.num);
-              });
+              if (newBundleWithDiscount.length > 0) {
+                newBundleWithDiscount.forEach((item) => {
+                  var _a, _b, _c;
+                  newTotalWithDiscount += Number(item.price) * Number(item.num);
+                  const originalPrice = ((_c = (_b = (_a = item.discount_list) == null ? void 0 : _a[0]) == null ? void 0 : _b.discount) == null ? void 0 : _c.original_amount) || item.price;
+                  newOriginTotalWithDiscount += Number(originalPrice) * Number(item.num);
+                });
+              }
             }
             if (product == null ? void 0 : product.options) {
               newTotalWithDiscount = product.options.reduce((accumulator, currentValue) => {
@@ -915,12 +918,12 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                 const allDiscountAmount = (0, import_utils.getDiscountListAmount)(mainDiscountListOriginal);
                 newTotalOriginal = new import_decimal.default(mainProductData.price || 0).minus(allDiscountAmount).toNumber() ?? newTotalOriginal;
                 newOriginTotalOriginal = mainProductData.origin_total ?? newOriginTotalOriginal;
-              }
-              if (newBundleOriginal.length > 0) {
-                newBundleOriginal.forEach((item) => {
-                  newTotalOriginal += Number(item.price) * Number(item.num);
-                  newOriginTotalOriginal += Number(item.price) * Number(item.num);
-                });
+                if (newBundleOriginal.length > 0) {
+                  newBundleOriginal.forEach((item) => {
+                    newTotalOriginal += Number(item.price) * Number(item.num);
+                    newOriginTotalOriginal += Number(item.price) * Number(item.num);
+                  });
+                }
               }
               if (product == null ? void 0 : product.options) {
                 newTotalOriginal = product.options.reduce((accumulator, currentValue) => {
@@ -994,11 +997,9 @@ var RulesModule = class extends import_BaseModule.BaseModule {
                   newOriginTotal = mainProductData.origin_total ?? newOriginTotal;
                 }
                 if (newBundle.length > 0) {
-                  newBundle.forEach((item) => {
-                    newTotal += Number(item.price) * Number(item.num);
-                  });
                   newBundle.forEach((item) => {
                     var _a2, _b2, _c2;
+                    newTotal += Number(item.price) * Number(item.num);
                     const originalPrice = ((_c2 = (_b2 = (_a2 = item.discount_list) == null ? void 0 : _a2[0]) == null ? void 0 : _b2.discount) == null ? void 0 : _c2.original_amount) || item.price;
                     newOriginTotal += Number(originalPrice) * Number(item.num);
                   });
@@ -1139,18 +1140,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
       if (isBundleItem) {
         const priceType = (_c = flatItem.bundleItem) == null ? void 0 : _c.price_type;
         const priceTypeExt = (_d = flatItem.bundleItem) == null ? void 0 : _d.price_type_ext;
-        const isOriginalPrice = priceType === "markup" && priceTypeExt === "product_price";
-        const isMarkupPrice = priceType === "markup" && (priceTypeExt === "" || !priceTypeExt);
-        if (rules.length > 0) {
-          if (isOriginalPrice && rules.includes("original_price")) {
-            return true;
-          }
-          if (isMarkupPrice && rules.includes("markup_price")) {
-            return true;
-          }
-          return false;
-        }
-        return isOriginalPrice;
+        return priceType === "markup" && priceTypeExt === "product_price";
       }
       return false;
     }

package/lib/solution/BookingByStep/index.js

@@ -185,19 +185,13 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     collection = [],
     schedule_date
   }) {
-    const res = await this.store.products.loadProducts({
+    return this.store.products.loadProducts({
       category_ids,
       product_ids,
       collection,
       schedule_date,
       cacheId: this.cacheId
     });
-    this.getAvailableDate({
-      startDate: schedule_date || (0, import_dayjs.default)().format("YYYY-MM-DD"),
-      endDate: schedule_date || (0, import_dayjs.default)().format("YYYY-MM-DD"),
-      products: [...res]
-    });
-    return res;
   }
   /**
    * 通过 schedule 来读取商品，适用于 session 类商品
@@ -234,12 +228,11 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const allProductIds = [...newProductIds, ...otherProductsIds].filter(
       (n, index, self) => self.indexOf(n) === index
     );
-    const res = await this.loadProducts({
+    return await this.loadProducts({
       product_ids: allProductIds,
       category_ids,
       schedule_date: date
     });
-    return res;
   }
   /**
    * 更新完商品数据、切换日期、或者在较后的流程里登录了，检测当前购物车里是否有商品，如果有，则需要更新购物车里的商品价格
@@ -606,12 +599,6 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       quantity = 1
     } = product || {};
     const productData = { ...origin, product_variant_id };
-    debugger;
-    if ((0, import_products.isSessionProduct)(productData)) {
-      if (!date || !date.startTime || !date.endTime) {
-        return { success: false, errorCode: "date_or_time_required" };
-      }
-    }
     const currentCartItems = this.store.cart.getItems();
     const stockCheckResult = (0, import_stock.checkProductStock)({
       productData,

package/lib/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/lib/solution/BookingByStep/utils/products.js

@@ -19,8 +19,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/solution/BookingByStep/utils/products.ts
 var products_exports = {};
 __export(products_exports, {
-  getAvailableProductResources: () => getAvailableProductResources,
-  isSessionProduct: () => isSessionProduct
+  getAvailableProductResources: () => getAvailableProductResources
 });
 module.exports = __toCommonJS(products_exports);
 var getAvailableProductResources = (products) => {
@@ -58,12 +57,7 @@ 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,
-  isSessionProduct
+  getAvailableProductResources
 });

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) {
@@ -502,7 +453,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
    * 会覆盖 order_info 与金额等字段，并重新计算待付金额，最后设置为 currentOrder。
    */
   async updateLocalOrderAsync(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
     this.logInfo("updateLocalOrderAsync called", {
       orderId: params.orderId,
       orderDataType: (_a = params.orderData) == null ? void 0 : _a.type,
@@ -709,7 +660,7 @@ var CheckoutImpl = class extends import_BaseModule.BaseModule {
       }
     });
     this.store.currentOrder = created;
-    if (params.existPayment && params.existPayment.length > 0) {
+    if (params.existPayment && params.existPayment.length > 0 || ((_p = this.store.currentOrder) == null ? void 0 : _p.order_id) && !(0, import_utils.isVirtualOrderId)((_q = this.store.currentOrder) == null ? void 0 : _q.order_id)) {
       this.store.isOrderSynced = true;
       const syncedPayments = created.payment.filter((p) => p.isSynced && p.status !== "voided");
       const syncedAmount = syncedPayments.reduce((sum, p) => {

package/package.json

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