@pisell/pisellos 2.2.193 → 2.2.195

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/BaseSales/index.js

@@ -37,6 +37,31 @@ export * from "./types";
 import { QuotationModule } from "../../modules/Quotation";
 import { transformBaseProductToOrderProduct as _transformBaseProductToOrderProduct } from "./utils/transformBaseProductToOrderProduct";
 import { calculateBaseSalesProductBookingPrice } from "./utils/quotationPrice";
+function isBaseSalesManualProductDiscountProduct(product) {
+  var _product$metadata, _product$metadata2;
+  return (product === null || product === void 0 || (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.is_manual_discount) === true || (product === null || product === void 0 || (_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.is_manual_discount) === 1 || ((product === null || product === void 0 ? void 0 : product.discount_list) || []).some(function (item) {
+    return (item === null || item === void 0 ? void 0 : item.type) === 'product';
+  });
+}
+function getBaseSalesProductUid(product) {
+  var _product$metadata3;
+  var uid = (product === null || product === void 0 || (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
+  if (uid === undefined || uid === null || uid === '') return null;
+  return String(uid);
+}
+function preserveManualProductDiscountProducts(previousProducts, nextProducts) {
+  var previousByUid = new Map();
+  (previousProducts || []).forEach(function (product, index) {
+    var uid = getBaseSalesProductUid(product);
+    if (uid) previousByUid.set(uid, product);
+    previousByUid.set("__index__:".concat(index), product);
+  });
+  return (nextProducts || []).map(function (product, index) {
+    var uid = getBaseSalesProductUid(product);
+    var previous = (uid ? previousByUid.get(uid) : undefined) || previousByUid.get("__index__:".concat(index));
+    return previous && isBaseSalesManualProductDiscountProduct(previous) ? previous : product;
+  });
+}
 export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   _inherits(BaseSalesImpl, _BaseModule);
   var _super = _createSuper(BaseSalesImpl);
@@ -342,7 +367,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
         _product$num,
         _ref8,
         _product$quantity,
-        _product$metadata;
+        _product$metadata4;
       if (!authoritativeProduct) return product;
       var selectedBundles = Array.isArray(product.product_bundle) ? product.product_bundle : [];
       var authoritativeBundles = this.getAuthoritativeBundleItems(authoritativeProduct);
@@ -373,7 +398,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           });
         }(),
         product_bundle: productBundle,
-        metadata: (_product$metadata = product.metadata) !== null && _product$metadata !== void 0 ? _product$metadata : authoritativeProduct.metadata
+        metadata: (_product$metadata4 = product.metadata) !== null && _product$metadata4 !== void 0 ? _product$metadata4 : authoritativeProduct.metadata
       });
     }
   }, {
@@ -1180,7 +1205,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _loadDiscountConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(params) {
         var _this$getOrderIdentit, _tempOrder$customer, _tempOrder$_extend, _tempOrder$_extend2, _discountModule$getDi, _discountModule$getOr, _discountModule$getDi2;
-        var tempOrder, orderStore, discountModule, rulesModule, orderId, customerId, currentDiscountList, originalDiscountList, hasManualDiscountSelection, discountAction, discountConfigCacheKey, preparedDiscountList, _discountModule$setOr, nextDiscountList, shouldSkipAutoApplyFetchedDiscounts, _summary, _tempOrder$holder, _tempOrder$holder2, _orderStore$summary, holders, result, _iterator, _step, _product$metadata2, _tempOrder$_extend3, _product$metadata3, _product$metadata$sou, _product$metadata4, _product$metadata5, _product$original_pri, product, productUid, runtimeOrigin, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice, summary;
+        var tempOrder, orderStore, discountModule, rulesModule, orderId, customerId, currentDiscountList, originalDiscountList, hasManualDiscountSelection, discountAction, discountConfigCacheKey, preparedDiscountList, _discountModule$setOr, nextDiscountList, shouldSkipAutoApplyFetchedDiscounts, _summary, _tempOrder$holder, _tempOrder$holder2, _orderStore$summary, holders, result, _iterator, _step, _product$metadata5, _tempOrder$_extend3, _product$metadata$sou, _product$metadata6, _product$metadata7, _product$original_pri, product, productUid, runtimeOrigin, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice, summary;
         return _regeneratorRuntime().wrap(function _callee12$(_context12) {
           while (1) switch (_context12.prev = _context12.next) {
             case 0:
@@ -1291,7 +1316,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 discountList: nextDiscountList
               };
               if (result.productList) {
-                tempOrder.products = result.productList;
+                tempOrder.products = preserveManualProductDiscountProducts(tempOrder.products, result.productList);
               }
               _iterator = _createForOfIteratorHelper(tempOrder.products || []);
               _context12.prev = 45;
@@ -1302,9 +1327,9 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 break;
               }
               product = _step.value;
-              productUid = (_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.unique_identification_number;
+              productUid = (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.unique_identification_number;
               runtimeOrigin = productUid ? (_tempOrder$_extend3 = tempOrder._extend) === null || _tempOrder$_extend3 === void 0 || (_tempOrder$_extend3 = _tempOrder$_extend3.productsByUid) === null || _tempOrder$_extend3 === void 0 || (_tempOrder$_extend3 = _tempOrder$_extend3[productUid]) === null || _tempOrder$_extend3 === void 0 ? void 0 : _tempOrder$_extend3.origin : undefined;
-              if (!(runtimeOrigin !== null && runtimeOrigin !== void 0 && runtimeOrigin.isManualDiscount || (_product$metadata3 = product.metadata) !== null && _product$metadata3 !== void 0 && _product$metadata3.is_manual_discount)) {
+              if (!(runtimeOrigin !== null && runtimeOrigin !== void 0 && runtimeOrigin.isManualDiscount || isBaseSalesManualProductDiscountProduct(product))) {
                 _context12.next = 53;
                 break;
               }
@@ -1314,7 +1339,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 return sum + Number(pd.amount || 0);
               }, 0);
               optionSum = sumOptionUnitPrice(getProductSkuOptions(product));
-              sourcePrice = (_product$metadata$sou = (_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.source_product_price) !== null && _product$metadata$sou !== void 0 ? _product$metadata$sou : ((_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.main_product_original_price) != null ? new Decimal(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : (_product$original_pri = product.original_price) !== null && _product$original_pri !== void 0 ? _product$original_pri : '0';
+              sourcePrice = (_product$metadata$sou = (_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.source_product_price) !== null && _product$metadata$sou !== void 0 ? _product$metadata$sou : ((_product$metadata7 = product.metadata) === null || _product$metadata7 === void 0 ? void 0 : _product$metadata7.main_product_original_price) != null ? new Decimal(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : (_product$original_pri = product.original_price) !== null && _product$original_pri !== void 0 ? _product$original_pri : '0';
               newSourceSellingPrice = new Decimal(Number(sourcePrice) || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
               newMainSellingPrice = new Decimal(Number(newSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
               if (product.metadata) {
@@ -1427,7 +1452,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 orderTotalAmount: Number(((_orderStore$summary2 = orderStore.summary) === null || _orderStore$summary2 === void 0 ? void 0 : _orderStore$summary2.total_amount) || 0)
               }) || result;
               if (result.productList) {
-                tempOrder.products = result.productList;
+                tempOrder.products = preserveManualProductDiscountProducts(tempOrder.products, result.productList);
               }
               if (!result.discountList) {
                 _context13.next = 23;
@@ -1525,7 +1550,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "setDiscountSelected",
     value: function () {
       var _setDiscountSelected = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(params) {
-        var _tempOrder$holder5, list, updated, tempOrder, orderStore, discountModule, rulesModule, holders, nextDiscountList, _tempOrder$holder6, result, beforeSelectedIds, _iterator2, _step2, d, selectedResourceIds, _iterator3, _step3, _product$metadata6, _tempOrder$_extend4, _product$metadata7, _product$metadata$sou2, _product$metadata8, _product$metadata9, _product$original_pri2, product, productUid, runtimeOrigin, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice;
+        var _tempOrder$holder5, list, updated, tempOrder, orderStore, discountModule, rulesModule, holders, nextDiscountList, _tempOrder$holder6, result, beforeSelectedIds, _iterator2, _step2, d, selectedResourceIds, _iterator3, _step3, _product$metadata8, _tempOrder$_extend4, _product$metadata$sou2, _product$metadata9, _product$metadata10, _product$original_pri2, product, productUid, runtimeOrigin, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice;
         return _regeneratorRuntime().wrap(function _callee15$(_context15) {
           while (1) switch (_context15.prev = _context15.next) {
             case 0:
@@ -1569,7 +1594,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                   discountList: updated
                 };
                 if (result !== null && result !== void 0 && result.productList) {
-                  tempOrder.products = result.productList;
+                  tempOrder.products = preserveManualProductDiscountProducts(tempOrder.products, result.productList);
                 }
                 if (result !== null && result !== void 0 && result.discountList) {
                   nextDiscountList = result.discountList;
@@ -1610,9 +1635,9 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 break;
               }
               product = _step3.value;
-              productUid = (_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.unique_identification_number;
+              productUid = (_product$metadata8 = product.metadata) === null || _product$metadata8 === void 0 ? void 0 : _product$metadata8.unique_identification_number;
               runtimeOrigin = productUid ? (_tempOrder$_extend4 = tempOrder._extend) === null || _tempOrder$_extend4 === void 0 || (_tempOrder$_extend4 = _tempOrder$_extend4.productsByUid) === null || _tempOrder$_extend4 === void 0 || (_tempOrder$_extend4 = _tempOrder$_extend4[productUid]) === null || _tempOrder$_extend4 === void 0 ? void 0 : _tempOrder$_extend4.origin : undefined;
-              if (!(runtimeOrigin !== null && runtimeOrigin !== void 0 && runtimeOrigin.isManualDiscount || (_product$metadata7 = product.metadata) !== null && _product$metadata7 !== void 0 && _product$metadata7.is_manual_discount)) {
+              if (!(runtimeOrigin !== null && runtimeOrigin !== void 0 && runtimeOrigin.isManualDiscount || isBaseSalesManualProductDiscountProduct(product))) {
                 _context15.next = 25;
                 break;
               }
@@ -1630,7 +1655,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 return sum + (pd.amount || 0);
               }, 0); // TODO 这块逻辑需要拿掉
               optionSum = sumOptionUnitPrice(getProductSkuOptions(product));
-              sourcePrice = (_product$metadata$sou2 = (_product$metadata8 = product.metadata) === null || _product$metadata8 === void 0 ? void 0 : _product$metadata8.source_product_price) !== null && _product$metadata$sou2 !== void 0 ? _product$metadata$sou2 : ((_product$metadata9 = product.metadata) === null || _product$metadata9 === void 0 ? void 0 : _product$metadata9.main_product_original_price) != null ? new Decimal(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : (_product$original_pri2 = product.original_price) !== null && _product$original_pri2 !== void 0 ? _product$original_pri2 : '0';
+              sourcePrice = (_product$metadata$sou2 = (_product$metadata9 = product.metadata) === null || _product$metadata9 === void 0 ? void 0 : _product$metadata9.source_product_price) !== null && _product$metadata$sou2 !== void 0 ? _product$metadata$sou2 : ((_product$metadata10 = product.metadata) === null || _product$metadata10 === void 0 ? void 0 : _product$metadata10.main_product_original_price) != null ? new Decimal(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : (_product$original_pri2 = product.original_price) !== null && _product$original_pri2 !== void 0 ? _product$original_pri2 : '0';
               newSourceSellingPrice = new Decimal(Number(sourcePrice) || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
               newMainSellingPrice = new Decimal(Number(newSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
               if (product.metadata) {
@@ -1717,7 +1742,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               orderStore = this.store.order.store || {};
               discountModule = orderStore.discount;
               if (result.productList) {
-                tempOrder.products = result.productList;
+                tempOrder.products = preserveManualProductDiscountProducts(tempOrder.products, result.productList);
               }
               if (!result.discountList) {
                 _context16.next = 14;

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 | 6 | 3 | 5 | 4;
     }[]>;
     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/modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine.js

@@ -88,6 +88,7 @@ function buildNormalProductCacheItemFromOrderLine(input) {
   );
   const originExtend = (_c = (_b = product.metadata) == null ? void 0 : _b.origin) == null ? void 0 : _c._extend;
   const productOptionString = (0, import_orderLineDisplay.buildProductOptionStringFromOrderLine)(product);
+  const discountList = product.discount_list || [];
   const other = {
     product_id: resolvedId,
     product_variant_id: product.product_variant_id ?? 0,
@@ -135,6 +136,7 @@ function buildNormalProductCacheItemFromOrderLine(input) {
     ...productOptionString ? { product_option_string: productOptionString } : {},
     note: product.note,
     order_detail_id: product.order_detail_id ?? null,
+    discount_list: discountList,
     new: 0,
     autoClose: true,
     _extend: extend

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;

package/lib/modules/Order/index.js

@@ -45,6 +45,25 @@ 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)
+  );
+}
+function isManualProductDiscountProduct(product) {
+  var _a, _b;
+  return ((_a = product == null ? void 0 : product.metadata) == null ? void 0 : _a.is_manual_discount) === true || ((_b = product == null ? void 0 : product.metadata) == null ? void 0 : _b.is_manual_discount) === 1 || ((product == null ? void 0 : product.discount_list) || []).some((item) => (item == null ? void 0 : item.type) === "product");
+}
 var OrderModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name || "order", version);
@@ -104,12 +123,17 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   }
   applyProductDiscountPrices(products) {
     return (products || []).map((product) => {
-      var _a, _b, _c;
-      if ((_a = product.metadata) == null ? void 0 : _a.is_manual_discount)
+      var _a, _b;
+      if (isManualProductDiscountProduct(product))
+        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");
+      const sourcePrice = ((_a = product.metadata) == null ? void 0 : _a.source_product_price) ?? (((_b = product.metadata) == null ? void 0 : _b.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");
       const newSourceSellingPrice = new import_decimal.default(Number(sourcePrice) || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
       const newMainSellingPrice = new import_decimal.default(Number(newSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
       if (product.metadata) {
@@ -326,6 +350,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         (result.productList || []).map((product, index) => {
           const uid = (0, import_utils.getOrderProductLineUid)(product);
           const previous = (uid ? previousProductsByUid.get(uid) : void 0) ?? previousProductsByUid.get(`__index__:${index}`);
+          if (isManualProductDiscountProduct(previous)) {
+            return previous;
+          }
           const mergedProduct = previous ? (0, import_utils.mergeOrderProductDisplayFields)(previous, product) : product;
           return {
             ...mergedProduct,
@@ -618,6 +645,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 +660,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)
@@ -1484,9 +1518,18 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       normalizedProduct.discount_list = (0, import_utils.normalizeOrderProductDiscountList)(
         normalizedProduct.discount_list
       );
+      const nextNum = (0, import_utils3.getSafeProductNum)(targetProduct.num + normalizedProduct.num);
+      const targetIsManualProductDiscount = isManualProductDiscountProduct(targetProduct);
+      const nextDiscountList = targetIsManualProductDiscount ? (0, import_utils.normalizeOrderProductDiscountList)(
+        (0, import_manualProductDiscount.syncManualProductDiscountProductNum)(
+          targetProduct.discount_list,
+          nextNum
+        )
+      ) : normalizedProduct.discount_list;
       tempOrder.products[matchedIndex] = {
         ...targetProduct,
         ...normalizedProduct,
+        discount_list: nextDiscountList,
         metadata: {
           ...targetProduct.metadata || {},
           ...normalizedProduct.metadata || {},
@@ -1497,9 +1540,19 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           ...normalizedProduct.product_sku || { option: [] },
           option: (0, import_utils.getProductSkuOptions)(normalizedProduct)
         },
+        ...targetIsManualProductDiscount ? {
+          selling_price: targetProduct.selling_price,
+          original_price: targetProduct.original_price,
+          payment_price: targetProduct.payment_price,
+          metadata: {
+            ...normalizedProduct.metadata || {},
+            ...targetProduct.metadata || {},
+            unique_identification_number: targetUid
+          }
+        } : {},
         note: targetProduct.note,
         order_detail_id: targetProduct.order_detail_id,
-        num: (0, import_utils3.getSafeProductNum)(targetProduct.num + normalizedProduct.num)
+        num: nextNum
       };
       this.captureProductRuntime(
         tempOrder,
@@ -1603,7 +1656,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 +1667,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;