@pisell/pisellos 2.2.281 → 2.2.282

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

@@ -157,13 +157,11 @@ export interface OrderCustomerPatch {
  * 下单客户变更事件 payload。
  * - `patch`：tempOrder 上的协议字段视图（会随订单提交）
  * - `snapshot`：UI 富字段快照（仅本地，不随订单提交）
- * - `source`：缺省表示真实业务变更；`detailHydrate` 仅表示打开详情时快照已就绪
  * 清空时整个 payload 为 null。
  */
 export interface OrderCustomerChangePayload {
     patch: OrderCustomerView;
     snapshot: ICustomer | null;
-    source?: 'detailHydrate';
 }
 export interface OrderScanCodeResult {
     isAvailable: boolean;

package/dist/modules/Order/types.js

@@ -60,7 +60,6 @@ export var OrderHooks = /*#__PURE__*/function (OrderHooks) {
  * 下单客户变更事件 payload。
  * - `patch`：tempOrder 上的协议字段视图（会随订单提交）
  * - `snapshot`：UI 富字段快照（仅本地，不随订单提交）
- * - `source`：缺省表示真实业务变更；`detailHydrate` 仅表示打开详情时快照已就绪
  * 清空时整个 payload 为 null。
  */
 

package/dist/modules/Order/utils.js

@@ -1124,7 +1124,12 @@ export function buildSubmitPayload(params) {
     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';
+      // 260807 如果 biz 是堂食，type 使用table-order
+      if (businessCode === 'dine_in') {
+        submitType = 'table-order';
+      } else {
+        submitType = 'appointment_booking';
+      }
     } else {
       submitType = 'virtual';
     }

package/dist/solution/BaseSales/index.js

@@ -2126,23 +2126,12 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
         return !_this12.isPersistedOrderProduct(product);
       });
       if (hasDraftProduct) return false;
-
-      // 编辑详情 hydrate 时，商品行上的历史券卡会被还原为 isEditMode=true、
-      // isSelected=true 的只读记录。它们表示“该折扣已在原订单结算”，不是用户在
-      // 当前编辑会话中新做的选择，不能据此放行刚从 prepare/config 拉回来的折扣。
-      // 否则后续 Rules.calcDiscount 会把没有 isManualSelect 标记的可用 runtime 卡
-      // 当作自动候选，再次写入 tempOrder。这里只识别非 isEditMode 的 runtime 状态；
-      // 新建单、编辑态新增商品以及用户本次明确选择/取消折扣的原有流程保持不变。
-      var hasRuntimeDiscountSelection = params.currentDiscountList.some(function (discount) {
-        return !discount.isEditMode && (discount.isSelected || discount.isManualSelect);
+      var hasSelectedDiscount = params.currentDiscountList.some(function (discount) {
+        return discount.isSelected || discount.isEditMode || discount.isManualSelect;
       });
-      if (hasRuntimeDiscountSelection) return false;
-
-      // nextDiscountList 已经合并了历史只读折扣与本次获取的 runtime 折扣，
-      // 因此这里同样必须排除 isEditMode；只有 runtime 条目已有明确选择状态时，
-      // 才允许继续进入折扣重算。
+      if (hasSelectedDiscount) return false;
       return !params.nextDiscountList.some(function (discount) {
-        return !discount.isEditMode && (discount.isSelected || discount.isManualSelect);
+        return discount.isSelected || discount.isEditMode || discount.isManualSelect;
       });
     }
   }, {

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

@@ -3,7 +3,7 @@ import { BookingTicketCartView, BookingTicketProductCatalogView, BookingTicketSt
 import type { ProductData } from '../../modules';
 import type { OpenDataConfig } from '../../modules/OpenData';
 import { type BookingContextConfig, type BookingContextDateInput, type BookingContextResource, type BookingContextResourceMap, type BookingContextState, type InitBookingContextParams, type LoadBookingConfigParams, type LoadBookingResourcesParams, type ResourceError, type BookingCalcContext } from '../../modules/BookingContext';
-import type { OrderCustomerView, OrderCustomerChangePayload } from '../../modules/Order/types';
+import type { OrderCustomerView } from '../../modules/Order/types';
 import { BaseSalesImpl } from '../BaseSales';
 import type { BaseSalesScanCodeResult } from '../BaseSales/types';
 import type { ISalesDetail } from '../BaseSales/utils/parseSalesResponse';
@@ -260,9 +260,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 同时透传 OrderModule 内部 emit 的 `order:onOrderCustomerChange` 之外，
      * 在 BookingTicket 命名空间也 emit 一次，方便上层统一从 Solution 订阅。
      */
-    setOrderCustomer(customer: ICustomer | null, options?: {
-        source?: OrderCustomerChangePayload['source'];
-    }): void;
+    setOrderCustomer(customer: ICustomer | null): void;
     /**
      * 读取 tempOrder 上的下单客户协议字段；customer_id 缺失时返回 null。
      */

package/dist/solution/BookingTicket/index.js

@@ -542,12 +542,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                   country_calling_code: selectedCustomer === null || selectedCustomer === void 0 ? void 0 : selectedCustomer.country_calling_code
                 });
                 customerModule.setSelectedCustomer(customer);
-                // 详情 hydrate 后仍需广播一次，让 CustomerContext 等 UI 订阅方拿到刚补齐的
-                // customerSnapshot；但它不是用户主动切换客户。通过 source 明确标记初始化事件，
-                // 商品报价/折扣订阅方即可跳过 prepare/config，其他旧订阅方仍可照常刷新 UI。
-                this.setOrderCustomer(customer, {
-                  source: 'detailHydrate'
-                });
+                this.setOrderCustomer(customer);
                 // await this.store.order.saveDraft();
               }
               return _context6.abrupt("return", sales);
