@pisell/pisellos 2.2.174 → 2.2.175

package/dist/modules/Quotation/index.js

@@ -78,21 +78,22 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               query = {};
               if (params !== null && params !== void 0 && params.channel) query.channel = params.channel;
+              if (params !== null && params !== void 0 && params.customer_id) query.customer_id = String(params.customer_id);
               if ((params === null || params === void 0 ? void 0 : params.channel) === 'online_store') {
                 query.channel = 'online-store';
               }
-              _context2.next = 5;
+              _context2.next = 6;
               return this.request.get('/quotation/available', query, {
                 useCache: false
               });
-            case 5:
+            case 6:
               res = _context2.sent;
-              list = (res === null || res === void 0 || (_data = res.data) === null || _data === void 0 ? void 0 : _data.list) || (res === null || res === void 0 ? void 0 : res.list) || [];
+              list = this.filterQuotationsByCustomer((res === null || res === void 0 || (_data = res.data) === null || _data === void 0 ? void 0 : _data.list) || (res === null || res === void 0 ? void 0 : res.list) || [], params === null || params === void 0 ? void 0 : params.customer_id);
               list.sort(function (a, b) {
                 return a.sort - b.sort;
               });
               this.store.list = list;
-            case 9:
+            case 10:
             case "end":
               return _context2.stop();
           }
@@ -129,10 +130,8 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var quotation = _step.value;
-          var visible = this.isQuotationVisibleForCustomer(quotation, customer_id);
-          if (!visible) continue;
-          var active = this.isQuotationActiveAt(quotation, datetime);
-          if (!active) continue;
+          if (!this.isQuotationVisibleForCustomer(quotation, customer_id)) continue;
+          if (!this.isQuotationActiveAt(quotation, datetime)) continue;
           var match = this.findProductData(quotation.product_data, productId, variantId);
           if (!match) continue;
           if (match.value === 0) continue;
@@ -219,6 +218,14 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
     value: function setScheduleResolver(resolver) {
       this.scheduleResolver = resolver;
     }
