@pisell/pisellos 2.2.195 → 2.2.196

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

@@ -150,6 +150,8 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private formatSummaryMetadataMoney;
     private syncSummaryProductMetadata;
     private calculateSummaryAmountGap;
+    private getSummaryRefundAmount;
+    private calculatePaymentTargetAmount;
     private getPaymentTargetAmount;
     ensureTempOrder(): OrderTempOrder;
     restoreOrder(): OrderTempOrder;

package/dist/modules/Order/index.js

@@ -993,27 +993,48 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     }
   }, {
     key: "updateTempOrderPaymentStatus",
-    value: function updateTempOrderPaymentStatus(tempOrder) {
-      if (this.shouldKeepPaymentStatusAfterAmountRecalc(tempOrder.payment_status)) {
+    value: function updateTempOrderPaymentStatus(tempOrder, options) {
+      var summary = (options === null || options === void 0 ? void 0 : options.summary) || this.store.summary || createEmptySummary();
+      var paymentTotal = this.calculatePaymentTotal(tempOrder.payments || []);
+      var refundAmount = this.getSummaryRefundAmount(summary);
+      var netPaymentTotal = Decimal.max(paymentTotal.minus(refundAmount), 0);
+      var targetAmount = this.calculatePaymentTargetAmount(tempOrder, summary);
+      if (this.shouldKeepPaymentStatusAfterAmountRecalc(tempOrder.payment_status, {
+        netPaymentTotal: netPaymentTotal,
+        paymentTotal: paymentTotal,
+        refundAmount: refundAmount,
+        targetAmount: targetAmount,
+        previousSummary: options === null || options === void 0 ? void 0 : options.previousSummary,
+        tempOrder: tempOrder
+      })) {
         return;
       }
-      var paymentTotal = this.calculatePaymentTotal(tempOrder.payments || []);
-      var targetAmount = this.getPaymentTargetAmount();
       if (targetAmount.lte(0)) {
         tempOrder.payment_status = 'paid';
         return;
       }
-      if (paymentTotal.lte(0)) {
+      if (netPaymentTotal.lte(0)) {
         tempOrder.payment_status = 'payment_processing';
         return;
       }
-      tempOrder.payment_status = paymentTotal.gte(targetAmount) ? 'paid' : 'partially_paid';
+      tempOrder.payment_status = netPaymentTotal.gte(targetAmount) ? 'paid' : 'partially_paid';
     }
   }, {
     key: "shouldKeepPaymentStatusAfterAmountRecalc",
-    value: function shouldKeepPaymentStatusAfterAmountRecalc(paymentStatus) {
+    value: function shouldKeepPaymentStatusAfterAmountRecalc(paymentStatus, params) {
       var normalizedStatus = String(paymentStatus || '').trim().toLowerCase();
-      return normalizedStatus === 'refunded' || normalizedStatus === 'partially_refunded';
+      if (normalizedStatus !== 'refunded' && normalizedStatus !== 'partially_refunded') {
+        return false;
+      }
+      if (params.refundAmount.lte(0)) return false;
+      if (params.previousSummary) {
+        var previousTargetAmount = this.calculatePaymentTargetAmount(params.tempOrder, params.previousSummary);
+        if (!previousTargetAmount.eq(params.targetAmount)) return false;
+      }
+      if (normalizedStatus === 'refunded') {
+        return params.refundAmount.gte(params.paymentTotal);
+      }
+      return params.netPaymentTotal.gte(params.targetAmount);
     }
   }, {
     key: "resolveWalletPassUseValue",
@@ -1174,20 +1195,29 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var tempOrder = params.tempOrder,
         summary = params.summary,
         orderPaidAmount = params.orderPaidAmount;
+      var refundAmount = this.getSummaryRefundAmount(summary);
+      var netOrderPaidAmount = Decimal.max(orderPaidAmount.minus(refundAmount), 0);
+      var targetAmount = this.calculatePaymentTargetAmount(tempOrder, summary);
+      return targetAmount.minus(netOrderPaidAmount).toFixed(2);
+    }
+  }, {
+    key: "getSummaryRefundAmount",
+    value: function getSummaryRefundAmount(summary) {
+      return Decimal.max(new Decimal((summary === null || summary === void 0 ? void 0 : summary.total_refund_amount) || 0), 0);
+    }
+  }, {
+    key: "calculatePaymentTargetAmount",
+    value: function calculatePaymentTargetAmount(tempOrder, summary) {
       var depositAmount = summary.deposit_amount || tempOrder.deposit_amount || '0.00';
       var isDeposit = tempOrder.is_deposit === 1 || new Decimal(depositAmount || 0).gt(0);
-      var targetAmount = isDeposit ? new Decimal(depositAmount || 0) : new Decimal(summary.total_amount || summary.expect_amount || 0);
-      return targetAmount.minus(orderPaidAmount).toFixed(2);
+      return isDeposit ? new Decimal(depositAmount || 0) : new Decimal(summary.total_amount || summary.expect_amount || 0);
     }
   }, {
     key: "getPaymentTargetAmount",
     value: function getPaymentTargetAmount() {
       var tempOrder = this.ensureTempOrder();
       var summary = this.store.summary || createEmptySummary();
-      if (tempOrder.is_deposit === 1) {
-        return new Decimal(tempOrder.deposit_amount || summary.deposit_amount || 0);
-      }
-      return new Decimal(summary.total_amount || summary.expect_amount || 0);
+      return this.calculatePaymentTargetAmount(tempOrder, summary);
     }
   }, {
     key: "ensureTempOrder",
@@ -1311,9 +1341,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (!tempOrder) return null;
       var summary = this.store.summary || createEmptySummary();
       var depositAmount = tempOrder.deposit_amount || summary.deposit_amount || '0.00';
-      var targetAmount = tempOrder.is_deposit === 1 ? new Decimal(depositAmount || 0) : new Decimal(summary.total_amount || summary.expect_amount || 0);
-      var paymentTotal = this.calculatePaymentTotal(tempOrder.payments || []);
-      var amountGap = targetAmount.minus(paymentTotal).toFixed(2);
+      var paidPaymentSummary = this.calculatePaidPaymentSummary(tempOrder.payments || []);
+      var amountGap = this.calculateSummaryAmountGap({
+        tempOrder: tempOrder,
+        summary: summary,
+        orderPaidAmount: paidPaymentSummary.gapPaidAmount
+      });
       return {
         isDeposit: tempOrder.is_deposit === 1 || depositAmount !== '0.00',
         depositAmount: depositAmount,
@@ -1515,7 +1548,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "recalculateSummary",
     value: function () {
       var _recalculateSummary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(options) {
-        var tempOrder, salesSummary, existedSummary, paidPaymentSummary, emptySummary, salesSummaryResult, summary;
+        var tempOrder, salesSummary, existedSummary, totalRefundAmount, paidPaymentSummary, emptyBaseSummary, emptySummary, salesSummaryResult, summaryForGap, summary;
         return _regeneratorRuntime().wrap(function _callee9$(_context11) {
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
@@ -1529,43 +1562,52 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               this.sanitizeTempOrderProducts(tempOrder);
               salesSummary = this.getSalesSummary();
               existedSummary = this.store.summary || createEmptySummary();
+              totalRefundAmount = existedSummary.total_refund_amount || '0.00';
               paidPaymentSummary = this.calculatePaidPaymentSummary(tempOrder.payments || []);
               if (salesSummary) {
-                _context11.next = 13;
+                _context11.next = 15;
                 break;
               }
-              emptySummary = _objectSpread(_objectSpread({}, createEmptySummary()), {}, {
-                total_refund_amount: existedSummary.total_refund_amount || '0.00',
+              emptyBaseSummary = _objectSpread(_objectSpread({}, createEmptySummary()), {}, {
+                total_refund_amount: totalRefundAmount
+              });
+              emptySummary = _objectSpread(_objectSpread({}, emptyBaseSummary), {}, {
                 customer_paid_amount: paidPaymentSummary.customerPaidAmount.toFixed(2),
                 order_paid_amount: paidPaymentSummary.orderPaidAmount.toFixed(2),
                 amount_gap: this.calculateSummaryAmountGap({
                   tempOrder: tempOrder,
-                  summary: createEmptySummary(),
+                  summary: emptyBaseSummary,
                   orderPaidAmount: paidPaymentSummary.gapPaidAmount
                 }),
                 pay_service_charge_amount: paidPaymentSummary.payServiceChargeAmount.toFixed(2)
               });
               tempOrder.surcharge_fee = emptySummary.surcharge_fee;
-              this.updateTempOrderPaymentStatus(tempOrder);
               this.store.summary = emptySummary;
+              this.updateTempOrderPaymentStatus(tempOrder, {
+                previousSummary: existedSummary,
+                summary: emptySummary
+              });
               return _context11.abrupt("return", this.store.summary);
-            case 13:
-              _context11.next = 15;
+            case 15:
+              _context11.next = 17;
               return salesSummary.getSummary({
                 products: tempOrder.products,
                 isPriceIncludeTax: tempOrder.is_price_include_tax,
                 shopDiscount: tempOrder.shop_discount
               });
-            case 15:
+            case 17:
               salesSummaryResult = _context11.sent;
               this.syncSummaryProductMetadata(tempOrder.products || []);
+              summaryForGap = _objectSpread(_objectSpread({}, salesSummaryResult), {}, {
+                total_refund_amount: totalRefundAmount
+              });
               summary = _objectSpread(_objectSpread({}, salesSummaryResult), {}, {
-                total_refund_amount: existedSummary.total_refund_amount || '0.00',
+                total_refund_amount: totalRefundAmount,
                 customer_paid_amount: paidPaymentSummary.customerPaidAmount.toFixed(2),
                 order_paid_amount: paidPaymentSummary.orderPaidAmount.toFixed(2),
                 amount_gap: this.calculateSummaryAmountGap({
                   tempOrder: tempOrder,
-                  summary: salesSummaryResult,
+                  summary: summaryForGap,
                   orderPaidAmount: paidPaymentSummary.gapPaidAmount
                 }),
                 pay_service_charge_amount: paidPaymentSummary.payServiceChargeAmount.toFixed(2)
@@ -1581,9 +1623,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               tempOrder.surcharges = summary.surcharges || [];
               tempOrder.deposit_amount = summary.deposit_amount || '0.00';
               tempOrder.is_deposit = summary.deposit_amount !== '0.00' ? 1 : 0;
-              this.updateTempOrderPaymentStatus(tempOrder);
+              this.updateTempOrderPaymentStatus(tempOrder, {
+                previousSummary: existedSummary,
+                summary: summary
+              });
               return _context11.abrupt("return", this.store.summary);
-            case 27:
+            case 30:
             case "end":
               return _context11.stop();
           }

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

@@ -150,6 +150,8 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private formatSummaryMetadataMoney;
     private syncSummaryProductMetadata;
     private calculateSummaryAmountGap;
+    private getSummaryRefundAmount;
+    private calculatePaymentTargetAmount;
     private getPaymentTargetAmount;
     ensureTempOrder(): OrderTempOrder;
     restoreOrder(): OrderTempOrder;

package/lib/modules/Order/index.js

@@ -644,25 +644,51 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
     return normalized;
   }
-  updateTempOrderPaymentStatus(tempOrder) {
-    if (this.shouldKeepPaymentStatusAfterAmountRecalc(tempOrder.payment_status)) {
+  updateTempOrderPaymentStatus(tempOrder, options) {
+    const summary = (options == null ? void 0 : options.summary) || this.store.summary || (0, import_utils.createEmptySummary)();
+    const paymentTotal = this.calculatePaymentTotal(tempOrder.payments || []);
+    const refundAmount = this.getSummaryRefundAmount(summary);
+    const netPaymentTotal = import_decimal.default.max(paymentTotal.minus(refundAmount), 0);
+    const targetAmount = this.calculatePaymentTargetAmount(tempOrder, summary);
+    if (this.shouldKeepPaymentStatusAfterAmountRecalc(tempOrder.payment_status, {
+      netPaymentTotal,
+      paymentTotal,
+      refundAmount,
+      targetAmount,
+      previousSummary: options == null ? void 0 : options.previousSummary,
+      tempOrder
+    })) {
       return;
     }
-    const paymentTotal = this.calculatePaymentTotal(tempOrder.payments || []);
-    const targetAmount = this.getPaymentTargetAmount();
     if (targetAmount.lte(0)) {
       tempOrder.payment_status = "paid";
       return;
     }
-    if (paymentTotal.lte(0)) {
+    if (netPaymentTotal.lte(0)) {
       tempOrder.payment_status = "payment_processing";
       return;
     }
-    tempOrder.payment_status = paymentTotal.gte(targetAmount) ? "paid" : "partially_paid";
+    tempOrder.payment_status = netPaymentTotal.gte(targetAmount) ? "paid" : "partially_paid";
   }
-  shouldKeepPaymentStatusAfterAmountRecalc(paymentStatus) {
+  shouldKeepPaymentStatusAfterAmountRecalc(paymentStatus, params) {
     const normalizedStatus = String(paymentStatus || "").trim().toLowerCase();
-    return normalizedStatus === "refunded" || normalizedStatus === "partially_refunded";
+    if (normalizedStatus !== "refunded" && normalizedStatus !== "partially_refunded") {
+      return false;
+    }
+    if (params.refundAmount.lte(0))
+      return false;
+    if (params.previousSummary) {
+      const previousTargetAmount = this.calculatePaymentTargetAmount(
+        params.tempOrder,
+        params.previousSummary
+      );
+      if (!previousTargetAmount.eq(params.targetAmount))
+        return false;
+    }
+    if (normalizedStatus === "refunded") {
+      return params.refundAmount.gte(params.paymentTotal);
+    }
+    return params.netPaymentTotal.gte(params.targetAmount);
   }
   resolveWalletPassUseValue(payment, amount) {
     const usageUnit = payment.wallet_pass_usage_unit && typeof payment.wallet_pass_usage_unit === "object" ? payment.wallet_pass_usage_unit : null;
@@ -797,20 +823,23 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   }
   calculateSummaryAmountGap(params) {
     const { tempOrder, summary, orderPaidAmount } = params;
+    const refundAmount = this.getSummaryRefundAmount(summary);
+    const netOrderPaidAmount = import_decimal.default.max(orderPaidAmount.minus(refundAmount), 0);
+    const targetAmount = this.calculatePaymentTargetAmount(tempOrder, summary);
+    return targetAmount.minus(netOrderPaidAmount).toFixed(2);
+  }
+  getSummaryRefundAmount(summary) {
+    return import_decimal.default.max(new import_decimal.default((summary == null ? void 0 : summary.total_refund_amount) || 0), 0);
+  }
+  calculatePaymentTargetAmount(tempOrder, summary) {
     const depositAmount = summary.deposit_amount || tempOrder.deposit_amount || "0.00";
     const isDeposit = tempOrder.is_deposit === 1 || new import_decimal.default(depositAmount || 0).gt(0);
-    const targetAmount = isDeposit ? new import_decimal.default(depositAmount || 0) : new import_decimal.default(summary.total_amount || summary.expect_amount || 0);
-    return targetAmount.minus(orderPaidAmount).toFixed(2);
+    return isDeposit ? new import_decimal.default(depositAmount || 0) : new import_decimal.default(summary.total_amount || summary.expect_amount || 0);
   }
   getPaymentTargetAmount() {
     const tempOrder = this.ensureTempOrder();
     const summary = this.store.summary || (0, import_utils.createEmptySummary)();
-    if (tempOrder.is_deposit === 1) {
-      return new import_decimal.default(
-        tempOrder.deposit_amount || summary.deposit_amount || 0
-      );
-    }
-    return new import_decimal.default(summary.total_amount || summary.expect_amount || 0);
+    return this.calculatePaymentTargetAmount(tempOrder, summary);
   }
   ensureTempOrder() {
     if (this.store.tempOrder) {
@@ -896,9 +925,12 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       return null;
     const summary = this.store.summary || (0, import_utils.createEmptySummary)();
     const depositAmount = tempOrder.deposit_amount || summary.deposit_amount || "0.00";
-    const targetAmount = tempOrder.is_deposit === 1 ? new import_decimal.default(depositAmount || 0) : new import_decimal.default(summary.total_amount || summary.expect_amount || 0);
-    const paymentTotal = this.calculatePaymentTotal(tempOrder.payments || []);
-    const amountGap = targetAmount.minus(paymentTotal).toFixed(2);
+    const paidPaymentSummary = this.calculatePaidPaymentSummary(tempOrder.payments || []);
+    const amountGap = this.calculateSummaryAmountGap({
+      tempOrder,
+      summary,
+      orderPaidAmount: paidPaymentSummary.gapPaidAmount
+    });
     return {
       isDeposit: tempOrder.is_deposit === 1 || depositAmount !== "0.00",
       depositAmount,
@@ -1062,25 +1094,32 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     this.sanitizeTempOrderProducts(tempOrder);
     const salesSummary = this.getSalesSummary();
     const existedSummary = this.store.summary || (0, import_utils.createEmptySummary)();
+    const totalRefundAmount = existedSummary.total_refund_amount || "0.00";
     const paidPaymentSummary = this.calculatePaidPaymentSummary(
       tempOrder.payments || []
     );
     if (!salesSummary) {
-      const emptySummary = {
+      const emptyBaseSummary = {
         ...(0, import_utils.createEmptySummary)(),
-        total_refund_amount: existedSummary.total_refund_amount || "0.00",
+        total_refund_amount: totalRefundAmount
+      };
+      const emptySummary = {
+        ...emptyBaseSummary,
         customer_paid_amount: paidPaymentSummary.customerPaidAmount.toFixed(2),
         order_paid_amount: paidPaymentSummary.orderPaidAmount.toFixed(2),
         amount_gap: this.calculateSummaryAmountGap({
           tempOrder,
-          summary: (0, import_utils.createEmptySummary)(),
+          summary: emptyBaseSummary,
           orderPaidAmount: paidPaymentSummary.gapPaidAmount
         }),
         pay_service_charge_amount: paidPaymentSummary.payServiceChargeAmount.toFixed(2)
       };
       tempOrder.surcharge_fee = emptySummary.surcharge_fee;
-      this.updateTempOrderPaymentStatus(tempOrder);
       this.store.summary = emptySummary;
+      this.updateTempOrderPaymentStatus(tempOrder, {
+        previousSummary: existedSummary,
+        summary: emptySummary
+      });
       return this.store.summary;
     }
     const salesSummaryResult = await salesSummary.getSummary({
@@ -1089,14 +1128,18 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       shopDiscount: tempOrder.shop_discount
     });
     this.syncSummaryProductMetadata(tempOrder.products || []);
+    const summaryForGap = {
+      ...salesSummaryResult,
+      total_refund_amount: totalRefundAmount
+    };
     const summary = {
       ...salesSummaryResult,
-      total_refund_amount: existedSummary.total_refund_amount || "0.00",
+      total_refund_amount: totalRefundAmount,
       customer_paid_amount: paidPaymentSummary.customerPaidAmount.toFixed(2),
       order_paid_amount: paidPaymentSummary.orderPaidAmount.toFixed(2),
       amount_gap: this.calculateSummaryAmountGap({
         tempOrder,
-        summary: salesSummaryResult,
+        summary: summaryForGap,
         orderPaidAmount: paidPaymentSummary.gapPaidAmount
       }),
       pay_service_charge_amount: paidPaymentSummary.payServiceChargeAmount.toFixed(2)
@@ -1112,7 +1155,10 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     tempOrder.surcharges = summary.surcharges || [];
     tempOrder.deposit_amount = summary.deposit_amount || "0.00";
     tempOrder.is_deposit = summary.deposit_amount !== "0.00" ? 1 : 0;
-    this.updateTempOrderPaymentStatus(tempOrder);
+    this.updateTempOrderPaymentStatus(tempOrder, {
+      previousSummary: existedSummary,
+      summary
+    });
     return this.store.summary;
   }
   async getOrderSummary() {

package/package.json

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