@@ -1563,7 +1558,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
      */
   }, {
     key: "setOrderCustomer",
-    value: function setOrderCustomer(customer, options) {
+    value: function setOrderCustomer(customer) {
       var _this$store$order$get3,
         _this3 = this;
       if (!customer) {
@@ -1586,16 +1581,12 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
         var snapshotReplenished = !snapshotBeforeSet && Boolean(snapshotAfterOrderSet);
         if (snapshotReplenished) {
           var _next2 = this.buildOrderCustomerPayload();
-          this.core.effects.emit("".concat(this.name, ":onOrderCustomerChange"), _next2 && options !== null && options !== void 0 && options.source ? _objectSpread(_objectSpread({}, _next2), {}, {
-            source: options.source
-          }) : _next2);
+          this.core.effects.emit("".concat(this.name, ":onOrderCustomerChange"), _next2);
         }
         return;
       }
       var next = this.buildOrderCustomerPayload();
-      this.core.effects.emit("".concat(this.name, ":onOrderCustomerChange"), next && options !== null && options !== void 0 && options.source ? _objectSpread(_objectSpread({}, next), {}, {
-        source: options.source
-      }) : next);
+      this.core.effects.emit("".concat(this.name, ":onOrderCustomerChange"), next);
       this.refreshDiscountConfigAfterOrderCustomerChange(patch.customer_id);
       // 客户切换可能改变可用促销/赠品；触发一次重算（recursion-safe）。
       var promotionRefreshTask = this.store.order.applyPromotion().then(function () {

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

@@ -157,13 +157,11 @@ export interface OrderCustomerPatch {
  * 下单客户变更事件 payload。
  * - `patch`：tempOrder 上的协议字段视图（会随订单提交）
  * - `snapshot`：UI 富字段快照（仅本地，不随订单提交）
- * - `source`：缺省表示真实业务变更；`detailHydrate` 仅表示打开详情时快照已就绪
  * 清空时整个 payload 为 null。
  */
 export interface OrderCustomerChangePayload {
     patch: OrderCustomerView;
     snapshot: ICustomer | null;
-    source?: 'detailHydrate';
 }
 export interface OrderScanCodeResult {
     isAvailable: boolean;

package/lib/modules/Order/utils.js

@@ -994,7 +994,11 @@ function buildSubmitPayload(params) {
   let submitType = type ?? tempOrder.type;
   if (!submitType) {
     if ((_a = tempOrder == null ? void 0 : tempOrder.bookings) == null ? void 0 : _a.length) {
-      submitType = "appointment_booking";
+      if (businessCode === "dine_in") {
+        submitType = "table-order";
+      } else {
+        submitType = "appointment_booking";
+      }
     } else {
       submitType = "virtual";
     }

package/lib/solution/BaseSales/index.js

@@ -1494,13 +1494,13 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     const hasDraftProduct = params.products.some((product) => !this.isPersistedOrderProduct(product));
     if (hasDraftProduct)
       return false;
-    const hasRuntimeDiscountSelection = params.currentDiscountList.some(
-      (discount) => !discount.isEditMode && (discount.isSelected || discount.isManualSelect)
+    const hasSelectedDiscount = params.currentDiscountList.some(
+      (discount) => discount.isSelected || discount.isEditMode || discount.isManualSelect
     );
-    if (hasRuntimeDiscountSelection)
+    if (hasSelectedDiscount)
       return false;
     return !params.nextDiscountList.some(
-      (discount) => !discount.isEditMode && (discount.isSelected || discount.isManualSelect)
+      (discount) => discount.isSelected || discount.isEditMode || discount.isManualSelect
     );
   }
   mergeCurrentDiscountSelectionState(discountList, currentDiscountList) {

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

@@ -3,7 +3,7 @@ import { BookingTicketCartView, BookingTicketProductCatalogView, BookingTicketSt
 import type { ProductData } from '../../modules';
 import type { OpenDataConfig } from '../../modules/OpenData';
 import { type BookingContextConfig, type BookingContextDateInput, type BookingContextResource, type BookingContextResourceMap, type BookingContextState, type InitBookingContextParams, type LoadBookingConfigParams, type LoadBookingResourcesParams, type ResourceError, type BookingCalcContext } from '../../modules/BookingContext';
-import type { OrderCustomerView, OrderCustomerChangePayload } from '../../modules/Order/types';
+import type { OrderCustomerView } from '../../modules/Order/types';
 import { BaseSalesImpl } from '../BaseSales';
 import type { BaseSalesScanCodeResult } from '../BaseSales/types';
 import type { ISalesDetail } from '../BaseSales/utils/parseSalesResponse';
@@ -260,9 +260,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 同时透传 OrderModule 内部 emit 的 `order:onOrderCustomerChange` 之外，
      * 在 BookingTicket 命名空间也 emit 一次，方便上层统一从 Solution 订阅。
      */
-    setOrderCustomer(customer: ICustomer | null, options?: {
-        source?: OrderCustomerChangePayload['source'];
-    }): void;
+    setOrderCustomer(customer: ICustomer | null): void;
     /**
      * 读取 tempOrder 上的下单客户协议字段；customer_id 缺失时返回 null。
      */

package/lib/solution/BookingTicket/index.js

@@ -343,7 +343,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
         country_calling_code: selectedCustomer == null ? void 0 : selectedCustomer.country_calling_code
       };
       customerModule.setSelectedCustomer(customer);
-      this.setOrderCustomer(customer, { source: "detailHydrate" });
+      this.setOrderCustomer(customer);
     }
     return sales;
   }
@@ -891,7 +891,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
    * 同时透传 OrderModule 内部 emit 的 `order:onOrderCustomerChange` 之外，
    * 在 BookingTicket 命名空间也 emit 一次，方便上层统一从 Solution 订阅。
    */
-  setOrderCustomer(customer, options) {
+  setOrderCustomer(customer) {
     var _a;
     if (!customer) {
       this.clearOrderCustomer();
@@ -911,18 +911,12 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
       const snapshotReplenished = !snapshotBeforeSet && Boolean(snapshotAfterOrderSet);
       if (snapshotReplenished) {
         const next2 = this.buildOrderCustomerPayload();
-        this.core.effects.emit(
-          `${this.name}:onOrderCustomerChange`,
-          next2 && (options == null ? void 0 : options.source) ? { ...next2, source: options.source } : next2
-        );
+        this.core.effects.emit(`${this.name}:onOrderCustomerChange`, next2);
       }
       return;
     }
     const next = this.buildOrderCustomerPayload();
-    this.core.effects.emit(
-      `${this.name}:onOrderCustomerChange`,
-      next && (options == null ? void 0 : options.source) ? { ...next, source: options.source } : next
-    );
+    this.core.effects.emit(`${this.name}:onOrderCustomerChange`, next);
     this.refreshDiscountConfigAfterOrderCustomerChange(patch.customer_id);
     const promotionRefreshTask = this.store.order.applyPromotion().then(() => void 0);
     this.orderCustomerPromotionRefreshInFlight = promotionRefreshTask;

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.2.281",
+  "version": "2.2.282",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",