@pisell/pisellos 2.2.257 → 2.2.259

package/dist/solution/BaseSales/types.d.ts

@@ -14,6 +14,7 @@ export declare const BaseSalesHookNames: {
     readonly onCartValidationChanged: "onCartValidationChanged";
     readonly onPaymentSyncStart: "onPaymentSyncStart";
     readonly onPaymentSyncEnd: "onPaymentSyncEnd";
+    readonly onDepositPaymentSyncEnd: "onDepositPaymentSyncEnd";
 };
 export type BaseSalesHookName = typeof BaseSalesHookNames[keyof typeof BaseSalesHookNames];
 export declare function createBaseSalesHook(moduleName: string, hookName: BaseSalesHookName): string;

package/dist/solution/BaseSales/types.js

@@ -9,7 +9,8 @@ export var BaseSalesHookNames = {
   onRefresh: 'onRefresh',
   onCartValidationChanged: 'onCartValidationChanged',
   onPaymentSyncStart: 'onPaymentSyncStart',
-  onPaymentSyncEnd: 'onPaymentSyncEnd'
+  onPaymentSyncEnd: 'onPaymentSyncEnd',
+  onDepositPaymentSyncEnd: 'onDepositPaymentSyncEnd'
 };
 export function createBaseSalesHook(moduleName, hookName) {
   return "".concat(moduleName, ":").concat(hookName);

package/dist/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -66,7 +66,8 @@ function normalizeBundleItems(bundleItems) {
       price: (_bundleItem$price3 = bundleItem.price) !== null && _bundleItem$price3 !== void 0 ? _bundleItem$price3 : unitStr,
       bundle_selling_price: unitStr,
       original_price: (_ref8 = (_ref9 = (_bundleItem$original_ = bundleItem.original_price) !== null && _bundleItem$original_ !== void 0 ? _bundleItem$original_ : bundleItem.product_price) !== null && _ref9 !== void 0 ? _ref9 : bundleItem.price) !== null && _ref8 !== void 0 ? _ref8 : unitStr,
-      option: normalizeOptionItems(bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.option)
+      option: normalizeOptionItems(bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.option),
+      discount_list: preferPriceField ? [] : bundleItem.discount_list
     });
     // bundle_selling_price 落「正净额」：markdown = |price| − Σoptions；markup/原价维持原值。
     normalizedItem.bundle_selling_price = getBundleSellingMagnitude(magnitudeSource).toFixed(2);

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

@@ -551,6 +551,14 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     setOtherParams(params: Record<string, any>, { cover }?: {
         cover?: boolean;
     }): Promise<void>;
