@pisell/pisellos 2.2.215 → 2.2.217

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

@@ -334,7 +334,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private logSubmitBackendRejected;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/dist/modules/Order/index.js

@@ -2653,6 +2653,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var hasSyncedOrderPayment = function hasSyncedOrderPayment(payment) {
         return payment.order_payment_id !== undefined && payment.order_payment_id !== null;
       };
+      // const normalizeVoucherPaymentStatus = (payment: OrderPaymentSource): OrderPaymentSource => {
+      //   const paymentRecord = payment as Record<string, any>;
+      //   // if (paymentRecord.status !== 'active') return payment;
+      //   // return {
+      //   //   ...paymentRecord,
+      //   //   status: 'paid',
+      //   // };
+      //   if (paymentRecord.status === 'active') {
+      //     paymentRecord.status = 'paid'
+      //   }
+      //   return paymentRecord
+      // };
       var mappedVouchers = mapPaymentItemsToOrderPayments(payments.map(function (payment) {
         return _this15.normalizePaymentSource(payment, {
           defaultPaid: true
@@ -4185,7 +4197,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error('加载销售详情需要 lookup');
             case 3:
-              _context35.next = 5;
+              // 如果 lookup 是external_sale_number，则forceRemote强制为 false
+              if (lookup.startsWith('LOCAL_')) {
+                params.forceRemote = false;
+              }
+              _context35.next = 6;
               return this.request.get("/order/sales/".concat(encodeURIComponent(lookup)), _objectSpread({
                 with: ['products', 'bookings', 'payments', 'customer', 'summary', 'contacts_info']
               }, params.forceRemote ? {
@@ -4193,13 +4209,13 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               } : {}), {
                 osServer: true
               });
-            case 5:
+            case 6:
               res = _context35.sent;
               if (res.code === 200) {
                 this.store.lastOrderInfo = res.data;
               }
               return _context35.abrupt("return", res);
-            case 8:
+            case 9:
             case "end":
               return _context35.stop();
           }

package/dist/server/index.js

@@ -719,19 +719,28 @@ var Server = /*#__PURE__*/function () {
      */
     _defineProperty(this, "handleUpdateLocalOrder", /*#__PURE__*/function () {
       var _ref32 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(_ref31) {
-        var _ref33, _this$app;
+        var _data$order_id, _ref33, _this$app;
         var url, data, batchIds, rawOrderId, orderId, backendPath, _response$data, response, fresh, exists, _yield$_this$order$ov, overwritten, errorMessage;
         return _regeneratorRuntime().wrap(function _callee13$(_context13) {
           while (1) switch (_context13.prev = _context13.next) {
             case 0:
               url = _ref31.url, data = _ref31.data;
+              if (!(typeof (data === null || data === void 0 ? void 0 : data.order_id) === 'string' && data !== null && data !== void 0 && (_data$order_id = data.order_id) !== null && _data$order_id !== void 0 && _data$order_id.startsWith('LOCAL_'))) {
+                _context13.next = 3;
+                break;
+              }
+              return _context13.abrupt("return", {
+                code: 200,
+                status: true
+              });
+            case 3:
               batchIds = _this.parseOrderIdsParam(url, data);
               if (!(batchIds.length > 0)) {
-                _context13.next = 4;
+                _context13.next = 6;
                 break;
               }
               return _context13.abrupt("return", _this.handleUpdateLocalOrdersBatch(batchIds));
-            case 4:
+            case 6:
               rawOrderId = (_ref33 = data && _typeof(data) === 'object' ? data.order_id : undefined) !== null && _ref33 !== void 0 ? _ref33 : _this.extractQueryParam(url, 'order_id');
               orderId = rawOrderId === undefined || rawOrderId === null || rawOrderId === '' ? null : String(rawOrderId).trim();
               _this.logInfo('handleUpdateLocalOrder: 开始处理', {
@@ -739,7 +748,7 @@ var Server = /*#__PURE__*/function () {
                 orderId: orderId
               });
               if (orderId) {
-                _context13.next = 10;
+                _context13.next = 12;
                 break;
               }
               _this.logWarning('handleUpdateLocalOrder: order_id 缺失', {
@@ -752,9 +761,9 @@ var Server = /*#__PURE__*/function () {
                 message: 'order_id 缺失',
                 data: null
               });
-            case 10:
+            case 12:
               if (_this.order) {
-                _context13.next = 13;
+                _context13.next = 15;
                 break;
               }
               _this.logError('handleUpdateLocalOrder: Order 模块未注册');
@@ -764,9 +773,9 @@ var Server = /*#__PURE__*/function () {
                 message: 'Order 模块未注册',
                 data: null
               });
-            case 13:
+            case 15:
               if ((_this$app = _this.app) !== null && _this$app !== void 0 && _this$app.request) {
-                _context13.next = 16;
+                _context13.next = 18;
                 break;
               }
               _this.logError('handleUpdateLocalOrder: app.request 不可用');
@@ -776,18 +785,18 @@ var Server = /*#__PURE__*/function () {
                 message: 'app.request 不可用',
                 data: null
               });
-            case 16:
+            case 18:
               backendPath = "/shop/order/sales/".concat(encodeURIComponent(orderId), "?with%5B%5D=all");
-              _context13.prev = 17;
-              _context13.next = 20;
+              _context13.prev = 19;
+              _context13.next = 22;
               return _this.app.request.get(backendPath, undefined, {
                 isShopApi: true
               });
-            case 20:
+            case 22:
               response = _context13.sent;
               fresh = (_response$data = response === null || response === void 0 ? void 0 : response.data) !== null && _response$data !== void 0 ? _response$data : response;
               if (!(!fresh || _typeof(fresh) !== 'object' || fresh.order_id == null)) {
-                _context13.next = 25;
+                _context13.next = 27;
                 break;
               }
               _this.logError('handleUpdateLocalOrder: 后端返回订单为空', {
@@ -800,15 +809,15 @@ var Server = /*#__PURE__*/function () {
                 message: '后端返回订单为空',
                 data: null
               });
-            case 25:
+            case 27:
               exists = !!_this.order.getOrderByOrderId(orderId);
               if (!exists) {
-                _context13.next = 33;
+                _context13.next = 35;
                 break;
               }
-              _context13.next = 29;
+              _context13.next = 31;
               return _this.order.overwriteExistingOrder(fresh);
-            case 29:
+            case 31:
               _yield$_this$order$ov = _context13.sent;
               overwritten = _yield$_this$order$ov.overwritten;
               _this.logInfo('handleUpdateLocalOrder: 覆盖完成', {
@@ -825,10 +834,10 @@ var Server = /*#__PURE__*/function () {
                   order_id: orderId
                 }
               });
-            case 33:
-              _context13.next = 35;
-              return _this.order.upsertOrdersFromRemote([fresh]);
             case 35:
+              _context13.next = 37;
+              return _this.order.upsertOrdersFromRemote([fresh]);
+            case 37:
               _this.logInfo('handleUpdateLocalOrder: 本地合并新订单完成', {
                 orderId: orderId
               });
@@ -842,9 +851,9 @@ var Server = /*#__PURE__*/function () {
                   order_id: orderId
                 }
               });
-            case 39:
-              _context13.prev = 39;
-              _context13.t0 = _context13["catch"](17);
+            case 41:
+              _context13.prev = 41;
+              _context13.t0 = _context13["catch"](19);
               errorMessage = _context13.t0 instanceof Error ? _context13.t0.message : String(_context13.t0);
               _this.logError('handleUpdateLocalOrder: 请求失败', {
                 orderId: orderId,
@@ -857,11 +866,11 @@ var Server = /*#__PURE__*/function () {
                 message: errorMessage,
                 data: null
               });
-            case 44:
+            case 46:
             case "end":
               return _context13.stop();
           }
-        }, _callee13, null, [[17, 39]]);
+        }, _callee13, null, [[19, 41]]);
       }));
       return function (_x13) {
         return _ref32.apply(this, arguments);
@@ -4133,7 +4142,8 @@ var Server = /*#__PURE__*/function () {
     key: "handlePendingSyncCheckoutOrder",
     value: function () {
       var _handlePendingSyncCheckoutOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee45(params) {
-        var backendPath, data, title, reason, pendingOrder, errorMessage;
+        var _this10 = this;
+        var backendPath, data, title, reason, pendingOrder, _pendingOrder$payment, _pendingOrder$order_i, _pendingOrder$summary, _pendingOrder$summary2, _pendingOrder$summary3, changeGivenAmount, errorMessage;
         return _regeneratorRuntime().wrap(function _callee45$(_context45) {
           while (1) switch (_context45.prev = _context45.next) {
             case 0:
@@ -4176,21 +4186,34 @@ var Server = /*#__PURE__*/function () {
               _context45.next = 13;
               return this.order.upsertPendingSyncOrders([pendingOrder]);
             case 13:
-              this.logWarning("".concat(title, ": \u8BA2\u5355\u5DF2\u5199\u5165\u672C\u5730\u5F85\u540C\u6B65"), {
+              this.logInfo("".concat(title, ": \u8BA2\u5355\u5DF2\u5199\u5165\u672C\u5730\u5F85\u540C\u6B65"), {
                 backendPath: backendPath,
                 reason: reason,
                 order_id: pendingOrder.order_id,
                 external_sale_number: pendingOrder.external_sale_number,
                 order_number: pendingOrder.order_number
               });
+              changeGivenAmount = pendingOrder === null || pendingOrder === void 0 || (_pendingOrder$payment = pendingOrder.payments) === null || _pendingOrder$payment === void 0 ? void 0 : _pendingOrder$payment.reduce(function (sum, payment) {
+                var _payment$metadata;
+                return sum + _this10.toAmountNumber(payment === null || payment === void 0 || (_payment$metadata = payment.metadata) === null || _payment$metadata === void 0 ? void 0 : _payment$metadata.change_given_amount);
+              }, 0);
               return _context45.abrupt("return", {
                 code: 200,
                 status: true,
                 message: '',
-                data: pendingOrder
+                data: {
+                  order_id: (_pendingOrder$order_i = pendingOrder === null || pendingOrder === void 0 ? void 0 : pendingOrder.order_id) !== null && _pendingOrder$order_i !== void 0 ? _pendingOrder$order_i : pendingOrder === null || pendingOrder === void 0 ? void 0 : pendingOrder.external_sale_number,
+                  amount_gap: pendingOrder === null || pendingOrder === void 0 || (_pendingOrder$summary = pendingOrder.summary) === null || _pendingOrder$summary === void 0 ? void 0 : _pendingOrder$summary.amount_gap,
+                  expect_amount: pendingOrder === null || pendingOrder === void 0 || (_pendingOrder$summary2 = pendingOrder.summary) === null || _pendingOrder$summary2 === void 0 ? void 0 : _pendingOrder$summary2.expect_amount,
+                  total_amount: pendingOrder === null || pendingOrder === void 0 || (_pendingOrder$summary3 = pendingOrder.summary) === null || _pendingOrder$summary3 === void 0 ? void 0 : _pendingOrder$summary3.total_amount,
+                  payment_status: pendingOrder === null || pendingOrder === void 0 ? void 0 : pendingOrder.payment_status,
+                  payment_info: {
+                    current_change_given_amount: changeGivenAmount
+                  }
+                }
               });
-            case 17:
-              _context45.prev = 17;
+            case 18:
+              _context45.prev = 18;
               _context45.t0 = _context45["catch"](10);
               errorMessage = _context45.t0 instanceof Error ? _context45.t0.message : String(_context45.t0);
               this.logError("".concat(title, ": \u5199\u5165\u672C\u5730\u5F85\u540C\u6B65\u8BA2\u5355\u5931\u8D25"), {
@@ -4204,11 +4227,11 @@ var Server = /*#__PURE__*/function () {
                 message: errorMessage,
                 data: null
               });
-            case 22:
+            case 23:
             case "end":
               return _context45.stop();
           }
-        }, _callee45, this, [[10, 17]]);
+        }, _callee45, this, [[10, 18]]);
       }));
       function handlePendingSyncCheckoutOrder(_x48) {
         return _handlePendingSyncCheckoutOrder.apply(this, arguments);
@@ -4302,13 +4325,13 @@ var Server = /*#__PURE__*/function () {
   }, {
     key: "sumPaidOrderPayments",
     value: function sumPaidOrderPayments(payments) {
-      var _this10 = this;
+      var _this11 = this;
       if (!Array.isArray(payments)) return 0;
       return payments.reduce(function (sum, payment) {
         var _payment$amount;
         var status = String((payment === null || payment === void 0 ? void 0 : payment.status) || '').toLowerCase();
         if (status === 'voided' || status === 'failed' || status === 'cancelled') return sum;
-        return sum + _this10.toAmountNumber((_payment$amount = payment === null || payment === void 0 ? void 0 : payment.amount) !== null && _payment$amount !== void 0 ? _payment$amount : payment === null || payment === void 0 ? void 0 : payment.origin_amount);
+        return sum + _this11.toAmountNumber((_payment$amount = payment === null || payment === void 0 ? void 0 : payment.amount) !== null && _payment$amount !== void 0 ? _payment$amount : payment === null || payment === void 0 ? void 0 : payment.origin_amount);
       }, 0);
     }
   }, {
@@ -4324,7 +4347,7 @@ var Server = /*#__PURE__*/function () {
     value: function () {
       var _buildSmallTicketProductMap = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee48(order) {
         var _this$products,
-          _this11 = this;
+          _this12 = this;
         var products, productIds, entries;
         return _regeneratorRuntime().wrap(function _callee48$(_context48) {
           while (1) switch (_context48.prev = _context48.next) {
@@ -4345,20 +4368,20 @@ var Server = /*#__PURE__*/function () {
               _context48.next = 6;
               return Promise.all(productIds.map( /*#__PURE__*/function () {
                 var _ref57 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee47(id) {
-                  var _this11$products, _this11$products$getP, product;
+                  var _this12$products, _this12$products$getP, product;
                   return _regeneratorRuntime().wrap(function _callee47$(_context47) {
                     while (1) switch (_context47.prev = _context47.next) {
                       case 0:
                         _context47.prev = 0;
                         _context47.next = 3;
-                        return (_this11$products = _this11.products) === null || _this11$products === void 0 || (_this11$products$getP = _this11$products.getProductById) === null || _this11$products$getP === void 0 ? void 0 : _this11$products$getP.call(_this11$products, Number(id));
+                        return (_this12$products = _this12.products) === null || _this12$products === void 0 || (_this12$products$getP = _this12$products.getProductById) === null || _this12$products$getP === void 0 ? void 0 : _this12$products$getP.call(_this12$products, Number(id));
                       case 3:
                         product = _context47.sent;
                         return _context47.abrupt("return", product ? [String(id), product] : null);
                       case 7:
                         _context47.prev = 7;
                         _context47.t0 = _context47["catch"](0);
-                        _this11.logWarning('buildSmallTicketProductMap: 查询本地商品失败', {
+                        _this12.logWarning('buildSmallTicketProductMap: 查询本地商品失败', {
                           product_id: id,
                           error: _context47.t0 instanceof Error ? _context47.t0.message : String(_context47.t0)
                         });
@@ -4397,13 +4420,13 @@ var Server = /*#__PURE__*/function () {
   }, {
     key: "withPendingSyncProductTitles",
     value: function withPendingSyncProductTitles(order, productMap) {
-      var _this12 = this;
+      var _this13 = this;
       var products = Array.isArray(order.products) ? order.products : null;
       if (!(products !== null && products !== void 0 && products.length)) return order;
       return _objectSpread(_objectSpread({}, order), {}, {
         products: products.map(function (product) {
           return _objectSpread(_objectSpread({}, product), {}, {
-            product_title: _this12.buildProductTitleSnapshot(product, productMap)
+            product_title: _this13.buildProductTitleSnapshot(product, productMap)
           });
         })
       });
@@ -4414,7 +4437,7 @@ var Server = /*#__PURE__*/function () {
       var _product$product_id2,
         _product$product,
         _fallbackProduct$prod,
-        _this13 = this;
+        _this14 = this;
       var productId = (_product$product_id2 = product.product_id) !== null && _product$product_id2 !== void 0 ? _product$product_id2 : product.id;
       var fallbackProduct = productId !== undefined && productId !== null ? productMap[productId] || productMap[String(productId)] : null;
       var ownTitle = product.product_title || product.title || product.name || ((_product$product = product.product) === null || _product$product === void 0 ? void 0 : _product$product.title);
@@ -4422,7 +4445,7 @@ var Server = /*#__PURE__*/function () {
       var currentLocale = this.getProductTitleSnapshotCurrentLocale();
       var autoTitle = this.resolveFirstProductTitleValue(ownTitle) || this.resolveFirstProductTitleValue(fallbackTitle);
       return PRODUCT_TITLE_SNAPSHOT_KEYS.reduce(function (snapshot, key) {
-        snapshot[key] = _this13.resolveProductTitleValue(ownTitle, key, currentLocale) || _this13.resolveProductTitleValue(fallbackTitle, key, currentLocale) || (key === 'auto' || key === 'original' ? autoTitle : null);
+        snapshot[key] = _this14.resolveProductTitleValue(ownTitle, key, currentLocale) || _this14.resolveProductTitleValue(fallbackTitle, key, currentLocale) || (key === 'auto' || key === 'original' ? autoTitle : null);
         return snapshot;
       }, {});
     }
@@ -4950,10 +4973,10 @@ var Server = /*#__PURE__*/function () {
     value: function extractBackendErrorResponse(error) {
       var _error$response,
         _error$response2,
-        _this14 = this;
+        _this15 = this;
       var candidates = [error === null || error === void 0 || (_error$response = error.response) === null || _error$response === void 0 ? void 0 : _error$response.data, error === null || error === void 0 ? void 0 : error.data, error === null || error === void 0 || (_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : _error$response2.body, error === null || error === void 0 ? void 0 : error.body];
       return candidates.find(function (candidate) {
-        return _this14.isExplicitBackendErrorResponse(candidate);
+        return _this15.isExplicitBackendErrorResponse(candidate);
       }) || null;
     }
   }, {
@@ -5265,7 +5288,7 @@ var Server = /*#__PURE__*/function () {
     value: (function () {
       var _computeProductQueryResult = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee54(context, options) {
         var _menu_list_ids$length3,
-          _this15 = this;
+          _this16 = this;
         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 _callee54$(_context54) {
           while (1) switch (_context54.prev = _context54.next) {
@@ -5415,8 +5438,8 @@ var Server = /*#__PURE__*/function () {
                 tMenu = performance.now();
                 menuList = this.menu.getMenuByIds(menu_list_ids);
                 activeMenuList = menuList.filter(function (menu) {
-                  var _this15$schedule;
-                  return ((_this15$schedule = _this15.schedule) === null || _this15$schedule === void 0 ? void 0 : _this15$schedule.getDateIsInSchedule(schedule_datetime, menu.schedule)) || false;
+                  var _this16$schedule;
+                  return ((_this16$schedule = _this16.schedule) === null || _this16$schedule === void 0 ? void 0 : _this16$schedule.getDateIsInSchedule(schedule_datetime, menu.schedule)) || false;
                 });
                 perfMark('computeQuery.filterActiveMenu', performance.now() - tMenu, {
                   totalMenu: menuList.length,
@@ -5685,7 +5708,7 @@ var Server = /*#__PURE__*/function () {
   }, {
     key: "notifySalesSearchSubscribers",
     value: function notifySalesSearchSubscribers(payload) {
-      var _this16 = this;
+      var _this17 = this;
       if (this.salesSearchSubscribers.size === 0) return;
       var changedOrders = this.extractChangedOrdersFromPayload(payload);
       if (changedOrders.length === 0) {
@@ -5700,21 +5723,21 @@ var Server = /*#__PURE__*/function () {
             subscriber = _step19$value[1];
           try {
             var changedVisibleOrders = changedOrders.filter(function (order) {
-              var orderId = _this16.getSalesSearchOrderId(order);
+              var orderId = _this17.getSalesSearchOrderId(order);
               return !!orderId && subscriber.visibleOrderIds.has(orderId);
             });
             if (changedVisibleOrders.length === 0) {
               return 1; // continue
             }
-            subscriber.callback(_this16.buildSalesSearchDeltaResponse(subscriber, changedVisibleOrders));
-            _this16.logInfo('notifySalesSearchSubscribers: 已推送 delta', {
+            subscriber.callback(_this17.buildSalesSearchDeltaResponse(subscriber, changedVisibleOrders));
+            _this17.logInfo('notifySalesSearchSubscribers: 已推送 delta', {
               subscriberId: subscriberId,
               kind: subscriber.kind,
               count: changedVisibleOrders.length
             });
           } catch (error) {
             var errorMessage = error instanceof Error ? error.message : String(error);
-            _this16.logError('notifySalesSearchSubscribers: 推送失败', {
+            _this17.logError('notifySalesSearchSubscribers: 推送失败', {
               subscriberId: subscriberId,
               error: errorMessage
             });

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

@@ -43,6 +43,7 @@ export declare class OrderModule extends BaseModule implements Module {
      * @param metadata 日志元数据
      */
     private logError;
+    private logWarning;
     /**
      * 记录订单最近一次 SQLite 写入，供 pubsub 回声去重使用。
      *
@@ -119,6 +120,9 @@ export declare class OrderModule extends BaseModule implements Module {
     getRoutes(): RouteDefinition[];
     destroy(): void;
     private syncOrdersMap;
+    private getOrderMapKey;
+    private isBlankIdentityValue;
+    private getOrderIdentityEntries;
     private getOrderIdentityKeys;
     private extractResourceIds;
     private getOrderDateKey;
@@ -182,6 +186,15 @@ export declare class OrderModule extends BaseModule implements Module {
      * // => 'S-1001'
      */
     private getOrderStorageKey;
+    private getOrderIdentityMatchKeys;
+    private doOrdersShareIdentity;
+    private findOrderIndexByIdentity;
+    private getOrderCompletenessScore;
+    private pickPreferredOrder;
+    private mergeOrderRecords;
+    private summarizeDuplicateOrders;
+    private logDuplicateOrders;
+    private compactOrderListByIdentity;
     /**
      * 当前订单拉取窗口：
      * - 优先使用 createdAtQuery.sales_time_between（已按营业日边界初始化）