@pisell/pisellos 3.0.91 → 3.0.93

package/dist/model/strategy/adapter/promotion/index.js

@@ -0,0 +1,9 @@
+// 导出评估器
+export { PromotionEvaluator } from "./evaluator";
+
+// 导出适配器
+export { PromotionAdapter } from "./adapter";
+export { default } from "./adapter";
+
+// 导出策略配置示例常量
+export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY } from "./examples";

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

@@ -33,6 +33,8 @@ interface Limitedrelationproductdata {
     product_ids: number[];
     product_collection_id: number[];
     package_sub_item_usage_rules?: PackageSubItemUsageRules;
+    exclude_product_ids?: number[];
+    filter?: 0 | 1;
 }
 interface ApplicableProductDetails {
     amount: string;

package/dist/modules/ProductList/index.js

@@ -86,7 +86,8 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
     key: "loadProducts",
     value: function () {
       var _loadProducts = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref) {
-        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, schedule_date, schedule_datetime, cacheId, _ref$menu_list_ids, menu_list_ids, userPlugin, customer_id, _userPlugin$get, productsData, sortedList;
+        var _this$otherParams, _this$otherParams2;
+        var _ref$category_ids, category_ids, _ref$product_ids, product_ids, _ref$collection, collection, schedule_date, schedule_datetime, cacheId, _ref$menu_list_ids, menu_list_ids, userPlugin, customer_id, _userPlugin$get, channelMap, saleChannel, productsData, sortedList;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -110,8 +111,15 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               } catch (error) {
                 console.error(error);
               }
-              _context3.prev = 4;
-              _context3.next = 7;
+              channelMap = {
+                'online_store': 'online-store',
+                'scan_to_order': 'online-store',
+                'scan_to_order_2': 'online-store',
+                'scan_to_order_3': 'online-store'
+              };
+              saleChannel = channelMap[(_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.channel] || ((_this$otherParams2 = this.otherParams) === null || _this$otherParams2 === void 0 ? void 0 : _this$otherParams2.channel);
+              _context3.prev = 6;
+              _context3.next = 9;
               return this.request.post("/product/query", {
                 open_quotation: 1,
                 open_bundle: 0,
@@ -128,8 +136,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 // client_schedule_ids: schedule_ids,
                 schedule_date: schedule_date,
                 schedule_datetime: schedule_datetime,
-                // application_code: this.otherParams?.channel === 'online_store' ? 'online-store' : this.otherParams?.channel,
-                application_code: 'online-store',
+                application_code: saleChannel,
                 is_eject: 1,
                 menu_list_ids: menu_list_ids,
                 open_deposit: 1
@@ -137,7 +144,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 useCache: true,
                 customToast: function customToast() {}
               });
-            case 7:
+            case 9:
               productsData = _context3.sent;
               sortedList = (productsData.data.list || []).slice().sort(function (a, b) {
                 return Number(b.sort) - Number(a.sort);
@@ -150,15 +157,15 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
               // }
               this.addProduct(sortedList);
               return _context3.abrupt("return", sortedList);
-            case 13:
-              _context3.prev = 13;
-              _context3.t0 = _context3["catch"](4);
+            case 15:
+              _context3.prev = 15;
+              _context3.t0 = _context3["catch"](6);
               return _context3.abrupt("return", _context3.t0);
-            case 16:
+            case 18:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[4, 13]]);
+        }, _callee3, this, [[6, 15]]);
       }));
       function loadProducts(_x5) {
         return _loadProducts.apply(this, arguments);

package/dist/modules/Rules/index.js

@@ -526,6 +526,15 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         return priceB.minus(priceA).toNumber();
       });
 