+    private getDeviceTaskPlugin;
+    handlePrintWristband(params: {
+        voucher_ids: number[];
+    }): Promise<void>;
+    handleRedeem(params: {
+        voucher_ids: number[];
+        is_checkin: boolean;
+    }): Promise<any>;
     /**
      * 销毁模块：先调用父类（销毁所有 store 内子模块 + emit destroy + super.destroy()），
      * 再清理 BookingTicket 自有资源（scan 监听 + scan 内存缓存）。

package/dist/solution/BookingTicket/index.js

@@ -49,6 +49,7 @@ import { buildNormalProductCacheItemFromOrderLine as buildNormalProductCacheItem
 import { buildProductOptionStringFromOrderLine } from "../../modules/BookingContext/utils/orderLineDisplay";
 import { applyBookingsStatus, applyChildBookingStatus, resolveScheduleId, resolveStatusAfterTransition, restoreBookingsStatus, restoreChildBookingStatus } from "./utils/bookingStatus";
 import { resolveBestAddTimePlan as _resolveBestAddTimePlan } from "./utils/resolveBestAddTimePlan";
+import { createUuidV4 } from "../../modules/Order/utils";
 var OPEN_DATA_SECTION_CODES = ['sale', 'reservation', 'fulfillment', 'menu', 'workflow'];
 var OPEN_DATA_CACHE_TTL = 5 * 60 * 1000;
 
@@ -2586,6 +2587,152 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
       }
       return setOtherParams;
     }()
+  }, {
+    key: "getDeviceTaskPlugin",
+    value: function getDeviceTaskPlugin() {
+      var _app$getApp;
+      var app = this.core.getPlugin('app');
+      return (app === null || app === void 0 || (_app$getApp = app.getApp()) === null || _app$getApp === void 0 ? void 0 : _app$getApp.getPlugin('deviceTask')) || null;
+    }
+
+    // 打印手环，单个或批量都可以
+  }, {
+    key: "handlePrintWristband",
+    value: function () {
+      var _handlePrintWristband = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee32(params) {
+        var _this$getOrderIdentit;
+        var deviceTask, deviceId, idempotencyKey;
+        return _regeneratorRuntime().wrap(function _callee32$(_context32) {
+          while (1) switch (_context32.prev = _context32.next) {
+            case 0:
+              deviceTask = this.getDeviceTaskPlugin();
+              if (deviceTask !== null && deviceTask !== void 0 && deviceTask.dispatch) {
+                _context32.next = 4;
+                break;
+              }
+              this.logger.addLog({
+                type: 'info',
+                title: '[BookingTicket] handlePrintWristband: deviceTask.dispatch 不可用',
+                metadata: {
+                  voucher_ids: Array.isArray(params.voucher_ids) ? params.voucher_ids : [params.voucher_ids]
+                }
+              });
+              return _context32.abrupt("return");
+            case 4:
+              this.logger.addLog({
+                type: 'info',
+                title: '[BookingTicket] handlePrintWristband',
+                metadata: {
+                  voucher_ids: Array.isArray(params.voucher_ids) ? params.voucher_ids : [params.voucher_ids]
+                }
+              });
+              _context32.next = 7;
+              return this.getShortNumberOrDeviceId();
+            case 7:
+              deviceId = _context32.sent;
+              idempotencyKey = createUuidV4();
+              deviceTask.dispatch({
+                action: 'print_all',
+                device_id: deviceId,
+                payload: {
+                  type: 'WRISTBAND',
+                  data: {
+                    order_id: (_this$getOrderIdentit = this.getOrderIdentity()) === null || _this$getOrderIdentit === void 0 ? void 0 : _this$getOrderIdentit.orderId,
+                    voucher_ids: Array.isArray(params.voucher_ids) ? params.voucher_ids : [params.voucher_ids]
+                  }
+                },
+                idempotency_key: idempotencyKey,
+                name: 'PRINT_WRISTBAND',
+                source: 'bookingTicket',
+                source_type: 'handlePrintWristband',
+                source_id: idempotencyKey
+              });
+            case 10:
+            case "end":
+              return _context32.stop();
+          }
+        }, _callee32, this);
+      }));
+      function handlePrintWristband(_x23) {
+        return _handlePrintWristband.apply(this, arguments);
+      }
+      return handlePrintWristband;
+    }() // 触发核销
+  }, {
+    key: "handleRedeem",
+    value: function () {
+      var _handleRedeem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee33(params) {
+        var _this$store$order5, _this$store$order5$ge, _this$store$order6, _ref20, _tempOrder$order_id2;
+        var voucherIds, status, voucherIdSet, tempOrder, vouchers, hasUpdatedVoucher, nextVouchers, identity, externalSaleNumber, orderId, orderLookup;
+        return _regeneratorRuntime().wrap(function _callee33$(_context33) {
+          while (1) switch (_context33.prev = _context33.next) {
+            case 0:
+              voucherIds = Array.isArray(params.voucher_ids) ? params.voucher_ids : [];
+              status = params.is_checkin ? 'used' : 'unused';
+              this.logger.addLog({
+                type: 'info',
+                title: '[BookingTicket] handleRedeem',
+                metadata: {
+                  voucher_ids: voucherIds,
+                  status: status
+                }
+              });
+              voucherIdSet = new Set(voucherIds);
+              tempOrder = (_this$store$order5 = this.store.order) === null || _this$store$order5 === void 0 || (_this$store$order5$ge = _this$store$order5.getTempOrder) === null || _this$store$order5$ge === void 0 ? void 0 : _this$store$order5$ge.call(_this$store$order5);
+              vouchers = (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.vouchers) || ((_this$store$order6 = this.store.order) === null || _this$store$order6 === void 0 ? void 0 : _this$store$order6.getVouchers()) || [];
+              hasUpdatedVoucher = false;
+              nextVouchers = vouchers.map(function (voucher) {
+                if (!voucherIdSet.has(voucher.voucher_id)) return voucher;
+                hasUpdatedVoucher = true;
+                return _objectSpread(_objectSpread({}, voucher), {}, {
+                  status: status
+                });
+              });
+              if (!(tempOrder && hasUpdatedVoucher)) {
+                _context33.next = 11;
+                break;
+              }
+              _context33.next = 11;
+              return this.replaceTempOrder(_objectSpread(_objectSpread({}, tempOrder), {}, {
+                vouchers: nextVouchers
+              }));
+            case 11:
+              this.core.effects.emit("".concat(this.name, ":onVouchersChange"), {});
+              if (!(voucherIds.length === 0)) {
+                _context33.next = 14;
+                break;
+              }
+              return _context33.abrupt("return", {
+                code: 200,
+                status: true,
+                message: '',
+                data: []
+              });
+            case 14:
+              identity = this.getOrderIdentity();
+              externalSaleNumber = (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.external_sale_number) || (identity === null || identity === void 0 ? void 0 : identity.externalSaleNumber) || undefined;
+              orderId = (_ref20 = (_tempOrder$order_id2 = tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.order_id) !== null && _tempOrder$order_id2 !== void 0 ? _tempOrder$order_id2 : identity === null || identity === void 0 ? void 0 : identity.orderId) !== null && _ref20 !== void 0 ? _ref20 : undefined;
+              orderLookup = externalSaleNumber || orderId || (identity === null || identity === void 0 ? void 0 : identity.orderNumber) || (identity === null || identity === void 0 ? void 0 : identity.shopOrderNumber) || (identity === null || identity === void 0 ? void 0 : identity.shopFullOrderNumber) || undefined;
+              return _context33.abrupt("return", this.request.post('/machinecode/batch', {
+                ids: voucherIds,
+                status: status,
+                order_lookup: orderLookup,
+                order_id: orderId,
+                external_sale_number: externalSaleNumber
+              }, {
+                osServer: true
+              }));
+            case 19:
+            case "end":
+              return _context33.stop();
+          }
+        }, _callee33, this);
+      }));
+      function handleRedeem(_x24) {
+        return _handleRedeem.apply(this, arguments);
+      }
+      return handleRedeem;
+    }()
     /**
      * 销毁模块：先调用父类（销毁所有 store 内子模块 + emit destroy + super.destroy()），
      * 再清理 BookingTicket 自有资源（scan 监听 + scan 内存缓存）。
@@ -2593,12 +2740,12 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "destroy",
     value: (function () {
-      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee32() {
+      var _destroy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34() {
         var _this$scan;
-        return _regeneratorRuntime().wrap(function _callee32$(_context32) {
-          while (1) switch (_context32.prev = _context32.next) {
+        return _regeneratorRuntime().wrap(function _callee34$(_context34) {
+          while (1) switch (_context34.prev = _context34.next) {
             case 0:
-              _context32.next = 2;
+              _context34.next = 2;
               return _get(_getPrototypeOf(BookingTicketImpl.prototype), "destroy", this).call(this);
             case 2:
               try {
@@ -2609,9 +2756,9 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               scanCache.clear();
             case 4:
             case "end":
-              return _context32.stop();
+              return _context34.stop();
           }
-        }, _callee32, this);
+        }, _callee34, this);
       }));
       function destroy() {
         return _destroy.apply(this, arguments);

package/lib/modules/BookingContext/utils/buildCacheItemFromOrderLine.js

@@ -142,6 +142,14 @@ function resolveMainProductPrice(product, fallback) {
   const parsed = Number(value);
   return Number.isFinite(parsed) ? parsed : fallback;
 }
+function mapOrderBundleToOtherBundle(bundle) {
+  return bundle.map((item) => {
+    return {
+      ...item,
+      original_price: item.original_price ?? item.bundle_selling_price ?? item.price
+    };
+  });
+}
 function synthesizeProductResourceFromBooking(booking) {
   const rows = booking == null ? void 0 : booking.resources;
   if (!Array.isArray(rows) || rows.length === 0)
@@ -191,7 +199,9 @@ function buildCacheItemFromOrderLine(input) {
   const other = {
     product_variant_id: product.product_variant_id ?? 0,
     option: (0, import_utils.getProductSkuOptions)(product),
-    bundle: Array.isArray(product.product_bundle) ? [...product.product_bundle] : []
+    bundle: mapOrderBundleToOtherBundle(
+      Array.isArray(product.product_bundle) ? product.product_bundle : []
+    )
   };
   const extend = {
     start_date: startDate ? (0, import_dayjs.default)(startDate) : void 0,

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

@@ -154,10 +154,21 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private calculatePaymentTotal;
     private getDepositAmount;
     private normalizeDepositAmount;
+    private getLastOrderDepositSnapshot;
+    private getLastOrderSubmitSnapshot;
     private applyDepositAmountToSummary;
+    private applyLastOrderDepositSnapshot;
     private isDepositOrder;
     private getOrderExpectedAmount;
     private isDepositCovered;
+    getPaymentCompletion(payments?: OrderPaymentSource[]): {
+        isFullyPaid: boolean;
+        isOrderFullyPaid: boolean;
+        isDepositFullyPaid: boolean;
+        paymentStage: 'deposit' | 'normal';
+        depositAmount: string;
+        orderExpectedAmount: string;
+    };
     private calculateDepositPaidAmount;
     private resolveNextOrderPaymentType;
     private normalizePaymentSource;
@@ -186,6 +197,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private clearManualDepositOverride;
     private getOriginalSalesSnapshot;
     private isSnapshotPayableAmountUnchanged;
+    private hasShopDiscountChangedFromSnapshot;
     private restoreOriginalSnapshotIfProductsUnchanged;
     private clearPersistedAmountFieldsForFullRecalc;
     private getPaymentTargetAmount;
@@ -219,6 +231,8 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      * const ids = this.collectBookingHolderRecords(booking);
      */
     private collectBookingHolderRecords;
