@pisell/pisellos 2.3.43 → 2.3.44

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

@@ -132,14 +132,15 @@ function transformBaseProductToOrderProduct(params) {
     ...callbackOrigin || {}
   };
   const matchedVariant = findVariantById(callbackOrigin, productVariantId) ?? findVariantById(sourceProduct, productVariantId) ?? findVariantById(origin, productVariantId);
+  const hasPriceOverride = payload.price_override !== void 0 && payload.price_override !== null && payload.price_override !== "";
+  const catalogSourcePrice = (matchedVariant == null ? void 0 : matchedVariant.price) ?? (matchedVariant == null ? void 0 : matchedVariant.base_price) ?? (origin == null ? void 0 : origin.price) ?? (origin == null ? void 0 : origin.base_price) ?? (sourceProduct == null ? void 0 : sourceProduct.price) ?? (sourceProduct == null ? void 0 : sourceProduct.selling_price) ?? (sourceProduct == null ? void 0 : sourceProduct.base_price);
   const sourceProductPrice = toPriceString(
-    payload.price ?? payload.selling_price ?? (matchedVariant == null ? void 0 : matchedVariant.price) ?? (matchedVariant == null ? void 0 : matchedVariant.base_price) ?? (origin == null ? void 0 : origin.price) ?? (origin == null ? void 0 : origin.base_price) ?? (sourceProduct == null ? void 0 : sourceProduct.price) ?? (sourceProduct == null ? void 0 : sourceProduct.selling_price) ?? (sourceProduct == null ? void 0 : sourceProduct.base_price),
+    hasPriceOverride ? catalogSourcePrice ?? payload.price ?? payload.selling_price : payload.price ?? payload.selling_price ?? catalogSourcePrice,
     "0.00"
   );
   const explicitLineTotal = payload.line_total ?? payload.total ?? ((_c = payload._extend) == null ? void 0 : _c.total);
   const hasExplicitLineTotal = Number.isFinite(Number(explicitLineTotal));
   const lineCompositeTotal = toPriceString(explicitLineTotal, sourceProductPrice);
-  const hasPriceOverride = payload.price_override !== void 0 && payload.price_override !== null && payload.price_override !== "";
   const productOptionItem = (0, import_utils.normalizeProductSkuOptions)(
     normalizeOptionItems(
       ((_d = payload.product_sku) == null ? void 0 : _d.option) ?? payload.option ?? payload.options ?? payload.product_option_item

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

@@ -326,7 +326,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

@@ -368,6 +368,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
     }
     return {
       isAvailable: raw.isAvailable,
+      ...raw.isAccepted !== void 0 ? { isAccepted: raw.isAccepted } : {},
       type: raw.type,
       unavailableReason: raw.unavailableReason,
       scannedDiscountList: raw.scannedDiscountList

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

@@ -229,6 +229,7 @@ export interface GlobalScanHostBridge {
      */
     applyPromotionCode?: (code: string, customerId?: number) => Promise<{
         isAvailable?: boolean;
+        isAccepted?: boolean;
         type?: string;
         unavailableReason?: string;
     }>;

package/lib/solution/BookingTicket/utils/scan/applyGlobalScan.js

@@ -131,7 +131,7 @@ async function applyGlobalScan(host, formatted, bridge) {
         return { status: "failed", reason: "no_bridge" };
       }
       const result = await bridge.applyPromotionCode(scanCode);
-      if (result == null ? void 0 : result.isAvailable) {
+      if ((result == null ? void 0 : result.isAccepted) ?? (result == null ? void 0 : result.isAvailable)) {
         return { status: "success", kind: "promotion" };
       }
       return { status: "failed", reason: "invalid_data" };
@@ -146,7 +146,7 @@ async function applyGlobalScan(host, formatted, bridge) {
         scanCode,
         Number((data == null ? void 0 : data.id) ?? (data == null ? void 0 : data.customer_id)) || void 0
       );
-      if (promotionResult == null ? void 0 : promotionResult.isAvailable) {
+      if ((promotionResult == null ? void 0 : promotionResult.isAccepted) ?? (promotionResult == null ? void 0 : promotionResult.isAvailable)) {
         return { status: "success", kind: "promotion" };
       }
     }

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

@@ -167,6 +167,7 @@ export declare class VenueBookingImpl extends BaseSalesImpl implements Module {
     private recalculateOrderPricesFromQuotation;
     scanCode(code: string, customerId?: number): Promise<{
         isAvailable: boolean;
+        isAccepted?: boolean | undefined;
         discountList: import("../../modules/Discount").Discount[];
         type: "server" | "clientCalc";
         unavailableReason?: import("../../modules/Rules/types").UnavailableReason | undefined;

package/package.json

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