+      // 检查商品是否被排除（全品类）
+      var isProductIncludedByLimitedData = function isProductIncludedByLimitedData(limitedData, productId) {
+        var excludedIds = (limitedData === null || limitedData === void 0 ? void 0 : limitedData.exclude_product_ids) || [];
+        var isExcluded = (limitedData === null || limitedData === void 0 ? void 0 : limitedData.filter) === 1 && excludedIds.some(function (id) {
+          return String(id) === String(productId);
+        });
+        return !isExcluded;
+      };
+
       /**
       // 对productList按价格降序排序（用于应用优惠券时优先选择高价商品） 价格相同时使用quantity 排序
       const sortedProductList = [...productList].sort((a, b) => {
@@ -914,6 +923,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
 
           // 判断优惠券是否适用于该商品
           if (limitedData.type === 'product_all') {
+            if (!isProductIncludedByLimitedData(limitedData, product.id)) {
+              return false;
+            }
+
             // 检查 package_sub_item_usage_rules
             if (!_this3.checkPackageSubItemUsageRules(discount, flatItem)) {
               return false;

package/dist/modules/Summary/utils.js

@@ -595,6 +595,27 @@ export var calculateTaxFee = function calculateTaxFee(shopInfo, items) {
   }, new Decimal(0));
   return totalTaxFee;
 };
+var getCartItemDepositData = function getCartItemDepositData(item) {
+  var _target$_productOrigi, _target$_origin, _target$_origin2;
+  var target = item;
+  return (target === null || target === void 0 || (_target$_productOrigi = target._productOrigin) === null || _target$_productOrigi === void 0 ? void 0 : _target$_productOrigi.custom_deposit_data) || (target === null || target === void 0 || (_target$_origin = target._origin) === null || _target$_origin === void 0 ? void 0 : _target$_origin.custom_deposit_data) || (target === null || target === void 0 || (_target$_origin2 = target._origin) === null || _target$_origin2 === void 0 || (_target$_origin2 = _target$_origin2.product) === null || _target$_origin2 === void 0 ? void 0 : _target$_origin2.custom_deposit_data);
+};
+var getCartItemQuantity = function getCartItemQuantity(item) {
+  return new Decimal((item === null || item === void 0 ? void 0 : item.num) || 1);
+};
+var calculateCartItemDepositTotal = function calculateCartItemDepositTotal(item) {
+  var _item$deposit;
+  var depositData = getCartItemDepositData(item);
+  if ((depositData === null || depositData === void 0 ? void 0 : depositData.has_deposit) == 1 && typeof (depositData === null || depositData === void 0 ? void 0 : depositData.deposit_fixed) === 'string' && typeof (depositData === null || depositData === void 0 ? void 0 : depositData.deposit_percentage) === 'string') {
+    var _ref7, _summaryTotal;
+    var lineTotal = new Decimal((_ref7 = (_summaryTotal = item.summaryTotal) !== null && _summaryTotal !== void 0 ? _summaryTotal : item.total) !== null && _ref7 !== void 0 ? _ref7 : 0);
+    var quantity = getCartItemQuantity(item);
+    var fixedTotal = new Decimal(depositData.deposit_fixed || 0).times(quantity);
+    var percentageTotal = new Decimal(depositData.deposit_percentage || 0).times(lineTotal);
+    return fixedTotal.plus(percentageTotal);
+  }
+  return new Decimal((item === null || item === void 0 || (_item$deposit = item.deposit) === null || _item$deposit === void 0 ? void 0 : _item$deposit.total) || 0);
+};
 
 /**
  * @title: 计算定金
@@ -609,9 +630,9 @@ export var calculateDeposit = function calculateDeposit(items) {
   var hasDeposit = false;
   var total = items.reduce(function (sum, item) {
     if (item !== null && item !== void 0 && item.deposit) {
-      var _item$deposit, _item$deposit2;
+      var _item$deposit2;
       hasDeposit = true;
-      var cartItemTotalPrice = new Decimal((item === null || item === void 0 || (_item$deposit = item.deposit) === null || _item$deposit === void 0 ? void 0 : _item$deposit.total) || 0);
+      var cartItemTotalPrice = calculateCartItemDepositTotal(item);
       // 将协议数据去重合并
       item === null || item === void 0 || (_item$deposit2 = item.deposit) === null || _item$deposit2 === void 0 || (_item$deposit2 = _item$deposit2.protocols) === null || _item$deposit2 === void 0 || _item$deposit2.forEach(function (protocol) {
         if (protocols.findIndex(function (p) {
@@ -648,9 +669,9 @@ export var calculateDeposit = function calculateDeposit(items) {
  * @param options.isEdit 是否处于“编辑中”。`false` 时会优先走后端金额直取逻辑（若存在）
  * @returns 订单附加费金额（number，金额单位与商品价格一致）
  */
