@pisell/pisellos 2.2.164 → 2.2.165

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

@@ -107,7 +107,7 @@ export interface OrderTempOrder {
     shop_order_number: string | null;
     shop_full_order_number: string | null;
     type: string;
-    business_code: string;
+    business_code?: string;
     platform: string;
     sales_channel: string;
     order_sales_channel: string;
@@ -193,6 +193,11 @@ export interface UpdateOrderProductParams {
     product_bundle?: any[];
     booking?: AddProductBookingInput;
 }
+/** 仅更新购物车行数量；行定位语义与 updateOrderProduct / removeProductFromOrder 保持一致 */
+export interface UpdateOrderProductQuantityParams extends OrderProductIdentity {
+    num: number;
+    identity_key?: string;
+}
 export interface UpdateOrderBookingParams {
     unique_identification_number: string;
     updates: AddProductBookingInput;
@@ -251,7 +256,7 @@ export interface SubmitSalesOrderParams {
         shop_order_number: string | null;
         shop_full_order_number: string | null;
         type: string;
-        business_code: string;
+        business_code?: string;
         platform: string;
         request_unique_idempotency_token?: string;
         sales_channel: string;
@@ -362,6 +367,7 @@ export interface SyncPaymentsToOrderParams {
     paymentStatus?: SubmitSalesOrderParams['query']['payment_status'];
     submitWhenPaid?: boolean;
     smallTicketDataFlag?: number;
+    channel?: string;
 }
 export interface SyncPaymentsToOrderResult<T = any> {
     isFullyPaid: boolean;
@@ -482,8 +488,14 @@ export interface OrderModuleAPI {
     updateTempOrderContactsInfo: (contactsInfo: Record<string, any> | null) => Record<string, any> | null;
     addProductToOrder: (product: Partial<OrderProduct> & OrderProductIdentity, booking?: AddProductBookingInput) => Promise<OrderProduct[]>;
     updateOrderProduct: (params: UpdateOrderProductParams) => Promise<OrderProduct[]>;
+    updateOrderProductQuantity: (params: UpdateOrderProductQuantityParams) => Promise<OrderProduct[]>;
     updateOrderBooking: (params: UpdateOrderBookingParams) => any[];
     removeProductFromOrder: (identity: OrderProductIdentity) => Promise<OrderProduct[]>;
+    /**
+     * 仅清空购物车行：products / bookings / discount_list（保留客户、备注、支付等其它 tempOrder 字段）。
+     * 内部会 applyDiscount + recalculateSummary + persist。
+     */
+    clearOrderCartLines: () => Promise<OrderTempOrder>;
     persistTempOrder: () => void;
     submitTempOrder: <T = any>(params?: {
         cacheId?: string;

package/dist/modules/Order/types.js

@@ -29,6 +29,8 @@ export var OrderHooks = /*#__PURE__*/function (OrderHooks) {
 
 /** 更新购物车行：仅传 SKU 时命中同 SKU 第一行；多行同 SKU 须传 unique_identification_number / 选项指纹等 */
 
+/** 仅更新购物车行数量；行定位语义与 updateOrderProduct / removeProductFromOrder 保持一致 */
+
 /**
  * 订单信息
  */

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

@@ -65,6 +65,16 @@ export declare function sumOptionUnitPrice(options?: Array<{
  *
  * 导出为纯函数方便单测直接驱动钩子，不依赖 OrderModule 实例。
  */
+/** Rules calcDiscount 用手动价标记；undefined 表示交给 Rules 用 total/origin_total 推断 */
+export declare function resolveRulesManualDiscountFlag(metadata: Record<string, any> | null | undefined): boolean | undefined;
+/**
+ * 手动改价（price_override）时行级 original_price：
+ * 购物车划线价应对齐改价前的 origin_total（如 40），而非 bundle 子项 catalog 原价合成的 30。
+ */
+export declare function resolveManualOverrideLineOriginalPrice(params: {
+    num?: number;
+    metadata?: Record<string, any> | null;
+}, fallbackCompositeOriginal: string): string;
 export declare function createDefaultOrderRulesHooks(): RulesParamsHooks;
 /**
  * 通过 session 类商品的开始时间结束时间生成商品的时长

package/dist/modules/Order/utils.js

@@ -113,6 +113,42 @@ export function sumOptionUnitPrice(options) {
  *
  * 导出为纯函数方便单测直接驱动钩子，不依赖 OrderModule 实例。
  */
+
+/** Rules calcDiscount 用手动价标记；undefined 表示交给 Rules 用 total/origin_total 推断 */
+export function resolveRulesManualDiscountFlag(metadata) {
+  if (!metadata) return undefined;
+  if (metadata.is_manual_discount === true || metadata.is_manual_discount === 1) {
+    return true;
+  }
+  var priceOverride = metadata.price_override;
+  if (priceOverride !== undefined && priceOverride !== null && priceOverride !== '') {
+    return true;
+  }
+  return undefined;
+}
+
+/**
+ * 手动改价（price_override）时行级 original_price：
+ * 购物车划线价应对齐改价前的 origin_total（如 40），而非 bundle 子项 catalog 原价合成的 30。
+ */
+export function resolveManualOverrideLineOriginalPrice(params, fallbackCompositeOriginal) {
+  var _metadata$origin;
+  var metadata = params.metadata || {};
+  var priceOverride = metadata.price_override;
+  if (priceOverride === undefined || priceOverride === null || priceOverride === '') {
+    return fallbackCompositeOriginal;
+  }
+  var refTotal = (_metadata$origin = metadata.origin) === null || _metadata$origin === void 0 || (_metadata$origin = _metadata$origin._extend) === null || _metadata$origin === void 0 ? void 0 : _metadata$origin.origin_total;
+  if (refTotal === undefined || refTotal === null || refTotal === '') {
+    return fallbackCompositeOriginal;
+  }
+  var parsed = Number(refTotal);
+  if (!Number.isFinite(parsed)) {
+    return fallbackCompositeOriginal;
+  }
+  var num = Number(params.num) > 0 ? Number(params.num) : 1;
+  return new Decimal(parsed).dividedBy(num).toDecimalPlaces(2).toFixed(2);
+}
 export function createDefaultOrderRulesHooks() {
   var toUnitPriceString = function toUnitPriceString(totalLike, num) {
     var effectiveNum = Number(num) > 0 ? Number(num) : 1;
@@ -120,7 +156,7 @@ export function createDefaultOrderRulesHooks() {
   };
   return {
     getProduct: function getProduct(product) {
-      var _product$metadata, _product$metadata2, _product$metadata3, _product$metadata4, _product$metadata5, _product$metadata6;
+      var _product$metadata, _product$metadata2, _product$metadata3, _product$metadata4, _product$metadata5;
       // source_product_price 是权威源；兜底链：source → mainSelling − options（反推）→ 行 selling_price
       var metadataAny = product.metadata || {};
       var optionSum = sumOptionUnitPrice(product.product_option_item);
@@ -161,9 +197,11 @@ export function createDefaultOrderRulesHooks() {
         bundle: product.product_bundle || [],
         booking_id: ((_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.booking_id) || null,
         isClient: false,
-        isManualDiscount: ((_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.is_manual_discount) || false,
-        holder_id: (_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.holder_id,
-        startDate: ((_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.start_date) || ((_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.startDate)
+        // 勿写死 false：否则 Rules 不会走 total≠origin_total 的手动价推断，
+        // 无券时会把 bundle 价还原成 original_price（手动改价套餐会从 20 回到 30）。
+        isManualDiscount: resolveRulesManualDiscountFlag(metadataAny),
+        holder_id: (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.holder_id,
+        startDate: ((_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.start_date) || ((_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.startDate)
       };
     },
     setProduct: function setProduct(product, values) {
@@ -196,9 +234,13 @@ export function createDefaultOrderRulesHooks() {
         bundle: nextBundle,
         useOriginalBundle: true
       });
+      var finalOriginalPrice = resolveManualOverrideLineOriginalPrice({
+        num: nextNum,
+        metadata: metadataAny
+      }, composedOriginalPrice);
       return _objectSpread(_objectSpread({}, product), {}, {
         selling_price: composedSellingPrice,
-        original_price: composedOriginalPrice,
+        original_price: finalOriginalPrice,
         discount_list: (_values$discount_list = values.discount_list) !== null && _values$discount_list !== void 0 ? _values$discount_list : product.discount_list,
         num: (_values$quantity2 = values.quantity) !== null && _values$quantity2 !== void 0 ? _values$quantity2 : product.num,
         product_bundle: nextBundle,
@@ -505,8 +547,8 @@ export function createDefaultTempOrder(params) {
     order_number: null,
     shop_order_number: null,
     shop_full_order_number: null,
-    type: 'appointment_booking',
-    business_code: 'appointment_booking',
+    type: '',
+    business_code: undefined,
     platform: 'h5',
     sales_channel: 'my_pisel',
     order_sales_channel: 'online_store',
@@ -548,7 +590,7 @@ export function createDefaultTempOrder(params) {
   };
 }
 export function buildSubmitPayload(params) {
-  var _ref10, _ref11, _ref12, _tempOrder$is_price_i, _tempOrder$is_deposit;
+  var _ref10, _tempOrder$is_price_i, _tempOrder$is_deposit;
   var tempOrder = params.tempOrder,
     cacheId = params.cacheId,
     _params$now = params.now,
@@ -579,16 +621,26 @@ export function buildSubmitPayload(params) {
     _createDate = _ref9.create_date,
     _holderId = _ref9.holder_id,
     tempOrderRest = _objectWithoutProperties(_ref9, _excluded3);
+  var submitType = type !== null && type !== void 0 ? type : tempOrder.type;
+  if (!submitType) {
+    var _tempOrder$bookings;
+    // 如果外部没有传递 types，根据订单里当前是否有 bookings 来决定是 appointment_booking 还是 virtual
+    if (tempOrder !== null && tempOrder !== void 0 && (_tempOrder$bookings = tempOrder.bookings) !== null && _tempOrder$bookings !== void 0 && _tempOrder$bookings.length) {
+      submitType = 'appointment_booking';
+    } else {
+      submitType = 'virtual';
+    }
+  }
   var payload = _objectSpread(_objectSpread({}, tempOrderRest), {}, {
     order_number: null,
     shop_order_number: null,
     shop_full_order_number: null,
     platform: normalizeSubmitPlatform(platform),
     request_unique_idempotency_token: tempOrder.request_unique_idempotency_token || "".concat(tempOrder.external_sale_number, "_").concat(now.getTime()),
-    type: (_ref10 = type !== null && type !== void 0 ? type : tempOrder.type) !== null && _ref10 !== void 0 ? _ref10 : 'table-order',
-    business_code: (_ref11 = businessCode !== null && businessCode !== void 0 ? businessCode : tempOrder.business_code) !== null && _ref11 !== void 0 ? _ref11 : 'table-order',
+    type: submitType,
+    business_code: businessCode !== null && businessCode !== void 0 ? businessCode : tempOrder.business_code,
     sales_channel: tempOrder.sales_channel || 'my_pisel',
-    order_sales_channel: (_ref12 = channel !== null && channel !== void 0 ? channel : tempOrder.order_sales_channel) !== null && _ref12 !== void 0 ? _ref12 : 'online_store',
+    order_sales_channel: (_ref10 = channel !== null && channel !== void 0 ? channel : tempOrder.order_sales_channel) !== null && _ref10 !== void 0 ? _ref10 : 'online_store',
     status: tempOrder.status || 'normal',
     payment_status: tempOrder.payment_status || 'payment_processing',
     // shipping_status: tempOrder.shipping_status || 'unfulfilled',
@@ -615,10 +667,10 @@ export function buildSubmitPayload(params) {
     // holder: tempOrder.holder || null,
     // summary,
     metadata: function () {
-      var _ref13 = tempOrder.metadata || {},
-        _collectPax = _ref13.collect_pax,
-        _tableOccupancyDuration = _ref13.table_occupancy_duration,
-        rest = _objectWithoutProperties(_ref13, _excluded4);
+      var _ref11 = tempOrder.metadata || {},
+        _collectPax = _ref11.collect_pax,
+        _tableOccupancyDuration = _ref11.table_occupancy_duration,
+        rest = _objectWithoutProperties(_ref11, _excluded4);
       return _objectSpread({}, rest);
     }(),
     products: (tempOrder.products || []).map(function (product) {

package/dist/server/index.js

@@ -2995,6 +2995,7 @@ var Server = /*#__PURE__*/function () {
         if (field === undefined || field === null || field === '') return;
         searchParams.append('with[]', String(field));
       });
+      searchParams.append('lookup_mode', 'multi');
       var query = searchParams.toString();
       return "/shop/order/sales/".concat(encodeURIComponent(orderId)).concat(query ? "?".concat(query) : '');
     }

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

@@ -1,6 +1,6 @@
 import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
-import { BaseSalesOrderProduct, BaseSalesOrderProductIdentity, BaseSalesPaymentStatus, BaseSalesCalculateProductBookingPriceParams, BaseSalesProductBookingPriceResult, BaseSalesScanCodeResult } from './types';
+import { BaseSalesOrderProduct, BaseSalesOrderProductIdentity, BaseSalesPaymentStatus, BaseSalesUpdateOrderProductQuantityParams, BaseSalesCalculateProductBookingPriceParams, BaseSalesProductBookingPriceResult, BaseSalesScanCodeResult } from './types';
 import { OrderModule } from '../../modules/Order';
 import type { AddProductBookingInput, LoadSalesDetailParams, OrderPaymentData, OrderPaymentSource, SendCustomerPayLinkParams, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, UpdateTempOrderCustomerInput, UpdateOrderBookingParams, UpdateOrderProductParams, OrderTempOrder } from '../../modules/Order/types';
 import type { SubmitPayloadEnhancer } from '../../modules/Order/utils';
@@ -110,15 +110,22 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     updateTempOrderNote(note: string): string;
     updateTempOrderNote(note: string, sync: true): Promise<string>;
     updateTempOrderNote(note: string, sync: boolean): string | Promise<string>;
+    updateRemoteOrderNote(orderId: number | string, note: string): void;
     updateTempOrderShopDiscount(amount: string | number): string;
     updateTempOrderContactsInfo(contactsInfo: Record<string, any> | null): Record<string, any> | null;
     private ensureTempOrder;
     addNewOrder(): Promise<OrderTempOrder>;
     saveDraft(): Promise<void>;
     restoreOrder(): Promise<OrderTempOrder>;
+    /**
+     * 仅清空 tempOrder 购物车行（products / bookings / discount_list）。
+     * 同步清空内存中的 salesDetail 商品/预约视图，避免编辑态仍读到旧 bookings。
+     */
+    clearOrderCartLines(): Promise<OrderTempOrder>;
     getOrderProducts(): import("../../modules/Order/types").OrderProduct[];
     getSummary(): Promise<import("../../modules/Order/types").OrderSummary>;
     private getHistoricalProductDiscountList;
+    private isPersistedOrderProduct;
     private mergeHistoricalDiscountList;
     loadDiscountConfig(params?: {
         customerId?: number;
@@ -215,6 +222,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     calculateProductBookingPrice(params: BaseSalesCalculateProductBookingPriceParams): Promise<BaseSalesProductBookingPriceResult>;
     addProductToOrder(product: Partial<BaseSalesOrderProduct> & BaseSalesOrderProductIdentity, booking?: AddProductBookingInput): Promise<import("../../modules/Order/types").OrderProduct[]>;
     updateOrderProduct(params: UpdateOrderProductParams): Promise<import("../../modules/Order/types").OrderProduct[]>;
+    updateOrderProductQuantity(params: BaseSalesUpdateOrderProductQuantityParams): Promise<import("../../modules/Order/types").OrderProduct[]>;
     updateOrderBooking(params: UpdateOrderBookingParams): any[];
     /**
      * 设置单行商品备注（与整单 `updateTempOrderNote` 区分）。