@pisell/pisellos 2.2.168 → 2.2.169

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

@@ -22,6 +22,7 @@ __export(transformBaseProductToOrderProduct_exports, {
   transformBaseProductToOrderProduct: () => transformBaseProductToOrderProduct
 });
 module.exports = __toCommonJS(transformBaseProductToOrderProduct_exports);
+var import_manualProductDiscount = require("../../../modules/Order/utils/manualProductDiscount");
 function toNumber(value, fallback = 0) {
   const parsedValue = Number(value);
   if (!Number.isFinite(parsedValue))
@@ -87,7 +88,7 @@ function findVariantById(origin, variantId) {
   return variants.find((variant) => Number(variant == null ? void 0 : variant.id) === variantId) || null;
 }
 function transformBaseProductToOrderProduct(params) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
   const { payload, fallbackProductId = null } = params;
   if (!payload || typeof payload !== "object")
     return null;
@@ -124,6 +125,39 @@ function transformBaseProductToOrderProduct(params) {
     hasPriceOverride
   );
   const uniqueIdentificationNumber = payload.unique_identification_number ?? payload.unique;
+  const resolvedQuantity = toSafePositiveInt(payload.quantity ?? payload.num, 1);
+  const originTotal = (0, import_manualProductDiscount.resolveManualDiscountOriginTotal)({
+    originTotal: payload.origin_total,
+    extendOriginTotal: (_d = payload._extend) == null ? void 0 : _d.origin_total,
+    originExtendOriginTotal: (_e = origin == null ? void 0 : origin._extend) == null ? void 0 : _e.origin_total,
+    sourceExtendOriginTotal: (_f = sourceProduct == null ? void 0 : sourceProduct._extend) == null ? void 0 : _f.origin_total,
+    catalogUnitPrice: (origin == null ? void 0 : origin.base_price) ?? (origin == null ? void 0 : origin.price) ?? (sourceProduct == null ? void 0 : sourceProduct.base_price) ?? (sourceProduct == null ? void 0 : sourceProduct.price),
+    quantity: resolvedQuantity
+  });
+  const sellingTotal = Number(
+    payload.line_total ?? payload.total ?? ((_g = payload._extend) == null ? void 0 : _g.total) ?? lineCompositeTotal
+  );
+  const discountReason = (0, import_manualProductDiscount.resolveManualDiscountReasonFromSources)({
+    discountReason: payload.discount_reason,
+    extendDiscountReason: (_h = payload._extend) == null ? void 0 : _h.discount_reason,
+    originExtendDiscountReason: (_i = origin == null ? void 0 : origin._extend) == null ? void 0 : _i.discount_reason
+  });
+  const lineOriginalPrice = hasPriceOverride && Number.isFinite(originTotal) ? toPriceString(originTotal) : lineCompositeTotal;
+  const manualDiscountList = (0, import_manualProductDiscount.shouldBuildManualProductDiscount)({
+    hasPriceOverride,
+    originTotal,
+    sellingTotal
+  }) ? (0, import_manualProductDiscount.mergeManualProductDiscountIntoList)(
+    payload.discount_list,
+    (0, import_manualProductDiscount.buildManualProductDiscountItem)({
+      originTotal: Number.isFinite(originTotal) ? originTotal : Number(lineOriginalPrice),
+      sellingTotal: Number.isFinite(sellingTotal) ? sellingTotal : Number(lineCompositeTotal),
+      quantity: resolvedQuantity,
+      message: discountReason,
+      discountway: (_j = payload._extend) == null ? void 0 : _j.discountway,
+      discount_per: (_k = payload._extend) == null ? void 0 : _k.discount_per
+    })
+  ) : payload.discount_list || [];
   const metadata = {
     unique: payload.unique,
     session: payload.session,
@@ -138,7 +172,10 @@ function transformBaseProductToOrderProduct(params) {
     source_product_price: sourceProductPrice,
     main_product_selling_price: sourceProductPrice,
     main_product_original_price: sourceProductPrice,
-    ...hasPriceOverride ? { price_override: String(payload.price_override) } : {},
+    ...hasPriceOverride ? {
+      price_override: String(payload.price_override),
+      is_manual_discount: 1
+    } : {},
     ...payload.bundle_edit !== void 0 ? { bundle_edit: payload.bundle_edit } : {}
   };
   if (uniqueIdentificationNumber) {
@@ -148,12 +185,13 @@ function transformBaseProductToOrderProduct(params) {
     product_id: productId,
     product_variant_id: productVariantId,
     unique_identification_number: uniqueIdentificationNumber ? String(uniqueIdentificationNumber) : void 0,
-    num: toSafePositiveInt(payload.quantity ?? payload.num, 1),
+    num: resolvedQuantity,
     product_option_item: productOptionItem,
     product_bundle: productBundle,
+    discount_list: manualDiscountList,
     // 折后行价由 normalizeOrderProduct 按 main + bundle 合成；手动改价时 bundle 已为分摊后单价
     selling_price: lineCompositeTotal,
-    original_price: lineCompositeTotal,
+    original_price: lineOriginalPrice,
     tax_fee: toPriceString(
       payload.tax_fee ?? (matchedVariant == null ? void 0 : matchedVariant.tax_fee) ?? (origin == null ? void 0 : origin.tax_fee) ?? (sourceProduct == null ? void 0 : sourceProduct.tax_fee),
       "0.00"

package/lib/solution/BaseSales/utils.js

@@ -38,6 +38,7 @@ __export(utils_exports, {
 module.exports = __toCommonJS(utils_exports);
 var import_decimal = __toESM(require("decimal.js"));
 var import_utils = require("../../modules/Order/utils");
+var import_manualProductDiscount = require("../../modules/Order/utils/manualProductDiscount");
 function createEmptySummary() {
   return {
     product_quantity: 0,
@@ -203,9 +204,16 @@ function normalizeOrderProduct(product) {
     useOriginalBundle: true
   });
   const finalOriginalPrice = (0, import_utils.resolveManualOverrideLineOriginalPrice)(
-    { num: product.num, metadata },
+    { num: product.num, metadata, lineOriginalPrice: product.original_price },
     composedOriginalPrice
   );
+  const discountList = (0, import_manualProductDiscount.ensureManualProductDiscountList)({
+    discountList: product.discount_list,
+    metadata,
+    originalPrice: finalOriginalPrice,
+    sellingPrice: composedSellingPrice,
+    quantity: getSafeProductNum(product.num)
+  });
   return {
     order_detail_id: product.order_detail_id || null,
     product_id: product.product_id,
@@ -216,7 +224,7 @@ function normalizeOrderProduct(product) {
     original_price: finalOriginalPrice,
     tax_fee: product.tax_fee || "0.00",
     is_charge_tax: product.is_charge_tax ?? 0,
-    discount_list: product.discount_list || [],
+    discount_list: discountList,
     product_bundle: normalizedBundle,
     metadata,
     note: product.note != null ? String(product.note) : ""

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 6 | 3 | 5 | 4;
+        weekNum: 0 | 2 | 1 | 5 | 3 | 4 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -260,7 +260,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/lib/solution/BookingTicket/index.js

@@ -176,7 +176,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     if (normalizedLocalCustomer && this.hasUsableCustomerDetails(normalizedLocalCustomer)) {
       return normalizedLocalCustomer;
     }
-    const result = await this.store.customer.getCustomerList({
+    const result = await this.store.customer.queryCustomerList({
       ids: [customerId],
       skip: 1,
       num: 1
@@ -290,7 +290,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
    */
   async loadProducts(params = {}, options) {
     const { schedule_date, customer_id, menu_list_ids, schedule_datetime } = params;
-    const bookingDate = schedule_date || (schedule_datetime ? String(schedule_datetime).slice(0, 10) : "");
+    const bookingDate = schedule_datetime || schedule_date || "";
     if (bookingDate) {
       this.setBookingDate(bookingDate);
     }

package/lib/solution/BookingTicket/utils/addProductDecision.js

@@ -184,7 +184,7 @@ function buildRequiresDetailPayload(item, ctx) {
       number: Boolean(item == null ? void 0 : item.open_sold_weight)
     },
     isOnlySession,
-    isEject,
+    isEject: isEject ? 1 : 0,
     customerId: ctx == null ? void 0 : ctx.customerId,
     date: formatBookingDateForUI(ctx == null ? void 0 : ctx.date),
     productData: item
@@ -298,6 +298,8 @@ function buildBasePayloadFromCacheItem(cacheItem, ctx) {
     origin_total: extend == null ? void 0 : extend.origin_total,
     price_override: extend == null ? void 0 : extend.priceOverride,
     bundle_edit: extend == null ? void 0 : extend.bundle_edit,
+    discount_reason: extend == null ? void 0 : extend.discount_reason,
+    discount_list: cacheItem == null ? void 0 : cacheItem.discount_list,
     _extend: extend
   };
 }

package/lib/solution/ScanOrder/utils.js

@@ -63,6 +63,7 @@ module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_decimal = __toESM(require("decimal.js"));
 var import_utils = require("../../modules/Order/utils");
+var import_manualProductDiscount = require("../../modules/Order/utils/manualProductDiscount");
 function createEmptySummary() {
   return {
     product_quantity: 0,
@@ -507,9 +508,16 @@ function normalizeOrderProduct(product) {
     useOriginalBundle: true
   });
   const finalOriginalPrice = (0, import_utils.resolveManualOverrideLineOriginalPrice)(
-    { num: product.num, metadata },
+    { num: product.num, metadata, lineOriginalPrice: product.original_price },
     composedOriginalPrice
   );
+  const discountList = (0, import_manualProductDiscount.ensureManualProductDiscountList)({
+    discountList: product.discount_list,
+    metadata,
+    originalPrice: finalOriginalPrice,
+    sellingPrice: composedSellingPrice,
+    quantity: getSafeProductNum(product.num)
+  });
   return {
     order_detail_id: product.order_detail_id || null,
     product_id: product.product_id,
@@ -520,7 +528,7 @@ function normalizeOrderProduct(product) {
     original_price: finalOriginalPrice,
     tax_fee: product.tax_fee || "0.00",
     is_charge_tax: product.is_charge_tax ?? 0,
-    discount_list: product.discount_list || [],
+    discount_list: discountList,
     product_bundle: normalizedBundle,
     metadata,
     note: product.note != null ? String(product.note) : ""

package/package.json

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