+    private setProductHolderFromBooking;
+    private syncLinkedBookingHoldersToProducts;
     /**
      * 按 form_record 顺序读取 booking holder 的主字段名称。
      *
@@ -301,13 +315,27 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     updateOrderPayment(paymentIdentity: string | number, updates: Partial<OrderPaymentData> & Record<string, any>): OrderPaymentData[];
     /** 从当前订单支付项中移除指定支付项。 */
     deleteOrderPayment(paymentIdentity: string | number): OrderPaymentData[];
+    private confirmPendingVoucherPaymentsInList;
+    private discardPendingVoucherPaymentsFromList;
+    private prepareVoucherPaymentsForSubmit;
+    private applyPaymentLifecycleChange;
+    confirmPendingVoucherPayments(options?: {
+        persist?: boolean;
+        recalculateSummary?: boolean;
+    }): OrderPaymentData[];
+    discardPendingVoucherPayments(options?: {
+        persist?: boolean;
+        recalculateSummary?: boolean;
+    }): OrderPaymentData[];
     /**
      * 覆盖当前订单中的 wallet pass 支付项。
      *
      * 判断口径与 PaymentModal 保持一致：voucher_id 存在且不为 0 的支付项
      * 视为 wallet pass；其它支付项保持不变。
      */
-    updateVoucherOrderPayments(payments: OrderPaymentSource[]): OrderPaymentData[];
+    updateVoucherOrderPayments(payments: OrderPaymentSource[], options?: {
+        status?: 'paid' | 'payment_pending';
+    }): OrderPaymentData[];
     private shouldMergeProductToOrder;
     private hasOrderProductLineNote;
     /**
@@ -407,6 +435,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         payments?: OrderPaymentSource[];
         paymentStatus?: SubmitSalesOrderParams['query']['payment_status'];
         smallTicketDataFlag?: number;
+        confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     submitTempOrderAsync<T = any>(params?: {
@@ -418,6 +447,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         payments?: OrderPaymentSource[];
         paymentStatus?: SubmitSalesOrderParams['query']['payment_status'];
         smallTicketDataFlag?: number;
+        confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     private runSubmitTempOrder;
@@ -497,5 +527,6 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private normalizeHydratedOrderProduct;
     getLastOrderInfo(): Record<string, any> | undefined;
     getOrderInfo(order_id: number): Promise<any>;
+    getVouchers(): any[];
 }
 export type { UpdateOrderBookingParams, UpdateOrderProductParams, UpdateOrderProductQuantityParams, } from './types';