-export var getSurchargeAmount = function getSurchargeAmount(_ref7, surcharge, options) {
-  var bookingDetail = _ref7.bookingDetail,
-    bookingId = _ref7.bookingId;
+export var getSurchargeAmount = function getSurchargeAmount(_ref8, surcharge, options) {
+  var bookingDetail = _ref8.bookingDetail,
+    bookingId = _ref8.bookingId;
   var isEdit = options.isEdit;
   // 订单未变更过
   if (!isEdit) {
@@ -695,17 +716,17 @@ var getDiscountAmount = function getDiscountAmount(discounts) {
  * 获取主商品加价减价后的总价 (主商品价格 + 子商品加价减价)
  */
 var getMainProductTotal = function getMainProductTotal(item) {
-  var _ref8, _ref9, _item$main_product_se, _item$metadata, _item$metadata2, _item$metadata3, _item$metadata4;
+  var _ref9, _ref10, _item$main_product_se, _item$metadata, _item$metadata2, _item$metadata3, _item$metadata4;
   // 新语义 v2 下 `main_product_selling_price` / `metadata.main_product_selling_price`
   // 已经是"含 option、含主商品折扣"的主价，直接作为主商品基准，无需再减折扣或加 option。
   // 仅需叠加 markup / markdown 类 bundle（原价 bundle 的税费单独处理）。
-  var total = new Decimal((_ref8 = (_ref9 = (_item$main_product_se = item === null || item === void 0 ? void 0 : item.main_product_selling_price) !== null && _item$main_product_se !== void 0 ? _item$main_product_se : item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.main_product_selling_price) !== null && _ref9 !== void 0 ? _ref9 : item === null || item === void 0 || (_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.main_product_original_price) !== null && _ref8 !== void 0 ? _ref8 : 0);
+  var total = new Decimal((_ref9 = (_ref10 = (_item$main_product_se = item === null || item === void 0 ? void 0 : item.main_product_selling_price) !== null && _item$main_product_se !== void 0 ? _item$main_product_se : item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.main_product_selling_price) !== null && _ref10 !== void 0 ? _ref10 : item === null || item === void 0 || (_item$metadata2 = item.metadata) === null || _item$metadata2 === void 0 ? void 0 : _item$metadata2.main_product_original_price) !== null && _ref9 !== void 0 ? _ref9 : 0);
 
   // 做个兜底 如果新语义价格字段都没有，则切换回老逻辑
   var hasMainProductPrice = (item === null || item === void 0 ? void 0 : item.main_product_selling_price) != null || (item === null || item === void 0 || (_item$metadata3 = item.metadata) === null || _item$metadata3 === void 0 ? void 0 : _item$metadata3.main_product_selling_price) != null || (item === null || item === void 0 || (_item$metadata4 = item.metadata) === null || _item$metadata4 === void 0 ? void 0 : _item$metadata4.main_product_original_price) != null;
   if (!hasMainProductPrice) {
-    var _ref10, _ref11, _item$main_product_se2, _item$metadata5, _item$_origin3, _item$_originData;
-    total = new Decimal((_ref10 = (_ref11 = (_item$main_product_se2 = item === null || item === void 0 ? void 0 : item.main_product_selling_price) !== null && _item$main_product_se2 !== void 0 ? _item$main_product_se2 : item === null || item === void 0 || (_item$metadata5 = item.metadata) === null || _item$metadata5 === void 0 ? void 0 : _item$metadata5.main_product_selling_price) !== null && _ref11 !== void 0 ? _ref11 : item.price) !== null && _ref10 !== void 0 ? _ref10 : 0);
+    var _ref11, _ref12, _item$main_product_se2, _item$metadata5, _item$_origin3, _item$_originData;
+    total = new Decimal((_ref11 = (_ref12 = (_item$main_product_se2 = item === null || item === void 0 ? void 0 : item.main_product_selling_price) !== null && _item$main_product_se2 !== void 0 ? _item$main_product_se2 : item === null || item === void 0 || (_item$metadata5 = item.metadata) === null || _item$metadata5 === void 0 ? void 0 : _item$metadata5.main_product_selling_price) !== null && _ref12 !== void 0 ? _ref12 : item.price) !== null && _ref11 !== void 0 ? _ref11 : 0);
     var discount = (item === null || item === void 0 || (_item$_origin3 = item._origin) === null || _item$_origin3 === void 0 || (_item$_origin3 = _item$_origin3.product) === null || _item$_origin3 === void 0 ? void 0 : _item$_origin3.discount_list) || (item === null || item === void 0 || (_item$_originData = item._originData) === null || _item$_originData === void 0 || (_item$_originData = _item$_originData.product) === null || _item$_originData === void 0 || (_item$_originData = _item$_originData.discount_list) === null || _item$_originData === void 0 ? void 0 : _item$_originData.filter(function (item) {
       var _item$metadata6;
       return !(item !== null && item !== void 0 && (_item$metadata6 = item.metadata) !== null && _item$metadata6 !== void 0 && _item$metadata6.custom_product_bundle_map_id);
@@ -726,9 +747,9 @@ var getMainProductTotal = function getMainProductTotal(item) {
     for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
       var bundleItem = _step4.value;
       if (getBundleItemIsMarkupOrDiscountPrice(bundleItem)) {
-        var _ref12, _bundleItem$bundle_se2;
+        var _ref13, _bundleItem$bundle_se2;
         // IMPORTANT: 套餐子商品如果应用了 discount，bundle_selling_price 和 price 其实都已经是折后价格了，不需要单独再减一次
-        var bundleItemTotal = new Decimal((_ref12 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref12 !== void 0 ? _ref12 : 0);
+        var bundleItemTotal = new Decimal((_ref13 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref13 !== void 0 ? _ref13 : 0);
         total = total.add(bundleItemTotal);
       }
     }
@@ -848,12 +869,12 @@ var isProductMatchSurchargeCondition = function isProductMatchSurchargeCondition
  * @param options.scheduleById schedule 映射表：`{ [scheduleId]: schedule }`（用于根据配置的 `available_schedule_ids` 做日程匹配）
  * @returns 附加费列表（仅返回金额 > 0 的项）
  */
-export var getSurcharge = function getSurcharge(_ref13, options) {
+export var getSurcharge = function getSurcharge(_ref14, options) {
   var _service$filter;
-  var service = _ref13.service,
-    addons = _ref13.addons,
-    bookingDetail = _ref13.bookingDetail,
-    bookingId = _ref13.bookingId;
+  var service = _ref14.service,
+    addons = _ref14.addons,
+    bookingDetail = _ref14.bookingDetail,
+    bookingId = _ref14.bookingId;
   var isEdit = options.isEdit,
     isInScheduleByDate = options.isInScheduleByDate,
     surcharge_list = options.surcharge_list,
@@ -975,11 +996,11 @@ export var getSurcharge = function getSurcharge(_ref13, options) {
                 scheduleById: scheduleById || {},
                 isInScheduleByDate: isInScheduleByDate
               })) {
-                var _ref14, _bundleItem$bundle_se3;
+                var _ref15, _bundleItem$bundle_se3;
                 var _mainQuantity = item.num || 1;
                 matchedItems.push({
                   isMain: false,
-                  total: Number((_ref14 = (_bundleItem$bundle_se3 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se3 !== void 0 ? _bundleItem$bundle_se3 : bundleItem.price) !== null && _ref14 !== void 0 ? _ref14 : 0),
+                  total: Number((_ref15 = (_bundleItem$bundle_se3 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se3 !== void 0 ? _bundleItem$bundle_se3 : bundleItem.price) !== null && _ref15 !== void 0 ? _ref15 : 0),
                   quantity: bundleItem.num || bundleItem.quantity || 1,
                   item: bundleItem,
                   mainQuantity: _mainQuantity // 子商品的mainQuantity是所属主商品的quantity
@@ -1195,9 +1216,9 @@ export var getSurcharge = function getSurcharge(_ref13, options) {
   }
   return surchargeWithAmount;
 };
-function resetItemsSurchargeSideEffects(_ref15) {
-  var service = _ref15.service,
-    addons = _ref15.addons;
+function resetItemsSurchargeSideEffects(_ref16) {
+  var service = _ref16.service,
+    addons = _ref16.addons;
   var resetItem = function resetItem(item) {
     if (!item) return;
     item.surcharge_fee = 0;

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

@@ -168,6 +168,11 @@ export declare class VenueBookingImpl extends BaseModule implements Module {
     getOrderProducts(): ScanOrderOrderProduct[];
     getSummary(): Promise<import("./types").ScanOrderSummary>;
     submitOrder<T = any>(): Promise<T>;
+    /**
+     * 0 元订单免费领取（非定金场景）
+     * 与 appointment getFreeProduct 同接口：POST /pay/order/free-pay/:id
+     */
+    submitFreeOrder(id: string | number): Promise<any>;
     addProductToOrder(product: Partial<ScanOrderOrderProduct> & ScanOrderOrderProductIdentity): Promise<ScanOrderOrderProduct[]>;
     updateProductInOrder(params: UpdateProductInOrderParams): Promise<ScanOrderOrderProduct[]>;
     removeProductFromOrder(identity: ScanOrderOrderProductIdentity): Promise<ScanOrderOrderProduct[]>;