+  }, {
+    key: "filterQuotationsByCustomer",
+    value: function filterQuotationsByCustomer(list, customerId) {
+      var _this2 = this;
+      return list.filter(function (quotation) {
+        return _this2.isQuotationVisibleForCustomer(quotation, customerId);
+      });
+    }
   }, {
     key: "isQuotationVisibleForCustomer",
     value: function isQuotationVisibleForCustomer(quotation, customerId) {
@@ -239,27 +246,18 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
     key: "isQuotationActiveAt",
     value: function isQuotationActiveAt(quotation, datetime) {
       var _quotation$schedule,
-        _this2 = this;
+        _this3 = this;
       if (!((_quotation$schedule = quotation.schedule) !== null && _quotation$schedule !== void 0 && _quotation$schedule.length)) return false;
-      var scheduleItems = [];
-      quotation.schedule.forEach(function (s) {
-        var _this2$scheduleResolv;
-        var full = (_this2$scheduleResolv = _this2.scheduleResolver) === null || _this2$scheduleResolv === void 0 ? void 0 : _this2$scheduleResolv.call(_this2, s.id);
-        if (full) {
-          scheduleItems.push(full);
-          return;
-        }
-        if (_this2.scheduleResolver) {
-          return;
-        }
-        var fallbackSchedule = _objectSpread(_objectSpread({}, s), {}, {
+      var scheduleItems = quotation.schedule.map(function (s) {
+        var _this3$scheduleResolv;
+        var full = (_this3$scheduleResolv = _this3.scheduleResolver) === null || _this3$scheduleResolv === void 0 ? void 0 : _this3$scheduleResolv.call(_this3, s.id);
+        if (full) return full;
+        return _objectSpread(_objectSpread({}, s), {}, {
           repeat_type: s.repeat_type || 'none',
           repeat_rule: s.repeat_rule || null,
           time_slot: s.time_slot || []
         });
-        scheduleItems.push(fallbackSchedule);
       });
-      if (!scheduleItems.length) return false;
       return getDateIsInSchedule(datetime, scheduleItems);
     }
   }, {

package/dist/modules/Rules/index.d.ts

@@ -32,10 +32,6 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         unavailableReason?: UnavailableReason;
     };
     filterDiscountListByType(discountList: Discount[], type: string): Discount[];
-    /** 剔除指定 type/tag 的折扣项，保留手动改价(type=product) / 券等 */
-    excludeDiscountListByType(discountList: Discount[], type: string): Discount[];
-    /** 手动改价场景：去掉 promotion，保留 type=product 等行内折扣 */
-    resolveDiscountListForManualOverride(discountList: Discount[]): Discount[];
     private getUnavailableReason;
     calcDiscount({ discountList, productList, holders, isFormSubject, orderTotalAmount }: {
         discountList: Discount[];

package/dist/modules/Rules/index.js

@@ -222,22 +222,6 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         return item.type === type || item.tag === type;
       });
     }
-
-    /** 剔除指定 type/tag 的折扣项，保留手动改价(type=product) / 券等 */
-  }, {
-    key: "excludeDiscountListByType",
-    value: function excludeDiscountListByType(discountList, type) {
-      return (discountList || []).filter(function (item) {
-        return item.type !== type && item.tag !== type;
-      });
-    }
-
-    /** 手动改价场景：去掉 promotion，保留 type=product 等行内折扣 */
-  }, {
-    key: "resolveDiscountListForManualOverride",
-    value: function resolveDiscountListForManualOverride(discountList) {
-      return this.excludeDiscountListByType(discountList, 'promotion');
-    }
     // 获取券不可用的原因
   }, {
     key: "getUnavailableReason",
@@ -1224,7 +1208,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 price: product.price,
                 options: restoredOptions
               }), {}, {
-                discount_list: isManualDiscount ? _this3.resolveDiscountListForManualOverride(product.discount_list) : _this3.filterDiscountListByType(product.discount_list, 'promotion')
+                discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);
             } else {
               var _ref13, _product$_promotion$f, _product13, _product$origin_total;
@@ -1247,14 +1231,14 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
                 main_product_selling_price: main_product_selling_price,
                 options: restoredOptions
               }), {}, {
-                discount_list: isManualDiscount ? _this3.resolveDiscountListForManualOverride(product.discount_list) : _this3.filterDiscountListByType(product.discount_list, 'promotion')
+                discount_list: _this3.filterDiscountListByType(product.discount_list, 'promotion')
               }))]);
             }
           } else {
-            var _flatItem$bundleItem8, _flatItem$bundleItem9;
+            var _flatItem$bundleItem8;
             // bundle子商品：保存到扁平化Map
             processedFlatItemsMap.set(flatItem._id, [_objectSpread(_objectSpread({}, flatItem), {}, {
-              discount_list: isManualDiscount ? _this3.resolveDiscountListForManualOverride(((_flatItem$bundleItem8 = flatItem.bundleItem) === null || _flatItem$bundleItem8 === void 0 ? void 0 : _flatItem$bundleItem8.discount_list) || []) : _this3.filterDiscountListByType(((_flatItem$bundleItem9 = flatItem.bundleItem) === null || _flatItem$bundleItem9 === void 0 ? void 0 : _flatItem$bundleItem9.discount_list) || [], 'promotion'),
+              discount_list: _this3.filterDiscountListByType(((_flatItem$bundleItem8 = flatItem.bundleItem) === null || _flatItem$bundleItem8 === void 0 ? void 0 : _flatItem$bundleItem8.discount_list) || [], 'promotion'),
               price: isManualDiscount ? flatItem.bundleItem.price : flatItem.bundleItem.original_price,
               processed: true
             })]);
@@ -2085,10 +2069,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           return true; // 单独购买时可用
         }
         if (isBundleItem) {
-          var _flatItem$bundleItem10, _flatItem$bundleItem11, _flatItem$originProdu, _flatItem$parentProdu10;
+          var _flatItem$bundleItem9, _flatItem$bundleItem10, _flatItem$originProdu, _flatItem$parentProdu10;
           // 套餐中购买时，判断是否为原价
-          var priceType = (_flatItem$bundleItem10 = flatItem.bundleItem) === null || _flatItem$bundleItem10 === void 0 ? void 0 : _flatItem$bundleItem10.price_type;
-          var priceTypeExt = (_flatItem$bundleItem11 = flatItem.bundleItem) === null || _flatItem$bundleItem11 === void 0 ? void 0 : _flatItem$bundleItem11.price_type_ext;
+          var priceType = (_flatItem$bundleItem9 = flatItem.bundleItem) === null || _flatItem$bundleItem9 === void 0 ? void 0 : _flatItem$bundleItem9.price_type;
+          var priceTypeExt = (_flatItem$bundleItem10 = flatItem.bundleItem) === null || _flatItem$bundleItem10 === void 0 ? void 0 : _flatItem$bundleItem10.price_type_ext;
           // 主商品id
           var mainProductId = (flatItem === null || flatItem === void 0 || (_flatItem$originProdu = flatItem.originProduct) === null || _flatItem$originProdu === void 0 || (_flatItem$originProdu = _flatItem$originProdu._productOrigin) === null || _flatItem$originProdu === void 0 ? void 0 : _flatItem$originProdu.id) || (flatItem === null || flatItem === void 0 || (_flatItem$parentProdu10 = flatItem.parentProduct) === null || _flatItem$parentProdu10 === void 0 ? void 0 : _flatItem$parentProdu10.id) || 0;
           // original_price 对应：
@@ -2155,10 +2139,10 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           return false; // 单独购买时不可用
         }
         if (isBundleItem) {
-          var _flatItem$bundleItem12, _flatItem$bundleItem13;
+          var _flatItem$bundleItem11, _flatItem$bundleItem12;
           // 套餐中购买时，判断是否为原价
-          var _priceType = (_flatItem$bundleItem12 = flatItem.bundleItem) === null || _flatItem$bundleItem12 === void 0 ? void 0 : _flatItem$bundleItem12.price_type;
-          var _priceTypeExt = (_flatItem$bundleItem13 = flatItem.bundleItem) === null || _flatItem$bundleItem13 === void 0 ? void 0 : _flatItem$bundleItem13.price_type_ext;
+          var _priceType = (_flatItem$bundleItem11 = flatItem.bundleItem) === null || _flatItem$bundleItem11 === void 0 ? void 0 : _flatItem$bundleItem11.price_type;
+          var _priceTypeExt = (_flatItem$bundleItem12 = flatItem.bundleItem) === null || _flatItem$bundleItem12 === void 0 ? void 0 : _flatItem$bundleItem12.price_type_ext;
 
           // original_price 对应：
           // 1. price_type: "markup" && price_type_ext: "product_price"

package/dist/modules/SalesSummary/index.js

@@ -27,8 +27,7 @@ export * from "./types";
 var salesSummaryDataKeys = {
   isPriceIncludeTax: 'is_price_include_tax',
   taxRate: 'tax_rate',
-  taxTitle: 'tax_title',
-  taxCountryCode: 'tax_country_code'
+  taxTitle: 'tax_title'
 };
 export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(SalesSummaryModule, _BaseModule);
@@ -136,8 +135,7 @@ export var SalesSummaryModule = /*#__PURE__*/function (_BaseModule) {
       return {
         isPriceIncludeTax: this.getAppData(salesSummaryDataKeys.isPriceIncludeTax),
         taxRate: this.getAppData(salesSummaryDataKeys.taxRate),
-        taxTitle: this.getAppData(salesSummaryDataKeys.taxTitle),
-        taxCountryCode: this.getAppData(salesSummaryDataKeys.taxCountryCode)
+        taxTitle: this.getAppData(salesSummaryDataKeys.taxTitle)
       };
     }
   }, {

package/dist/modules/Schedule/index.js

@@ -205,13 +205,9 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getScheduleListByIds",
     value: function getScheduleListByIds(ids) {
-      var idSet = new Set(ids.map(function (id) {
-        return String(id);
-      }));
-      var list = this.store.scheduleList.filter(function (n) {
-        return idSet.has(String(n.id));
+      return this.store.scheduleList.filter(function (n) {
+        return ids.includes(n.id);
       });
-      return list;
     }
   }, {
     key: "setAvailabilityScheduleDateList",

package/dist/modules/index.d.ts

@@ -16,4 +16,3 @@ export * from './Schedule';
 export * from './Quotation';
 export * from './ScanOrderLogger';
 export * from './OpenData';
-export * from './BookingContext';

package/dist/modules/index.js

@@ -15,5 +15,4 @@ export * from "./SalesSummary";
 export * from "./Schedule";
 export * from "./Quotation";
 export * from "./ScanOrderLogger";
-export * from "./OpenData";
-export * from "./BookingContext";
+export * from "./OpenData";

package/dist/server/index.js

@@ -1608,30 +1608,26 @@ var Server = /*#__PURE__*/function () {
             case 6:
               _context18.prev = 6;
               _context18.next = 9;
-              return this.schedule.loadAllSchedule();
-            case 9:
-              this.products.clearPriceCache();
-              _context18.next = 12;
               return this.products.setupQuotationPriceBridge({
                 scheduleModule: this.schedule,
                 channel: (_this$core$context = this.core.context) === null || _this$core$context === void 0 ? void 0 : _this$core$context.channel
               });
-            case 12:
+            case 9:
               this.logInfo('Products 报价单价格桥接初始化完成');
-              _context18.next = 19;
+              _context18.next = 16;
               break;
-            case 15:
-              _context18.prev = 15;
+            case 12:
+              _context18.prev = 12;
               _context18.t0 = _context18["catch"](6);
               errorMessage = _context18.t0 instanceof Error ? _context18.t0.message : String(_context18.t0);
               this.logError('Products 报价单价格桥接初始化失败', {
                 error: errorMessage
               });
-            case 19:
+            case 16:
             case "end":
               return _context18.stop();
           }
-        }, _callee18, this, [[6, 15]]);
+        }, _callee18, this, [[6, 12]]);
       }));
       function setupProductsQuotationPriceBridge() {
         return _setupProductsQuotationPriceBridge.apply(this, arguments);

package/dist/server/modules/order/utils/filterOrders.js

@@ -1,17 +1,4 @@
 import dayjs from 'dayjs';
-/** 从订单 payments 提取支付方式 code，与 UI 筛选选项及 filterBookings 一致 */
-function getOrderPaymentCodes(order) {
-  var payments = order.payments;
-  if (!Array.isArray(payments) || payments.length === 0) {
-    return [];
-  }
-  return payments.map(function (item) {
-    return item === null || item === void 0 ? void 0 : item.code;
-  }).filter(function (code) {
-    return typeof code === 'string' && code.length > 0;
-  });
-}
-
 /**
  * 订单过滤函数
  * @param orders 原始订单列表
@@ -139,23 +126,22 @@ export function filterOrders(orders, filters) {
       }
     }
 
-    // payment_methods - 支付方式（按 payments[].code 匹配，不再使用 order.payment_methods）
+    // payment_methods - 支付方式
     if (safeFilters.payment_methods && safeFilters.payment_methods.length > 0) {
-      var orderPaymentCodes = getOrderPaymentCodes(order);
-      if (orderPaymentCodes.length === 0) {
+      if (!order.payment_methods || !Array.isArray(order.payment_methods) || order.payment_methods.length === 0) {
         rejected.push({
           order_id: order.order_id,
           order_number: order.order_number,
           reason: {
             field: 'payment_methods',
-            actual: order.payments,
+            actual: order.payment_methods,
             expected: safeFilters.payment_methods
           }
         });
         return false;
       }
-      var hasMatch = orderPaymentCodes.some(function (code) {
-        return safeFilters.payment_methods.includes(code);
+      var hasMatch = order.payment_methods.some(function (pm) {
+        return safeFilters.payment_methods.includes(pm);
       });
       if (!hasMatch) {
         rejected.push({
@@ -163,7 +149,7 @@ export function filterOrders(orders, filters) {
           order_number: order.order_number,
           reason: {
             field: 'payment_methods',
-            actual: orderPaymentCodes,
+            actual: order.payment_methods,
             expected: safeFilters.payment_methods
           }
         });

package/dist/server/modules/products/index.d.ts

@@ -21,7 +21,7 @@ export declare class ProductsModule extends BaseModule implements Module {
     private isPriceFormatterRegistered;
     private quotationPriceBridge?;
     private quotationBridgeChannel?;
-    private quotationBridgeLoadedKey?;
+    private quotationBridgeCustomerId?;
     private quotationBridgeRefreshPromise?;
     private quotationBridgeRefreshKey?;
     private productDataSource;