@pisell/pisellos 2.2.193 → 2.2.194

package/dist/server/index.js

@@ -1647,14 +1647,14 @@ var Server = /*#__PURE__*/function () {
                 _context20.next = 3;
                 break;
               }
-              this.logWarning('setupProductsQuotationPriceBridge: Products 模块未注册');
+              this.logInfo('setupProductsQuotationPriceBridge: Products 模块未注册');
               return _context20.abrupt("return");
             case 3:
               if (this.schedule) {
                 _context20.next = 6;
                 break;
               }
-              this.logWarning('setupProductsQuotationPriceBridge: Schedule 模块未注册');
+              this.logInfo('setupProductsQuotationPriceBridge: Schedule 模块未注册');
               return _context20.abrupt("return");
             case 6:
               _context20.prev = 6;

package/dist/server/modules/products/index.js

@@ -2048,10 +2048,10 @@ export var ProductsModule = /*#__PURE__*/function (_BaseModule) {
       this.productDataSource.run({
         pubsub: {
           callback: function callback(res) {
-            console.log('sse_products_callback', res);
-            _this8.logInfo('sse_products_callback: 收到同步消息', {
-              data: res === null || res === void 0 ? void 0 : res.data
-            });
+            // console.log('sse_products_callback', res)
+            // this.logInfo('sse_products_callback: 收到同步消息', {
+            //   data: res?.data,
+            // });
             if (!(res !== null && res !== void 0 && res.data)) return;
             var data = res.data;
             var channelKey = data.module || 'product';

package/dist/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/dist/solution/BookingTicket/index.d.ts

@@ -279,7 +279,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/model/strategy/adapter/promotion/index.js

@@ -1,49 +0,0 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/model/strategy/adapter/promotion/index.ts
-var promotion_exports = {};
-__export(promotion_exports, {
-  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
-  PromotionAdapter: () => import_adapter.PromotionAdapter,
-  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
-  default: () => import_adapter2.default
-});
-module.exports = __toCommonJS(promotion_exports);
-var import_evaluator = require("./evaluator");
-var import_adapter = require("./adapter");
-var import_adapter2 = __toESM(require("./adapter"));
-var import_examples = require("./examples");
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  BUY_X_GET_Y_FREE_STRATEGY,
-  PromotionAdapter,
-  PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY
-});

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

@@ -141,6 +141,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private calculatePaymentTotal;
     private normalizePaymentSource;
     private updateTempOrderPaymentStatus;
+    private shouldKeepPaymentStatusAfterAmountRecalc;
     private resolveWalletPassUseValue;
     private capVoucherPaymentsByRemainingAmount;
     private calculatePaidPaymentSummary;
@@ -264,7 +265,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private logSubmitBackendRejected;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/lib/modules/Order/index.js

@@ -45,6 +45,21 @@ var import_Rules = require("../Rules");
 var import_types2 = require("../Rules/types");
 var import_decimal = __toESM(require("decimal.js"));
 var import_lodash_es = require("lodash-es");
+function normalizeDiscountListSignature(discountList) {
+  return (discountList || []).map((item) => ({
+    type: (item == null ? void 0 : item.type) ?? "",
+    discount_id: (item == null ? void 0 : item.discount_id) ?? null,
+    order_discount_id: (item == null ? void 0 : item.order_discount_id) ?? null,
+    amount: new import_decimal.default(Number(item == null ? void 0 : item.amount) || 0).toFixed(2)
+  }));
+}
+function isSameDiscountList(left, right) {
+  if (!Array.isArray(left) || !Array.isArray(right))
+    return false;
+  return JSON.stringify(normalizeDiscountListSignature(left)) === JSON.stringify(
+    normalizeDiscountListSignature(right)
+  );
+}
 var OrderModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name || "order", version);
@@ -107,6 +122,11 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       var _a, _b, _c;
       if ((_a = product.metadata) == null ? void 0 : _a.is_manual_discount)
         return product;
+      const discountItems = Array.isArray(product.discount_list) ? product.discount_list : [];
+      const hasOnlyPersistedDiscountSnapshots = product.order_detail_id !== void 0 && product.order_detail_id !== null && discountItems.length > 0 && discountItems.every((discount) => (discount == null ? void 0 : discount.order_discount_id) !== void 0 && (discount == null ? void 0 : discount.order_discount_id) !== null);
+      if (hasOnlyPersistedDiscountSnapshots) {
+        return product;
+      }
       const totalPerUnitDiscount = (0, import_utils.resolveEffectivePerUnitDiscount)(product);
       const optionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(product));
       const sourcePrice = ((_b = product.metadata) == null ? void 0 : _b.source_product_price) ?? (((_c = product.metadata) == null ? void 0 : _c.main_product_original_price) != null ? new import_decimal.default(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : product.original_price ?? "0");
@@ -618,6 +638,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     return normalized;
   }
   updateTempOrderPaymentStatus(tempOrder) {
+    if (this.shouldKeepPaymentStatusAfterAmountRecalc(tempOrder.payment_status)) {
+      return;
+    }
     const paymentTotal = this.calculatePaymentTotal(tempOrder.payments || []);
     const targetAmount = this.getPaymentTargetAmount();
     if (targetAmount.lte(0)) {
@@ -630,6 +653,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
     tempOrder.payment_status = paymentTotal.gte(targetAmount) ? "paid" : "partially_paid";
   }
+  shouldKeepPaymentStatusAfterAmountRecalc(paymentStatus) {
+    const normalizedStatus = String(paymentStatus || "").trim().toLowerCase();
+    return normalizedStatus === "refunded" || normalizedStatus === "partially_refunded";
+  }
   resolveWalletPassUseValue(payment, amount) {
     const usageUnit = payment.wallet_pass_usage_unit && typeof payment.wallet_pass_usage_unit === "object" ? payment.wallet_pass_usage_unit : null;
     if (!usageUnit)
@@ -1603,7 +1630,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     const callerUpdatesTopPrice = Object.prototype.hasOwnProperty.call(updates || {}, "selling_price") || Object.prototype.hasOwnProperty.call(updates || {}, "original_price");
     const callerUpdatesMainMeta = ((_c = updates == null ? void 0 : updates.metadata) == null ? void 0 : _c.main_product_selling_price) !== void 0 || ((_d = updates == null ? void 0 : updates.metadata) == null ? void 0 : _d.main_product_original_price) !== void 0 || ((_e = updates == null ? void 0 : updates.metadata) == null ? void 0 : _e.source_product_price) !== void 0;
     const isPersistedOrderLine = targetProduct.order_detail_id !== void 0 && targetProduct.order_detail_id !== null;
-    const callerUpdatesManualPrice = ((_f = updates == null ? void 0 : updates.metadata) == null ? void 0 : _f.price_override) !== void 0 || ((_g = updates == null ? void 0 : updates.metadata) == null ? void 0 : _g.is_manual_discount) !== void 0 || ((_h = updates == null ? void 0 : updates.metadata) == null ? void 0 : _h.product_discount_reason) !== void 0 || Array.isArray(updates == null ? void 0 : updates.discount_list) && updates.discount_list.length > 0;
+    const callerChangesDiscountList = Array.isArray(updates == null ? void 0 : updates.discount_list) && updates.discount_list.length > 0 && !isSameDiscountList(updates.discount_list, targetProduct.discount_list);
+    const callerUpdatesManualPrice = ((_f = updates == null ? void 0 : updates.metadata) == null ? void 0 : _f.price_override) !== void 0 || ((_g = updates == null ? void 0 : updates.metadata) == null ? void 0 : _g.is_manual_discount) !== void 0 || ((_h = updates == null ? void 0 : updates.metadata) == null ? void 0 : _h.product_discount_reason) !== void 0 || callerChangesDiscountList;
     if (isPersistedOrderLine && !callerUpdatesManualPrice) {
       nextProduct.selling_price = targetProduct.selling_price;
       nextProduct.original_price = targetProduct.original_price;
@@ -1613,7 +1641,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         source_product_price: (_i = targetProduct.metadata) == null ? void 0 : _i.source_product_price,
         main_product_selling_price: (_j = targetProduct.metadata) == null ? void 0 : _j.main_product_selling_price,
         main_product_original_price: (_k = targetProduct.metadata) == null ? void 0 : _k.main_product_original_price,
-        price_schema_version: (_l = targetProduct.metadata) == null ? void 0 : _l.price_schema_version
+        price_schema_version: ((_l = targetProduct.metadata) == null ? void 0 : _l.price_schema_version) ?? 2
       };
     } else if (callerUpdatesTopPrice && !callerUpdatesMainMeta) {
       const existedMeta = nextProduct.metadata || {};

package/lib/modules/Order/utils/manualProductDiscount.js

@@ -167,7 +167,7 @@ function buildManualProductDiscountItem(params) {
   const diff = origin.minus(selling);
   const quantity = resolveSafeProductNum(params.quantity);
   return {
-    amount: diff.abs().toDecimalPlaces(2).toNumber(),
+    amount: diff.toDecimalPlaces(2).toNumber(),
     type: "product",
     discount: {
       message: params.message ?? "",

package/lib/modules/SalesSummary/index.d.ts

@@ -43,30 +43,5 @@ export declare class SalesSummaryModule extends BaseModule implements Module, Sa
         rounding_amount: string;
         pay_service_charge_amount: string;
         is_price_include_tax?: number | undefined;
-    } | {
-        tax_title: string;
-        tax_rate: number | undefined;
-        product_quantity: number;
-        product_original_amount: string;
-        product_amount: string;
-        product_expect_amount: string;
-        product_tax_fee: string;
-        shipping_fee: string;
-        shipping_tax_fee: string;
-        tax_fee: string;
-        surcharge_fee: string;
-        surcharges: any;
-        discount_amount: string;
-        deposit_amount: string;
-        deposit: import("./types").DepositInfo | undefined;
-        expect_amount: string;
-        total_amount: string;
-        total_refund_amount: string;
-        customer_paid_amount: string;
-        order_paid_amount: string;
-        amount_gap: string;
-        rounding_amount: string;
-        pay_service_charge_amount: string;
-        is_price_include_tax: number;
     }>;
 }

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

@@ -1,4 +1,5 @@
 export interface SalesSummaryProduct {
+    order_detail_id?: number | string | null;
     product_id: number | null;
     product_variant_id: number;
     num: number;

package/lib/modules/SalesSummary/utils.d.ts

@@ -1,4 +1,4 @@
-import type { DepositInfo, SalesSummaryData, SalesSummaryProduct } from './types';
+import type { SalesSummaryData, SalesSummaryProduct } from './types';
 export declare function createEmptySalesSummary(): SalesSummaryData;
 export declare function calculateSalesSummary(params: {
     products: SalesSummaryProduct[];
@@ -8,27 +8,4 @@ export declare function calculateSalesSummary(params: {
     scheduleById?: Record<string, any>;
     isInScheduleByDate?: any;
     shopDiscount?: string | number;
-}): SalesSummaryData | {
-    product_quantity: number;
-    product_original_amount: string;
-    product_amount: string;
-    product_expect_amount: string;
-    product_tax_fee: string;
-    shipping_fee: string;
-    shipping_tax_fee: string;
-    tax_fee: string;
-    surcharge_fee: string;
-    surcharges: any;
-    discount_amount: string;
-    deposit_amount: string;
-    deposit: DepositInfo | undefined;
-    expect_amount: string;
-    total_amount: string;
-    total_refund_amount: string;
-    customer_paid_amount: string;
-    order_paid_amount: string;
-    amount_gap: string;
-    rounding_amount: string;
-    pay_service_charge_amount: string;
-    is_price_include_tax: number;
-};
+}): SalesSummaryData;