@pisell/pisellos 2.2.273 → 2.2.275

package/dist/server/index.js

@@ -58,6 +58,7 @@ import { getOrderPaymentIdentityKeys, isIdentifiedPendingOrderPayment, isPending
 /** 平面图 GET 查询订阅者（列表 / id 详情 / code 详情） */
 
 var PRODUCT_TITLE_SNAPSHOT_KEYS = ['en', 'ja', 'pt', 'auto', 'zh-CN', 'zh-HK', 'kitchen', 'original'];
+var AUTO_PRINT_STORAGE_KEY = 'auto_print';
 
 /**
  * Server 类
@@ -5716,7 +5717,7 @@ var Server = /*#__PURE__*/function () {
     key: "handleOrderCheckoutSubmit",
     value: function () {
       var _handleOrderCheckoutSubmit = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee58(params) {
-        var backendPath, data, title, normalizedData, checkoutData, pendingResult, _this$core$context2, pendingOrder, platform, isAndroid;
+        var backendPath, data, title, normalizedData, checkoutData, pendingResult, pendingOrder;
         return _regeneratorRuntime().wrap(function _callee58$(_context58) {
           while (1) switch (_context58.prev = _context58.next) {
             case 0:
@@ -5755,35 +5756,33 @@ var Server = /*#__PURE__*/function () {
             case 12:
               pendingResult = _context58.sent;
               if (!((pendingResult === null || pendingResult === void 0 ? void 0 : pendingResult.status) === true)) {
-                _context58.next = 22;
+                _context58.next = 20;
                 break;
               }
               pendingOrder = pendingResult.data;
-              platform = (_this$core$context2 = this.core.context) === null || _this$core$context2 === void 0 ? void 0 : _this$core$context2.getPlatform();
-              isAndroid = platform === 'android';
-              if (!(pendingOrder && this.shouldBuildSmallTicketData(checkoutData) && this.isSalesOrderFullyPaid(pendingOrder) && (
-              // TODO 这里先加个兼容，如果是安卓，则需要 type=virtual 才走打印，如果是苹果则无限制
-              isAndroid ? checkoutData.type === 'virtual' : true))) {
-                _context58.next = 20;
+              if (!(pendingOrder && this.shouldBuildSmallTicketData(checkoutData) && this.isSalesOrderFullyPaid(pendingOrder) && this.shouldAutoPrintCheckoutReceipt())) {
+                _context58.next = 18;
                 break;
               }
-              _context58.next = 20;
+              _context58.next = 18;
               return this.dispatchLocalReceiptPrint({
                 checkoutData: checkoutData,
                 order: pendingOrder,
                 response: pendingResult,
-                requireFullyPaid: true
+                requireFullyPaid: true,
+                // 自动小票固定使用 print_all 的收据类型 0，不随订单 type 改成券/手环类型 99。
+                isManualPrint: true
               });
-            case 20:
-              _context58.next = 22;
+            case 18:
+              _context58.next = 20;
               return this.dispatchCheckoutSyncTask({
                 backendPath: backendPath,
                 data: checkoutData,
                 title: title
               });
-            case 22:
+            case 20:
               if (pendingResult.data.order_id) {
-                _context58.next = 24;
+                _context58.next = 22;
                 break;
               }
               return _context58.abrupt("return", _objectSpread(_objectSpread({}, pendingResult), {}, {
@@ -5791,9 +5790,9 @@ var Server = /*#__PURE__*/function () {
                   order_id: pendingResult.data.external_sale_number
                 })
               }));
-            case 24:
+            case 22:
               return _context58.abrupt("return", pendingResult);
-            case 25:
+            case 23:
             case "end":
               return _context58.stop();
           }
@@ -6111,6 +6110,16 @@ var Server = /*#__PURE__*/function () {
       }
       return buildPendingSyncCheckoutOrder;
     }()
+    /**
+     * Android 结账自动小票由当前设备设置控制；其它平台保持原有行为。
+     */
+  }, {
+    key: "shouldAutoPrintCheckoutReceipt",
+    value: function shouldAutoPrintCheckoutReceipt() {
+      var _this$core$context2, _this$core$context2$g, _this$app17, _this$app17$getStorag;
+      if (((_this$core$context2 = this.core.context) === null || _this$core$context2 === void 0 || (_this$core$context2$g = _this$core$context2.getPlatform) === null || _this$core$context2$g === void 0 ? void 0 : _this$core$context2$g.call(_this$core$context2)) !== 'android') return true;
+      return ((_this$app17 = this.app) === null || _this$app17 === void 0 || (_this$app17 = _this$app17.storage) === null || _this$app17 === void 0 || (_this$app17$getStorag = _this$app17.getStorage) === null || _this$app17$getStorag === void 0 ? void 0 : _this$app17$getStorag.call(_this$app17, AUTO_PRINT_STORAGE_KEY)) === 'true';
+    }
   }, {
     key: "shouldBuildSmallTicketData",
     value: function shouldBuildSmallTicketData(order) {
@@ -6751,7 +6760,7 @@ var Server = /*#__PURE__*/function () {
     key: "handleUpdateLocalOrdersBatch",
     value: (function () {
       var _handleUpdateLocalOrdersBatch = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee69(orderIds) {
-        var _this$app17;
+        var _this$app18;
         var existedBefore, _iterator14, _step14, id, fetched, message, fetchedMap, _iterator15, _step15, order, oid, freshOrders, succeedIds, failed, _iterator16, _step16, _id, fresh, _message2, overwritten, inserted;
         return _regeneratorRuntime().wrap(function _callee69$(_context69) {
           while (1) switch (_context69.prev = _context69.next) {
@@ -6772,7 +6781,7 @@ var Server = /*#__PURE__*/function () {
                 data: null
               });
             case 4:
-              if ((_this$app17 = this.app) !== null && _this$app17 !== void 0 && _this$app17.request) {
+              if ((_this$app18 = this.app) !== null && _this$app18 !== void 0 && _this$app18.request) {
                 _context69.next = 7;
                 break;
               }

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

@@ -14,7 +14,7 @@ export { QuotationHooks } from './quotation/types';
 export { ScheduleModuleEx } from './schedule';
 export type { ScheduleState, ScheduleItem } from './schedule/types';
 export { OrderModule } from './order';
-export type { OrderState, OrderData, OrderId, OrderSummary, OrderBookingItem, OrderProductLineItem, OrderPaymentItem, OrderSurchargeItem, OrderProductDiscountItem, OrderWithoutBookings, BookingData, OrderFilters, BookingFilters, OrderFilterResult, OrderFilterRejectDetail, OrderFilterRejectedEntry, BookingFilterResult, OrderModulePagedResult, } from './order/types';
+export type { OrderState, OrderData, OrderId, OrderSummary, OrderBookingItem, OrderProductLineItem, OrderPaymentItem, OrderSurchargeItem, OrderProductDiscountItem, OrderWithoutBookings, BookingData, OrderFilters, BookingFilters, OrderFilterResult, OrderFilterRejectDetail, OrderFilterRejectedEntry, BookingFilterResult, OrderModulePagedResult, RemoteProductMembershipChangedPayload, RemoteProductMembershipChangeSource, } from './order/types';
 export { OrderHooks } from './order/types';
 export { PaymentServerModule } from './payment';
 export type { PaymentMethod, PaymentMethodsChangedEventData, PaymentServerState } from './payment/types';

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

@@ -30,6 +30,10 @@ export declare class OrderModule extends BaseModule implements Module {
      * await this.emitOrdersChanged([freshOrder], 'pubsub.bodyUpsert')
      */
     private emitOrdersChanged;
+    /**
+     * 广播远端商品成员增删。监听器异常必须与订单落库和原有订单广播隔离。
+     */
+    private emitRemoteProductMembershipChanges;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     /**
      * 记录信息日志
@@ -231,6 +235,18 @@ export declare class OrderModule extends BaseModule implements Module {
      */
     private lookupOrderIndexByIdentityKeys;
     private isRemoteEchoMergeSource;
+    private getProductMembershipKey;
+    private doProductsHaveStableMembershipIdentity;
+    /**
+     * 冲突提示关注逻辑商品行，而不是服务端 checkout 过程中可能被重建的 detail 记录。
+     * 通用集合合并仍以 order_detail_id 为事实主键；这里只允许相同稳定 UID 跨 detail id 对齐，
+     * 避免本机 checkout 回声被误判成“一删一增”。
+     */
+    private isSameProductMembershipItem;
+    /**
+     * 对比合并前后的商品成员集合。商品字段修改与数组重排不会产生 diff。
+     */
+    private getRemoteProductMembershipChange;
     /**
      * 将订单的全部身份键登记到索引并指向其在列表中的下标。
      * 合并后订单新增的身份字段（如挂单同步后拿到 order_id）也会被登记。