@pisell/pisellos 2.3.51 → 2.3.53

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

@@ -468,11 +468,13 @@ function getProductLineNoteSignature(product) {
 }
 
 /**
- * 编辑订单时，历史行仍参与整车促销评估，但不能与本次新增行合并。
- * 以历史行 uid 作为促销前后的行边界；新增行返回空边界，仍保留原有合并语义。
+ * 称重行以及编辑订单历史行都有各自的促销合并边界。
  */
 function getPromotionLineMergeBoundary(product) {
-  var _product$metadata3;
+  var _product$product_sku, _product$metadata3;
+  if (Number((product === null || product === void 0 || (_product$product_sku = product.product_sku) === null || _product$product_sku === void 0 ? void 0 : _product$product_sku.open_sold_weight) || 0) === 1) {
+    return "weighing:".concat(getOrderProductUid(product));
+  }
   if ((product === null || product === void 0 || (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.is_edit_for_runtime) !== true) return '';
   return "edit:".concat(getOrderProductUid(product));
 }

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

@@ -10,7 +10,6 @@ import { ITime } from '../../modules/Date/types';
 import dayjs from 'dayjs';
 import { LoadScheduleAvailableDateParams } from '../../modules/Schedule/types';
 import { IHolder, IFetchHolderAccountsParams } from '../../modules/AccountList/types';
-import { IAppendFormRecordParams } from '../../modules/Holder/types';
 export declare class BookingByStepImpl extends BaseModule implements Module {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -127,20 +126,6 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      * @param params
      */
     fetchHolderAccountsAsync(params: IFetchHolderAccountsParams): Promise<void>;
-    /**
-     * 获取 holder 表单 map
-     */
-    getHolderFormMap(): import("../../modules").HolderFormMap;
-    /**
-     * 登录后或外部触发时，按当前 holderMap 批量刷新所有表单的 records
-     */
-    refreshAllHolderFormRecords(params?: {
-        customer_id?: number;
-    }): Promise<import("../../modules").HolderFormMap>;
-    /**
-     * 添加表单记录
-     */
-    appendFormRecord(params: IAppendFormRecordParams): import("../../modules").IFormRecord;
     setDateRange(dateRange: ITime[]): Promise<void>;
     clearDateRange(): void;
     getDateRange(): Promise<ITime[]>;
@@ -317,7 +302,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     autoSelectAllProductResources(resources_code: string, timeSlots?: TimeSliceItem): {
         errorList: any[];
     };
-    getTimeSlotByAllResources(resources_code: string, split?: number): any[];
+    getTimeSlotByAllResources(resources_code: string): any[];
     getTimeSlotByAllResourcesForDate({ resources_code, startDate, endDate }: {
         resources_code: string;
         startDate: string;