@pisell/pisellos 2.2.175 → 2.2.176

package/dist/modules/SalesSummary/utils.js

@@ -458,8 +458,8 @@ export function calculateSalesSummary(params) {
     }, new Decimal(0));
   }
   var shopDiscountAmount = Decimal.max(new Decimal(Number(shopDiscount) || 0), 0);
-  var expectAmount = Decimal.max(0, productAmount.plus(surchargeAmount).minus(shopDiscountAmount));
-  var totalAmount = isPriceIncludeTax === 1 ? expectAmount : expectAmount.plus(productTaxFee);
+  var preTaxExpectAmount = Decimal.max(0, productAmount.plus(surchargeAmount).minus(shopDiscountAmount));
+  var totalAmount = isPriceIncludeTax === 1 ? preTaxExpectAmount : preTaxExpectAmount.plus(productTaxFee);
   var deposit = calculateProductsDeposit(products);
   return {
     product_quantity: productQuantity,
@@ -475,7 +475,7 @@ export function calculateSalesSummary(params) {
     discount_amount: toFixed2(Decimal.max(productOriginalAmount.minus(productAmount), 0).plus(shopDiscountAmount)),
     deposit_amount: deposit ? deposit.total : '0.00',
     deposit: deposit,
-    expect_amount: toFixed2(expectAmount),
+    expect_amount: toFixed2(totalAmount),
     total_amount: toFixed2(totalAmount),
     total_refund_amount: '0.00',
     customer_paid_amount: '0.00',

package/dist/modules/Schedule/index.js

@@ -205,9 +205,13 @@ export var ScheduleModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getScheduleListByIds",
     value: function getScheduleListByIds(ids) {
-      return this.store.scheduleList.filter(function (n) {
-        return ids.includes(n.id);
+      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 list;
     }
   }, {
     key: "setAvailabilityScheduleDateList",

package/dist/modules/index.d.ts

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

package/dist/modules/index.js

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

package/dist/server/index.js

@@ -168,16 +168,17 @@ var Server = /*#__PURE__*/function () {
      */
     _defineProperty(this, "handleProductQuery", /*#__PURE__*/function () {
       var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-        var url, method, data, config, menu_list_ids, schedule_datetime, schedule_date, customer_id, _ref3, callback, subscriberId;
+        var url, method, data, config, menu_list_ids, schedule_datetime, schedule_date, customer_id, ids, _ref3, callback, subscriberId;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               url = _ref.url, method = _ref.method, data = _ref.data, config = _ref.config;
               console.log('[Server] handleProductQuery:', url, method, data, config);
-              menu_list_ids = data.menu_list_ids, schedule_datetime = data.schedule_datetime, schedule_date = data.schedule_date, customer_id = data.customer_id;
+              menu_list_ids = data.menu_list_ids, schedule_datetime = data.schedule_datetime, schedule_date = data.schedule_date, customer_id = data.customer_id, ids = data.ids;
               _ref3 = config || {}, callback = _ref3.callback, subscriberId = _ref3.subscriberId;
               _this.logInfo('handleProductQuery: 开始处理商品查询请求', {
                 menu_list_ids: menu_list_ids,
+                ids: ids,
                 schedule_datetime: schedule_datetime,
                 schedule_date: schedule_date,
                 customer_id: customer_id
@@ -189,6 +190,7 @@ var Server = /*#__PURE__*/function () {
                   callback: callback,
                   context: {
                     menu_list_ids: menu_list_ids,
+                    ids: ids,
                     schedule_date: schedule_date,
                     schedule_datetime: schedule_datetime,
                     customer_id: customer_id
@@ -201,6 +203,7 @@ var Server = /*#__PURE__*/function () {
               }
               return _context.abrupt("return", _this.computeProductQueryResult({
                 menu_list_ids: menu_list_ids,
+                ids: ids,
                 schedule_date: schedule_date,
                 schedule_datetime: schedule_datetime,
                 customer_id: customer_id
@@ -1608,26 +1611,30 @@ 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 9:
+            case 12:
               this.logInfo('Products 报价单价格桥接初始化完成');
-              _context18.next = 16;
+              _context18.next = 19;
               break;
-            case 12:
-              _context18.prev = 12;
+            case 15:
+              _context18.prev = 15;
               _context18.t0 = _context18["catch"](6);
               errorMessage = _context18.t0 instanceof Error ? _context18.t0.message : String(_context18.t0);
               this.logError('Products 报价单价格桥接初始化失败', {
                 error: errorMessage
               });
-            case 16:
+            case 19:
             case "end":
               return _context18.stop();
           }
-        }, _callee18, this, [[6, 12]]);
+        }, _callee18, this, [[6, 15]]);
       }));
       function setupProductsQuotationPriceBridge() {
         return _setupProductsQuotationPriceBridge.apply(this, arguments);
@@ -3303,14 +3310,20 @@ var Server = /*#__PURE__*/function () {
       var _computeProductQueryResult = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29(context, options) {
         var _menu_list_ids$length3,
           _this6 = this;
-        var tTotal, menu_list_ids, schedule_date, schedule_datetime, customer_id, product_id, _published$find, pid, _tPrice, allProductsWithPrice, published, item, activeMenuList, tMenu, menuList, tFilter, productScope, scopedProductIds, tPrice, filteredProducts, tStatus, beforeStatusCount, tSort;
+        var tTotal, menu_list_ids, ids, schedule_date, schedule_datetime, customer_id, product_id, queryIds, uniqueIds, _tPrice, productsWithPrice, _filteredProducts, _published$find, pid, _tPrice2, allProductsWithPrice, published, item, activeMenuList, tMenu, menuList, tFilter, productScope, scopedProductIds, tPrice, filteredProducts, tStatus, beforeStatusCount, tSort;
         return _regeneratorRuntime().wrap(function _callee29$(_context29) {
           while (1) switch (_context29.prev = _context29.next) {
             case 0:
               tTotal = performance.now();
-              menu_list_ids = context.menu_list_ids, schedule_date = context.schedule_date, schedule_datetime = context.schedule_datetime, customer_id = context.customer_id, product_id = context.product_id;
+              menu_list_ids = context.menu_list_ids, ids = context.ids, schedule_date = context.schedule_date, schedule_datetime = context.schedule_datetime, customer_id = context.customer_id, product_id = context.product_id;
+              queryIds = Array.isArray(ids) ? ids.map(function (id) {
+                return Number(id);
+              }).filter(function (id) {
+                return Number.isFinite(id);
+              }) : [];
               this.logInfo('computeProductQueryResult 开始', {
                 menuListIdsCount: (_menu_list_ids$length3 = menu_list_ids === null || menu_list_ids === void 0 ? void 0 : menu_list_ids.length) !== null && _menu_list_ids$length3 !== void 0 ? _menu_list_ids$length3 : 0,
+                ids: queryIds,
                 schedule_datetime: schedule_datetime,
                 schedule_date: schedule_date,
                 customer_id: customer_id,
@@ -3318,7 +3331,7 @@ var Server = /*#__PURE__*/function () {
                 changedIds: options === null || options === void 0 ? void 0 : options.changedIds
               });
               if (this.products) {
-                _context29.next = 6;
+                _context29.next = 7;
                 break;
               }
               this.logError('computeProductQueryResult: Products 模块未注册');
@@ -3329,22 +3342,67 @@ var Server = /*#__PURE__*/function () {
                   count: 0
                 }
               });
-            case 6:
-              if (!(product_id != null && Number.isFinite(Number(product_id)))) {
+            case 7:
+              if (!(queryIds.length > 0)) {
                 _context29.next = 18;
                 break;
               }
-              pid = Number(product_id);
+              uniqueIds = Array.from(new Set(queryIds));
               _tPrice = performance.now();
-              _context29.next = 11;
+              _context29.next = 12;
+              return this.products.getProductsWithPrice(schedule_date, {
+                scheduleModule: this.getSchedule(),
+                schedule_datetime: schedule_datetime,
+                customer_id: customer_id
+              }, {
+                changedIds: options === null || options === void 0 ? void 0 : options.changedIds,
+                productIds: uniqueIds
+              });
+            case 12:
+              productsWithPrice = _context29.sent;
+              perfMark('computeQuery.getProductsWithPrice(ids)', performance.now() - _tPrice, {
+                count: productsWithPrice.length,
+                ids: uniqueIds
+              });
+              _filteredProducts = productsWithPrice.filter(function (p) {
+                return uniqueIds.includes(Number(p === null || p === void 0 ? void 0 : p.id));
+              }).filter(function (p) {
+                return ((p === null || p === void 0 ? void 0 : p.status) || 'published') === 'published';
+              });
+              perfMark('computeProductQueryResult', performance.now() - tTotal, {
+                mode: 'ids',
+                ids: uniqueIds,
+                count: _filteredProducts.length
+              });
+              this.logInfo('computeProductQueryResult 完成（ids）', {
+                ids: uniqueIds,
+                count: _filteredProducts.length
+              });
+              return _context29.abrupt("return", {
+                code: 200,
+                data: {
+                  list: _filteredProducts,
+                  count: _filteredProducts.length
+                },
+                message: '',
+                status: true
+              });
+            case 18:
+              if (!(product_id != null && Number.isFinite(Number(product_id)))) {
+                _context29.next = 30;
+                break;
+              }
+              pid = Number(product_id);
+              _tPrice2 = performance.now();
+              _context29.next = 23;
               return this.products.getProductsWithPrice(schedule_date, {
                 scheduleModule: this.getSchedule()
               }, {
                 changedIds: options === null || options === void 0 ? void 0 : options.changedIds
               });
-            case 11:
+            case 23:
               allProductsWithPrice = _context29.sent;
-              perfMark('computeQuery.getProductsWithPrice(single)', performance.now() - _tPrice, {
+              perfMark('computeQuery.getProductsWithPrice(single)', performance.now() - _tPrice2, {
                 count: allProductsWithPrice.length,
                 productId: pid
               });
@@ -3369,9 +3427,9 @@ var Server = /*#__PURE__*/function () {
                 message: item ? '' : '商品不存在或未发布',
                 status: true
               });
-            case 18:
+            case 30:
               if (this.menu) {
-                _context29.next = 21;
+                _context29.next = 33;
                 break;
               }
               this.logError('computeProductQueryResult: Menu 模块未注册');
@@ -3382,9 +3440,9 @@ var Server = /*#__PURE__*/function () {
                   count: 0
                 }
               });
-            case 21:
+            case 33:
               if (this.schedule) {
-                _context29.next = 24;
+                _context29.next = 36;
                 break;
               }
               this.logError('computeProductQueryResult: Schedule 模块未注册');
@@ -3395,7 +3453,7 @@ var Server = /*#__PURE__*/function () {
                   count: 0
                 }
               });
-            case 24:
+            case 36:
               activeMenuList = [];
               if (menu_list_ids && Array.isArray(menu_list_ids) && menu_list_ids.length > 0) {
                 tMenu = performance.now();
@@ -3419,10 +3477,10 @@ var Server = /*#__PURE__*/function () {
               });
               tPrice = performance.now();
               if (!(scopedProductIds.length > 0)) {
-                _context29.next = 37;
+                _context29.next = 49;
                 break;
               }
-              _context29.next = 34;
+              _context29.next = 46;
               return this.products.getProductsWithPrice(schedule_date, {
                 scheduleModule: this.getSchedule(),
                 schedule_datetime: schedule_datetime,
@@ -3431,13 +3489,13 @@ var Server = /*#__PURE__*/function () {
                 changedIds: options === null || options === void 0 ? void 0 : options.changedIds,
                 productIds: productScope.isAllProducts ? undefined : scopedProductIds
               });
-            case 34:
+            case 46:
               _context29.t0 = _context29.sent;
-              _context29.next = 38;
+              _context29.next = 50;
               break;
-            case 37:
+            case 49:
               _context29.t0 = [];
-            case 38:
+            case 50:
               filteredProducts = _context29.t0;
               perfMark('computeQuery.getProductsWithPrice', performance.now() - tPrice, {
                 count: filteredProducts.length,
@@ -3480,7 +3538,7 @@ var Server = /*#__PURE__*/function () {
                 message: '',
                 status: true
               });
-            case 50:
+            case 62:
             case "end":
               return _context29.stop();
           }

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

@@ -1,4 +1,17 @@
 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 原始订单列表
@@ -126,22 +139,23 @@ export function filterOrders(orders, filters) {
       }
     }
 
-    // payment_methods - 支付方式
+    // payment_methods - 支付方式（按 payments[].code 匹配，不再使用 order.payment_methods）
     if (safeFilters.payment_methods && safeFilters.payment_methods.length > 0) {
-      if (!order.payment_methods || !Array.isArray(order.payment_methods) || order.payment_methods.length === 0) {
+      var orderPaymentCodes = getOrderPaymentCodes(order);
+      if (orderPaymentCodes.length === 0) {
         rejected.push({
           order_id: order.order_id,
           order_number: order.order_number,
           reason: {
             field: 'payment_methods',
-            actual: order.payment_methods,
+            actual: order.payments,
             expected: safeFilters.payment_methods
           }
         });
         return false;
       }
-      var hasMatch = order.payment_methods.some(function (pm) {
-        return safeFilters.payment_methods.includes(pm);
+      var hasMatch = orderPaymentCodes.some(function (code) {
+        return safeFilters.payment_methods.includes(code);
       });
       if (!hasMatch) {
         rejected.push({
@@ -149,7 +163,7 @@ export function filterOrders(orders, filters) {
           order_number: order.order_number,
           reason: {
             field: 'payment_methods',
-            actual: order.payment_methods,
+            actual: orderPaymentCodes,
             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 quotationBridgeCustomerId?;
+    private quotationBridgeLoadedKey?;
     private quotationBridgeRefreshPromise?;
     private quotationBridgeRefreshKey?;
     private productDataSource;